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

Merge branch 'master' of https://gitlab.com/banjo.decomp/banjo-kazooie into core1_docu

Browse Source
This commit is contained in:
mariob92
2024-10-15 10:40:52 +02:00
parent a5b65b87fa d1b41e109d
commit 9495386470
57 changed files with 3157 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,7 +240,7 @@ void gcpausemenu_zoomboxes_initMainMenu(void) {
s32 i;
for (i = 0; i < 4; i++) {
D_80383010.zoombox[i] = gczoombox_new(D_8036C4E0[i].y, D_8036C4E0[i].portrait, 2, 0, gcpausemenu_zoombox_callback);
func_803184C8(D_80383010.zoombox[i], 60.0f, 5, 2, 0.3f, 0, 0);
gczoombox_func_803184C8(D_80383010.zoombox[i], 60.0f, 5, 2, 0.3f, 0, 0);
func_80318640(D_80383010.zoombox[i], 0x1C, 0.75f, 0.9f, 0);
func_80318760(D_80383010.zoombox[i], 8000);
}
@@ -251,7 +251,7 @@ void gcpausemenu_zoomboxes_initTotalsMenu(void) {
for (i = 0; i < 4; i++) {
D_80383010.zoombox[i] = gczoombox_new(D_8036C520[i].y, D_8036C520[i].portrait, (i == 3) ? 1 : 2, 0, gcpausemenu_zoombox_callback);
func_803184C8(D_80383010.zoombox[i], 40.0f, 5, 2, 0.3f, 0, 0);
gczoombox_func_803184C8(D_80383010.zoombox[i], 40.0f, 5, 2, 0.3f, 0, 0);
func_80318640(D_80383010.zoombox[i], 0x46, 0.9f, 0.7f, 1);
func_80318760(D_80383010.zoombox[i], 8000);
}
@@ -933,7 +933,7 @@ s32 gcPauseMenu_update(void) {
return 0;
}
pfsManager_getControllerFaceButtonState(0, face_button);
controller_copyFaceButtons(0, face_button);
controller_getJoystick(0, joystick);
func_8024E60C(0, sp60);
func_8024E6E0(0, sp50);
@@ -1003,7 +1003,7 @@ s32 gcPauseMenu_update(void) {
}//L80313664
else {
if (D_80383010.selection == PAUSE_SELECTION_2_VIEW_TOTALS && !D_80383010.unk3_6) {
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 1;
}
@@ -1015,7 +1015,7 @@ s32 gcPauseMenu_update(void) {
D_80383010.selection--;
}
gczoombox_highlight(D_80383010.zoombox[D_80383010.selection], TRUE);
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 0;
D_80383010.unk7 = 6;
}
@@ -1028,7 +1028,7 @@ s32 gcPauseMenu_update(void) {
D_80383010.selection++;
}
gczoombox_highlight(D_80383010.zoombox[D_80383010.selection], 1);
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 0;
D_80383010.unk7 = 6;
}
@@ -1036,7 +1036,7 @@ s32 gcPauseMenu_update(void) {
}
if (D_80383010.selection == 2 && !D_80383010.unk3_6 && D_80383010.unk7 == 3) {
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 1;
}
break;