kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-origin-80'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-26 19:10:37 -05:00
parent e8eed5ecb9 249f5a7329
commit 8a312a3e64
170 changed files with 1495 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/gc/dialog.c
View File

@@ -942,7 +942,7 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca
return 0;
}
bool func_80311480(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){
bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){
return func_80311174(text_id, arg1, pos, marker, callback, arg5, 0);
}

4
src/core2/gc/pauseMenu.c
View File

@@ -786,7 +786,7 @@ s32 gcpausemenu_80312D78(struct1As *arg0, s32 arg1) {
for (var_s2 = 0; var_s2 < arg1; var_s2++) {
if (arg0[var_s2].delay <= D_80383010.unkC) {
if (!arg0[var_s2].unkF) {
var_v0 = func_803183A4(D_80383010.zoombox[var_s2], arg0[var_s2].str) ? TRUE : FALSE;
var_v0 = BOOL(func_803183A4(D_80383010.zoombox[var_s2], arg0[var_s2].str));
arg0[var_s2].unkF = var_v0;
if (arg0[var_s2].unkF) {
gczoombox_open(D_80383010.zoombox[var_s2]);
@@ -898,7 +898,7 @@ void gcpausemenu_updateBButtonAndJoystickSprites(void) {
}
D_80383010.unk20 -= var_f0;
}
D_80383010.left_joystick_visible = (D_80383010.selection != 0) ? TRUE : FALSE;
D_80383010.left_joystick_visible = BOOL(D_80383010.selection != 0);
D_80383010.right_joystick_visible = (gcpausemenu_getMaxPage() == D_80383010.selection) ? FALSE : TRUE;
D_80383010.unk28 += time_getDelta();

6
src/core2/gc/zoombox.c
View File

@@ -1567,8 +1567,8 @@ void func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool
if (this->anim_ctrl != NULL) {
animctrl_setDuration(this->anim_ctrl, arg4);
}
this->unk1A4_12 = arg5 ? TRUE : FALSE;
this->unk1A4_10 = arg6 ? TRUE : FALSE;
this->unk1A4_12 = BOOL(arg5);
this->unk1A4_10 = BOOL(arg6);
}
}
@@ -1617,7 +1617,7 @@ void func_80318640(GcZoombox *this, s32 arg1, f32 arg2, f32 arg3, s32 arg4) {
}
this->unk198 = arg2;
this->unk194 = arg3;
this->unk1A4_15 = (arg4) ? TRUE : FALSE;
this->unk1A4_15 = BOOL(arg4);
}
}