Skip to content

Commit

Permalink
BACK_OUT -> GO_BACK
Browse files Browse the repository at this point in the history
  • Loading branch information
@AloXado320
AloXado320 committed Oct 5, 2024
1 parent 0dbb7e3 commit af9af61
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
46 changes: 23 additions & 23 deletions src/code_80091750.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8490,8 +8490,8 @@ void func_800A7A4C(s32 arg0) {
case MAIN_MENU_MODE_SELECT: /* switch 5 */
case MAIN_MENU_MODE_SUB_SELECT: /* switch 5 */
case MAIN_MENU_OK_SELECT: /* switch 5 */
case MAIN_MENU_OK_SELECT_BACK_OUT: /* switch 5 */
case MAIN_MENU_MODE_SUB_SELECT_BACK_OUT: /* switch 5 */
case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 5 */
case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 5 */
func_800A9C40(var_s1);
break;
}
Expand All @@ -8513,8 +8513,8 @@ void func_800A7A4C(s32 arg0) {
case MAIN_MENU_MODE_SELECT: /* switch 6 */
case MAIN_MENU_MODE_SUB_SELECT: /* switch 6 */
case MAIN_MENU_OK_SELECT: /* switch 6 */
case MAIN_MENU_OK_SELECT_BACK_OUT: /* switch 6 */
case MAIN_MENU_MODE_SUB_SELECT_BACK_OUT: /* switch 6 */
case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 6 */
case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 6 */
func_800A9C40(var_s1);
break;
}
Expand Down Expand Up @@ -8565,7 +8565,7 @@ void func_800A7A4C(s32 arg0) {
func_800AAB90(var_s1);
break;
case PLAYER_SELECT_MENU_OK: /* switch 10 */
case PLAYER_SELECT_MENU_OK_BACK_OUT: /* switch 10 */
case PLAYER_SELECT_MENU_OK_GO_BACK: /* switch 10 */
func_800AAA9C(var_s1);
break;
}
Expand Down Expand Up @@ -8874,14 +8874,14 @@ void func_800A8564(struct_8018D9E0_entry* arg0) {
case 0xF:
var_a0 = D_0200487C;
if ((gMainMenuSelection == MAIN_MENU_OK_SELECT) ||
(gMainMenuSelection == MAIN_MENU_OK_SELECT_BACK_OUT)) {
(gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK)) {
var_a1 = 1;
}
break;
case 0x33:
var_a0 = D_02004B74;
if ((gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK) ||
(gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK_BACK_OUT)) {
(gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK_GO_BACK)) {
var_a1 = 1;
}
break;
Expand Down Expand Up @@ -9443,8 +9443,8 @@ void func_800A9C40(struct_8018D9E0_entry* arg0) {
arg0->cursor = 1;
case 1:
func_800AA280(arg0);
if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_BACK_OUT) ||
(gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_BACK_OUT)) {
if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK) ||
(gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_GO_BACK)) {
arg0->unk1C = 0x00000020;
} else {
if (arg0->unk1C < 0x20) {
Expand Down Expand Up @@ -9477,8 +9477,8 @@ void func_800A9D5C(struct_8018D9E0_entry* arg0) {

switch (arg0->cursor) {
case 2:
if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_BACK_OUT) ||
(gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_BACK_OUT)) {
if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK) ||
(gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_GO_BACK)) {
arg0->column = 0x00000080;
arg0->row = 0x0000003E;
} else {
Expand Down Expand Up @@ -9549,8 +9549,8 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) {
arg0->unk1C = 0;
arg0->cursor = 1;
break;
case MAIN_MENU_OK_SELECT_BACK_OUT: /* switch 2 */
case MAIN_MENU_MODE_SUB_SELECT_BACK_OUT: /* switch 2 */
case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 2 */
case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 2 */
temp_v0 = func_800AAE68();
temp_v1_2 = &D_800E70E8[arg0->type - sp24];
arg0->column = temp_v0->column + temp_v1_2->column;
Expand All @@ -9570,8 +9570,8 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) {
case MAIN_MENU_MODE_SELECT: /* switch 3 */
case MAIN_MENU_MODE_SUB_SELECT: /* switch 3 */
case MAIN_MENU_OK_SELECT: /* switch 3 */
case MAIN_MENU_OK_SELECT_BACK_OUT: /* switch 3 */
case MAIN_MENU_MODE_SUB_SELECT_BACK_OUT: /* switch 3 */
case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 3 */
case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 3 */
if ((temp_a1 != sp20) && (temp_a1 != sp1C)) {
arg0->visible = 0;
arg0->cursor = 0;
Expand Down Expand Up @@ -9601,8 +9601,8 @@ void func_800A9E58(struct_8018D9E0_entry* arg0) {
case MAIN_MENU_MODE_SELECT: /* switch 4 */
case MAIN_MENU_MODE_SUB_SELECT: /* switch 4 */
case MAIN_MENU_OK_SELECT: /* switch 4 */
case MAIN_MENU_OK_SELECT_BACK_OUT: /* switch 4 */
case MAIN_MENU_MODE_SUB_SELECT_BACK_OUT: /* switch 4 */
case MAIN_MENU_OK_SELECT_GO_BACK: /* switch 4 */
case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: /* switch 4 */
if ((temp_a1 != sp20) && (temp_a1 != sp1C)) {
arg0->visible = 0;
arg0->cursor = 0;
Expand Down Expand Up @@ -9632,8 +9632,8 @@ void func_800AA280(struct_8018D9E0_entry* arg0) {
Unk_D_800E70A0* temp_v0;

temp_v0 = &D_800E70A0[arg0->type - 0xA];
if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_BACK_OUT) ||
(gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_BACK_OUT)) {
if ((gMainMenuSelection == MAIN_MENU_OK_SELECT_GO_BACK) ||
(gMainMenuSelection == MAIN_MENU_MODE_SUB_SELECT_GO_BACK)) {
arg0->column = temp_v0->column;
arg0->row = temp_v0->row;
} else {
Expand All @@ -9655,8 +9655,8 @@ void func_800AA2EC(struct_8018D9E0_entry* arg0) {
break;
case MAIN_MENU_MODE_SUB_SELECT:
case MAIN_MENU_OK_SELECT:
case MAIN_MENU_OK_SELECT_BACK_OUT:
case MAIN_MENU_MODE_SUB_SELECT_BACK_OUT:
case MAIN_MENU_OK_SELECT_GO_BACK:
case MAIN_MENU_MODE_SUB_SELECT_GO_BACK:
if (arg0->cursor != 0) {
break;
}
Expand Down Expand Up @@ -9853,7 +9853,7 @@ void func_800AAA9C(struct_8018D9E0_entry* arg0) {
arg0->cursor = 1;
/* fallthrough */
case 1:
if (gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK_BACK_OUT) {
if (gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK_GO_BACK) {
arg0->unk1C = 0x00000020;
} else {
if (arg0->unk1C < 0x20) {
Expand Down Expand Up @@ -9923,7 +9923,7 @@ void func_800AAC18(struct_8018D9E0_entry* arg0) {
temp_a1 = arg0->type - 0x2B;
switch (arg0->cursor) {
case 0:
if (gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK_BACK_OUT) {
if (gPlayerSelectMenuSelection == PLAYER_SELECT_MENU_OK_GO_BACK) {
temp_v0 = func_800AAFCC(temp_a1);
if (temp_v0 >= 0) {
var_t0 = &D_800E7188[(gScreenModeSelection * 4) + temp_v0];
Expand Down
10 changes: 5 additions & 5 deletions src/menus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ void main_menu_act(struct Controller* controller, u16 controllerIdx) {
break;
}
case MAIN_MENU_MODE_SUB_SELECT:
case MAIN_MENU_MODE_SUB_SELECT_BACK_OUT: {
case MAIN_MENU_MODE_SUB_SELECT_GO_BACK: {
if (controllerIdx == PLAYER_ONE) {
gMenuTimingCounter++;
if ((gMenuTimingCounter == 100 || gMenuTimingCounter % 300 == 0)) {
Expand Down Expand Up @@ -1456,7 +1456,7 @@ void main_menu_act(struct Controller* controller, u16 controllerIdx) {
break;
}
case MAIN_MENU_OK_SELECT:
case MAIN_MENU_OK_SELECT_BACK_OUT: {
case MAIN_MENU_OK_SELECT_GO_BACK: {
if ((controllerIdx == PLAYER_ONE) && (++gMenuTimingCounter == 60 || gMenuTimingCounter % 300 == 0)) {
play_sound2(SOUND_MENU_OK);
}
Expand Down Expand Up @@ -1909,14 +1909,14 @@ void load_menu_states(s32 menuSelection) {
break;
}
case MENU_FADE_TYPE_BACK: {
gMainMenuSelection = MAIN_MENU_OK_SELECT_BACK_OUT;
gMainMenuSelection = MAIN_MENU_OK_SELECT_GO_BACK;
break;
}
case MENU_FADE_TYPE_DATA: {
// why...
switch (gMainMenuSelection) {
default:
gMainMenuSelection = MAIN_MENU_MODE_SUB_SELECT_BACK_OUT;
gMainMenuSelection = MAIN_MENU_MODE_SUB_SELECT_GO_BACK;
break;
case MAIN_MENU_OPTION:
case MAIN_MENU_DATA:
Expand Down Expand Up @@ -1961,7 +1961,7 @@ void load_menu_states(s32 menuSelection) {
break;
}
case MENU_FADE_TYPE_BACK: {
gPlayerSelectMenuSelection = PLAYER_SELECT_MENU_OK_BACK_OUT;
gPlayerSelectMenuSelection = PLAYER_SELECT_MENU_OK_GO_BACK;
for (i = 0; i < ARRAY_COUNT(gCharacterGridIsSelected); i++) {
if (gPlayerCount > i) {
gCharacterGridIsSelected[i] = true;
Expand Down
6 changes: 3 additions & 3 deletions src/menus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ enum MainMenuSelectionType {
MAIN_MENU_MODE_SELECT, // Mario GP - T. Trials - VS - Battle
MAIN_MENU_MODE_SUB_SELECT, // CC Selection and T.Trials options (Begin, Data)
MAIN_MENU_OK_SELECT, // OK option after selecting a submode
MAIN_MENU_OK_SELECT_BACK_OUT, // OK option after backing out player select
MAIN_MENU_MODE_SUB_SELECT_BACK_OUT // Used in T.Trials after backing out Data menu
MAIN_MENU_OK_SELECT_GO_BACK, // OK option after going back from player select
MAIN_MENU_MODE_SUB_SELECT_GO_BACK // Used in T.Trials after going back to Data option from course data
};

/**
Expand All @@ -107,7 +107,7 @@ enum PlayerSelectMenuSelectionTypes {
PLAYER_SELECT_MENU_NONE,
PLAYER_SELECT_MENU_MAIN,
PLAYER_SELECT_MENU_OK, // OK option after selecting characters
PLAYER_SELECT_MENU_OK_BACK_OUT // OK option after backing out map select
PLAYER_SELECT_MENU_OK_GO_BACK // OK option after going back from map select
};

/**
Expand Down

0 comments on commit af9af61

Please sign in to comment.