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

Renaming controller_getStartButton

Browse Source
This commit is contained in:
Nabnut
2024-09-19 12:30:40 +02:00
parent 1e7bc4e212
commit aa51e72ae2
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core1/code_10A00.c
View File

@@ -128,7 +128,7 @@ f32 func_8024E668(s32 controller_index){
return D_80281308[controller_index]; return D_80281308[controller_index];
} }
s32 func_8024E67C(s32 controller_index){ s32 controller_getStartButton(s32 controller_index){
return D_80281138[controller_index].start_button; return D_80281138[controller_index].start_button;
} }

2
src/core2/code_5C240.c
View File

@@ -147,7 +147,7 @@ void func_802E35D8(void ) {
if (D_8037E8C0.unk18 > 15.0f) { if (D_8037E8C0.unk18 > 15.0f) {
sp38++; sp38++;
} }
if (func_8024E67C(0) == 1) { if (controller_getStartButton(0) == 1) {
sp38++; sp38++;
} }
if (sp38 != 0) { if (sp38 != 0) {

4
src/core2/code_5C870.c
View File

@@ -527,7 +527,7 @@ bool func_802E4424(void) {
case GAME_MODE_7_ATTRACT_DEMO: case GAME_MODE_7_ATTRACT_DEMO:
case GAME_MODE_9_BANJO_AND_KAZOOIE: case GAME_MODE_9_BANJO_AND_KAZOOIE:
func_8034BB90(); func_8034BB90();
if ((func_8024E67C(0) == 1) && (D_8037E8E0.unk0 != 0)) { if ((controller_getStartButton(0) == 1) && (D_8037E8E0.unk0 != 0)) {
func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U); func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U);
} }
break; break;
@@ -547,7 +547,7 @@ bool func_802E4424(void) {
&& dummy_func_80320248() && dummy_func_80320248()
) { ) {
func_802E3BF8(GAME_MODE_4_PAUSED, 0U); func_802E3BF8(GAME_MODE_4_PAUSED, 0U);
} else if ((func_8024E67C(0) == 1) && (D_8037E8E0.unk0 != 0)) { } else if ((controller_getStartButton(0) == 1) && (D_8037E8E0.unk0 != 0)) {
func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U); func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U);
} else if (sp1C == 0) { } else if (sp1C == 0) {
func_802E3BF8(GAME_MODE_3_NORMAL, 1U); func_802E3BF8(GAME_MODE_3_NORMAL, 1U);

2
src/core2/code_E410.c
View File

@@ -24,7 +24,7 @@ void func_802953A0(void){
void func_80295448(void){ void func_80295448(void){
s32 i; s32 i;
D_8037C310.unk0[0] = func_8024E67C(BUTTON_START); D_8037C310.unk0[0] = controller_getStartButton(0);
func_8024E60C(0, &D_8037C310.unk0[1]); func_8024E60C(0, &D_8037C310.unk0[1]);
func_8024E6E0(0, &D_8037C310.unk0[4]); func_8024E6E0(0, &D_8037C310.unk0[4]);
func_8024E55C(0, &D_8037C310.unk0[8]); func_8024E55C(0, &D_8037C310.unk0[8]);

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

@@ -38,7 +38,7 @@ s32 getGameMode(void);
void func_802DC5B8(void); void func_802DC5B8(void);
void func_802DC560(s32, s32); void func_802DC560(s32, s32);
s32 func_8024E67C(s32 controller_index); s32 controller_getStartButton(s32 controller_index);
bool fileProgressFlag_get(enum file_progress_e); bool fileProgressFlag_get(enum file_progress_e);
enum map_e map_get(void); enum map_e map_get(void);
bool func_802FD2D4(void); bool func_802FD2D4(void);
@@ -939,7 +939,7 @@ s32 gcPauseMenu_update(void) {
} }
} }
if (func_8024E67C(0) == 1) { if (controller_getStartButton(0) == 1) {
gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN); gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN);
} }
break; break;
@@ -955,7 +955,7 @@ s32 gcPauseMenu_update(void) {
D_80383010.unk70_30 = 0; D_80383010.unk70_30 = 0;
} }
if (func_8024E67C(0) == 1) { if (controller_getStartButton(0) == 1) {
gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN); gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN);
} }
else if (face_button[FACE_BUTTON(BUTTON_A)] == 1) { else if (face_button[FACE_BUTTON(BUTTON_A)] == 1) {
@@ -1081,7 +1081,7 @@ s32 gcPauseMenu_update(void) {
} }
}//L80313AF4 }//L80313AF4
if (func_8024E67C(0) == 1) { if (controller_getStartButton(0) == 1) {
gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN); gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN);
} }
else if (face_button[FACE_BUTTON(BUTTON_B)] == 1) { else if (face_button[FACE_BUTTON(BUTTON_B)] == 1) {
@@ -1124,7 +1124,7 @@ s32 gcPauseMenu_update(void) {
gcpausemenu_80312FD0(1); gcpausemenu_80312FD0(1);
gcpausemenu_updateBButtonAndJoystickSprites(); gcpausemenu_updateBButtonAndJoystickSprites();
if (func_8024E67C(0) == 1) { if (controller_getStartButton(0) == 1) {
D_80383010.unk1 = 3; D_80383010.unk1 = 3;
gcPauseMenu_setState(PAUSE_STATE_A_LEVEL_TOTALS_CLOSING); gcPauseMenu_setState(PAUSE_STATE_A_LEVEL_TOTALS_CLOSING);
} }
@@ -1214,7 +1214,7 @@ s32 gcPauseMenu_update(void) {
case PAUSE_STATE_10_UNKNOWN: case PAUSE_STATE_10_UNKNOWN:
gcpausemenu_printTotalsHeader(D_80383010.selection); gcpausemenu_printTotalsHeader(D_80383010.selection);
gcpausemenu_updateBButtonAndJoystickSprites(); gcpausemenu_updateBButtonAndJoystickSprites();
if (func_8024E67C(0) == 1) { if (controller_getStartButton(0) == 1) {
D_80383010.unk1 = 3; D_80383010.unk1 = 3;
gcPauseMenu_setState(PAUSE_STATE_11_UNKNOWN); gcPauseMenu_setState(PAUSE_STATE_11_UNKNOWN);
}//L80313EFC }//L80313EFC