diff --git a/src/core1/code_10A00.c b/src/core1/code_10A00.c index 9e485021..0eb396ae 100644 --- a/src/core1/code_10A00.c +++ b/src/core1/code_10A00.c @@ -128,7 +128,7 @@ f32 func_8024E668(s32 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; } diff --git a/src/core2/code_5C240.c b/src/core2/code_5C240.c index 94b951f4..91fa5178 100644 --- a/src/core2/code_5C240.c +++ b/src/core2/code_5C240.c @@ -147,7 +147,7 @@ void func_802E35D8(void ) { if (D_8037E8C0.unk18 > 15.0f) { sp38++; } - if (func_8024E67C(0) == 1) { + if (controller_getStartButton(0) == 1) { sp38++; } if (sp38 != 0) { diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 1cb72504..cbb5126d 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -527,7 +527,7 @@ bool func_802E4424(void) { case GAME_MODE_7_ATTRACT_DEMO: case GAME_MODE_9_BANJO_AND_KAZOOIE: 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); } break; @@ -547,7 +547,7 @@ bool func_802E4424(void) { && dummy_func_80320248() ) { 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); } else if (sp1C == 0) { func_802E3BF8(GAME_MODE_3_NORMAL, 1U); diff --git a/src/core2/code_E410.c b/src/core2/code_E410.c index 7dda2712..97be2874 100644 --- a/src/core2/code_E410.c +++ b/src/core2/code_E410.c @@ -24,7 +24,7 @@ void func_802953A0(void){ void func_80295448(void){ 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_8024E6E0(0, &D_8037C310.unk0[4]); func_8024E55C(0, &D_8037C310.unk0[8]); diff --git a/src/core2/gc/pauseMenu.c b/src/core2/gc/pauseMenu.c index 68a85923..9850c872 100644 --- a/src/core2/gc/pauseMenu.c +++ b/src/core2/gc/pauseMenu.c @@ -38,7 +38,7 @@ s32 getGameMode(void); void func_802DC5B8(void); void func_802DC560(s32, s32); -s32 func_8024E67C(s32 controller_index); +s32 controller_getStartButton(s32 controller_index); bool fileProgressFlag_get(enum file_progress_e); enum map_e map_get(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); } break; @@ -955,7 +955,7 @@ s32 gcPauseMenu_update(void) { D_80383010.unk70_30 = 0; } - if (func_8024E67C(0) == 1) { + if (controller_getStartButton(0) == 1) { gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN); } else if (face_button[FACE_BUTTON(BUTTON_A)] == 1) { @@ -1081,7 +1081,7 @@ s32 gcPauseMenu_update(void) { } }//L80313AF4 - if (func_8024E67C(0) == 1) { + if (controller_getStartButton(0) == 1) { gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN); } else if (face_button[FACE_BUTTON(BUTTON_B)] == 1) { @@ -1124,7 +1124,7 @@ s32 gcPauseMenu_update(void) { gcpausemenu_80312FD0(1); gcpausemenu_updateBButtonAndJoystickSprites(); - if (func_8024E67C(0) == 1) { + if (controller_getStartButton(0) == 1) { D_80383010.unk1 = 3; gcPauseMenu_setState(PAUSE_STATE_A_LEVEL_TOTALS_CLOSING); } @@ -1214,7 +1214,7 @@ s32 gcPauseMenu_update(void) { case PAUSE_STATE_10_UNKNOWN: gcpausemenu_printTotalsHeader(D_80383010.selection); gcpausemenu_updateBButtonAndJoystickSprites(); - if (func_8024E67C(0) == 1) { + if (controller_getStartButton(0) == 1) { D_80383010.unk1 = 3; gcPauseMenu_setState(PAUSE_STATE_11_UNKNOWN); }//L80313EFC