mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-16 20:47:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Naming global variables related to menu navigation (#119)

Browse Source 
* Naming of global variables related to the game menu and Controller Pak menu
This commit is contained in:
ChiefFruitcake
2022-01-01 04:35:37 -05:00
committed by GitHub
parent f250fb6e45
commit 4d9ca02750
53 changed files with 403 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800029B0.c
+2 -2
View File
@@ -41,7 +41,7 @@ extern s8 D_8018EDF3;
extern s8 gCupSelection;
extern u32 D_800DC530;
extern u32 gScreenModeSelection;
extern u32 D_8015F730;
extern u32 D_8015F734;
extern u32 gPrevLoadedAddress;
@@ -143,7 +143,7 @@ void func_80002A18(void) {
if (gModeSelection == GRAND_PRIX) {
gCurrentCourseId = gCupCourseOrder[gCupSelection][gCupCourseSelection];
}
D_800DC52C = D_800DC530;
D_800DC52C = gScreenModeSelection;
if (gCurrentCourseId != gCurrentlyLoadedCourseId) {
D_80150120 = 0;
gCurrentlyLoadedCourseId = gCurrentCourseId;
src/code_80005FD0.c
+1 -1
View File
@@ -8518,7 +8518,7 @@ loop_2:
phi_fp = temp_fp;
phi_s7_2 += 0x10C;
} while (temp_fp < 2);
temp_v0_2 = D_800DC530;
temp_v0_2 = gScreenModeSelection;
phi_s6_3 = &D_801635A0;
phi_a2 = &D_801635A0;
if (temp_v0_2 != 0) {
src/code_800431B0.c
+3 -3
View File
@@ -6412,7 +6412,7 @@ void func_80050E34(s32 arg0, s32 arg1) {
gDisplayListHead = temp_v0_26 + 8;
temp_v0_26->unk0 = 0x6000000;
temp_v0_26->unk4 = &D_0D006950;
if ((spAC == D_800DC4DC) && (D_800DC530 == 0)) {
if ((spAC == D_800DC4DC) && (gScreenModeSelection == SCREEN_MODE_1P)) {
temp_v0_27 = gDisplayListHead;
gDisplayListHead = temp_v0_27 + 8;
temp_v0_27->unk4 = &D_0D007A40;
@@ -6449,7 +6449,7 @@ void func_800514BC(void) {
s32 phi_s0;
s32 phi_s1;
if (D_800DC530 == 0) {
if (gScreenModeSelection == SCREEN_MODE_1P) {
func_800508C0();
}
phi_s3 = 8;
@@ -7705,7 +7705,7 @@ void func_800532A4(s32 arg0) {
temp_v0_2 = temp_s0->unkD9;
func_800485C4(temp_s1_2, temp_s0 + 0xB2, temp_s0->unk0, temp_s0->unkA0, temp_s0->unk60, temp_s0->unk64, temp_s0->unk74, temp_v0_2, temp_v1_2, temp_v0_2, temp_v1_2 / 2);
}
if (D_800DC530 == 0) {
if (gScreenModeSelection == SCREEN_MODE_1P) {
temp_v0_3 = D_8018CF14;
temp_f0 = temp_s0->unk4 - temp_v0_3->unk0;
temp_f2 = temp_s0->unkC - temp_v0_3->unk8;
src/code_80057C60.c
+9 -9
View File
@@ -721,7 +721,7 @@ extern s8 D_80165801;
extern s32 D_8018D188;
extern s32 D_8018D2BC;
extern s32 D_800DC530;
extern s32 gScreenModeSelection;
void func_800591B4(void) {
@@ -742,7 +742,7 @@ void func_800591B4(void) {
}
func_8004F3E4(0);
}
if ((D_800DC530 == 1) && (D_80165801 != 0)) {
if ((gScreenModeSelection == SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL) && (D_80165801 != 0)) {
func_8004EE54(1);
if (gModeSelection != BATTLE) {
func_8004F020(1);
@@ -1094,8 +1094,8 @@ void func_80059AC8(void) {
phi_s0++;
} //while (phi_s0 != 8);
switch (D_800DC530) {
case 0:
switch (gScreenModeSelection) {
case SCREEN_MODE_1P:
if (D_800DC50C != 9) {
func_80059A88(0);
if (gModeSelection == 1) {
@@ -1105,15 +1105,15 @@ void func_80059AC8(void) {
func_80059820(0);
}
break;
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
func_80059A88(0);
func_80059A88(1);
break;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
func_80059A88(0);
func_80059A88(1);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
func_80059A88(0);
func_80059A88(1);
func_80059A88(2);
@@ -1197,7 +1197,7 @@ void func_80059D00(void) {
func_8005A3C0();
func_8005A380();
if (D_801657AE == 0) {
temp_v0 = D_800DC530;
temp_v0 = gScreenModeSelection;
if (temp_v0 != 0) {
if (temp_v0 != 1) {
if (temp_v0 != 2) {
@@ -3096,7 +3096,7 @@ void func_8005CB60(s32 arg0, s32 arg1) {
} else {
arg0 = temp_a3;
func_800413B8(temp_s0 + 4, 0x3F800000, 0x3E000000, temp_a3);
temp_v0_6 = D_800DC530;
temp_v0_6 = gScreenModeSelection;
if (temp_v0_6 != 0) {
if (temp_v0_6 != 1) {
if (temp_v0_6 != 2) {
src/code_8006E9C0.c
+7 -7
View File
@@ -3,24 +3,24 @@
#include <defines.h>
void func_8006EA5C(void);
extern s32 D_800DC530;
extern s32 gScreenModeSelection;
void func_8006E9C0(void) {
func_8006EA5C();
func_8006FA94();
switch (D_800DC530) {
case 0:
switch (gScreenModeSelection) {
case SCREEN_MODE_1P:
func_80071428();
break;
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
func_80071818();
break;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
func_80071A20();
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
func_80071C28();
break;
}
@@ -837,7 +837,7 @@ void func_8006FA94(void) {
D_8018D180 = 0x96;
D_8018D2AC = 0x3C;
}
} else if (D_800DC530 == 1) {
} else if (gScreenModeSelection == SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL) {
temp_v0 = gModeSelection;
if (temp_v0 == GRAND_PRIX) {
D_8018D114 = 2;
src/code_80071F00.c
+2 -2
View File
@@ -4942,7 +4942,7 @@ extern ? D_80183DB8;
void func_80078F64(void) {
s32 temp_v0;
temp_v0 = D_800DC530;
temp_v0 = gScreenModeSelection;
if (temp_v0 != 0) {
if (temp_v0 != 1) {
if (temp_v0 != 2) {
@@ -10023,7 +10023,7 @@ void func_80080A4C(s32 arg0, s32 arg1) {
sp1C = (arg1 * 0xB8) + camera1;
temp_a3 = &D_800DC4DC[arg1];
if (D_800DC530 != 3) {
if (gScreenModeSelection != 3) {
sp18 = temp_a3;
if ((func_80072320(0x10, temp_a3) != 0) && (func_80088A58(arg0, temp_a3, 0x43FA0000, temp_a3) != 0)) {
func_8001CA10(sp1C);
src/code_80091750.c
+97 -97
View File
@@ -1901,7 +1901,7 @@ void func_80094A64(s32 arg0) {
case COURSE_DATA_MENU:
case LOGO_INTRO_MENU:
case CONTROLLER_PAK_MENU:
case GAME_SELECT_MENU:
case MAIN_MENU:
case PLAYER_SELECT_MENU:
case COURSE_SELECT_MENU:
func_800A8230();
@@ -2013,7 +2013,7 @@ void func_80094C60(void) {
D_800DC51C = 0;
D_8018EE08 = 0;
break;
case GAME_SELECT_MENU:
case MAIN_MENU:
func_8009E650(0x23, 0, 0, 2);
func_8009E650(0xA, 0x15E, 0x11, 6);
func_8009E650(0xE, 0x15E, 0x3E, 6);
@@ -6433,8 +6433,8 @@ void func_8009CE64(s32 *arg0, s32 arg2, s32 arg3) {
gCreditsCourseId = COURSE_LUIGI_RACEWAY;
return;
}
gMenuSelectionFromEndingSequence = GAME_SELECT_MENU_FROM_QUIT;
gMenuSelection = GAME_SELECT_MENU;
gMenuSelectionFromEndingSequence = MAIN_MENU_FROM_QUIT;
gMenuSelection = MAIN_MENU;
return;
}
if (temp_v0 == RACING) {
@@ -6589,7 +6589,7 @@ block_74:
switch (gNextDemoId) { /* switch 4 */
case DEMO_ONE: /* switch 4 */
gCurrentCourseId = COURSE_MARIO_RACEWAY;
D_800DC530 = 0;
gScreenModeSelection = SCREEN_MODE_1P;
gPlayerCountSelection1 = 1;
D_8018EDF3 = 1;
D_800E86A8[0] = MARIO;
@@ -6597,7 +6597,7 @@ block_74:
break;
case DEMO_TWO: /* switch 4 */
gCurrentCourseId = COURSE_CHOCO_MOUNTAIN;
D_800DC530 = 1;
gScreenModeSelection = SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL;
gPlayerCountSelection1 = 2;
D_8018EDF3 = 2;
D_800E86A8[0] = YOSHI;
@@ -6607,7 +6607,7 @@ block_74:
break;
case DEMO_THREE: /* switch 4 */
gCurrentCourseId = COURSE_KALAMARI_DESERT;
D_800DC530 = 0;
gScreenModeSelection = SCREEN_MODE_1P;
gPlayerCountSelection1 = 1;
D_8018EDF3 = 1;
D_800E86A8[0] = LUIGI;
@@ -6615,7 +6615,7 @@ block_74:
break;
case DEMO_FOUR: /* switch 4 */
gCurrentCourseId = COURSE_WARIO_STADIUM;
D_800DC530 = 3;
gScreenModeSelection = SCREEN_MODE_3P_4P_SPLITSCREEN;
gPlayerCountSelection1 = 3;
D_8018EDF3 = 3;
D_800E86A8[0] = WARIO;
@@ -6626,7 +6626,7 @@ block_74:
break;
case DEMO_FIVE: /* switch 4 */
gCurrentCourseId = COURSE_BOWSER_CASTLE;
D_800DC530 = 0;
gScreenModeSelection = SCREEN_MODE_1P;
gPlayerCountSelection1 = 1;
D_8018EDF3 = 1;
D_800E86A8[0] = BOWSER;
@@ -6635,7 +6635,7 @@ block_74:
break;
case DEMO_SIX: /* switch 4 */
gCurrentCourseId = COURSE_SHERBET_LAND;
D_800DC530 = 3;
gScreenModeSelection = SCREEN_MODE_3P_4P_SPLITSCREEN;
gPlayerCountSelection1 = 4;
D_8018EDF3 = 4;
D_800E86A8[0] = MARIO;
@@ -6659,11 +6659,11 @@ block_74:
temp_v1_5 = gMenuSelection;
phi_a0 = &gMenuSelection;
if (temp_v1_5 != DATA_MENU) {
if (temp_v1_5 == GAME_SELECT_MENU) {
if (temp_v1_5 == MAIN_MENU) {
gMenuSelection = DATA_MENU;
}
} else {
gMenuSelection = GAME_SELECT_MENU;
gMenuSelection = MAIN_MENU;
}
break;
case 4: /* switch 3 */
@@ -6671,7 +6671,7 @@ block_74:
phi_t7 = 0xB;
phi_a0 = &gMenuSelection;
if (temp_v1_6 != OPTIONS_MENU) {
if (temp_v1_6 == GAME_SELECT_MENU) {
if (temp_v1_6 == MAIN_MENU) {
gMenuSelection = OPTIONS_MENU;
}
} else {
@@ -6707,7 +6707,7 @@ block_74:
D_800DC524 = ENDING_SEQUENCE;
}
func_8000F124(1, 2);
if ((D_800DC530 == 3) && ((temp_v1_8 = gModeSelection, (temp_v1_8 == 0)) || (temp_v1_8 == 1))) {
if ((gScreenModeSelection == SCREEN_MODE_3P_4P_SPLITSCREEN) && ((temp_v1_8 = gModeSelection, (temp_v1_8 == 0)) || (temp_v1_8 == 1))) {
gModeSelection = VERSUS;
}
temp_a0_2 = gCurrentCourseId;
@@ -6726,7 +6726,7 @@ block_74:
gModeSelection = BATTLE;
if (gPlayerCountSelection1 == 1) {
D_8018EDF3 = 2;
D_800DC530 = 1;
gScreenModeSelection = SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL;
gPlayerCountSelection1 = D_8018EDF3;
}
}
@@ -8427,7 +8427,7 @@ void *segmented_to_virtual(segment_address_t); /* extern */
extern s32 D_800DC540;
extern s32 D_800DC548;
extern ? D_8018EDE8;
extern s8 D_8018EDED;
extern s8 gMainMenuSelectionDepth;
extern s8 D_8018EDF3;
extern s8 D_802874F6;
extern ? gCharacterSelections;
@@ -8703,9 +8703,9 @@ void func_8009F5E0(void *arg0) {
func_800A143C(arg0, spAC);
return;
case 0x8C: /* switch 3 */
temp_v0_4 = D_8018EDED;
if ((temp_v0_4 >= 5) && (spAC == (temp_t0 - spA8))) {
if (temp_v0_4 >= 6) {
temp_v0_4 = gMainMenuSelectionDepth;
if ((temp_v0_4 >= GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION) && (spAC == (temp_t0 - spA8))) {
if (temp_v0_4 >= CONFIRM_OK_SELECTION) {
temp_a1_2 = arg0->unkC;
temp_a2_3 = arg0->unk10;
phi_v0 = func_80098C18(gDisplayListHead, temp_a1_2, temp_a2_3, temp_a1_2 + 0x3F, temp_a2_3 + 0x11, 0xFF, 0xF9, 0xDC, 0xFF);
@@ -8918,7 +8918,7 @@ void func_8009F5E0(void *arg0) {
phi_v1_2 = temp_v1_5;
if (temp_v1_5 < 0x20) {
temp_t9 = (temp_v1_5 * 0x3A) / 64;
if ((temp_t0 - 0xF) == D_8018EDED) {
if ((temp_t0 - 0xF) == gMainMenuSelectionDepth) {
temp_v0_9 = arg0->unkC;
temp_v1_6 = arg0->unk10;
gDisplayListHead = func_800959CC(gDisplayListHead, temp_v0_9 + temp_t9, temp_v1_6, (temp_v0_9 - temp_t9) + 0x39, temp_v1_6 + 0x12);
@@ -8990,9 +8990,9 @@ block_58:
break;
}
if (phi_a2_2 != -1) {
temp_v0_12 = D_8018EDED;
if ((temp_v0_12 >= 5) && (phi_a2_2 == (arg0->unk0 - phi_a1))) {
if (temp_v0_12 >= 6) {
temp_v0_12 = gMainMenuSelectionDepth;
if ((temp_v0_12 >= GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION) && (phi_a2_2 == (arg0->unk0 - phi_a1))) {
if (temp_v0_12 >= CONFIRM_OK_SELECTION) {
temp_a1_5 = arg0->unkC;
temp_a2_8 = arg0->unk10;
phi_v0_3 = func_80098C18(gDisplayListHead, temp_a1_5, temp_a2_8, temp_a1_5 + 0x3F, temp_a2_8 + 0x11, 0xFF, 0xF9, 0xDC, 0xFF);
@@ -9168,7 +9168,7 @@ void func_800A0AD0(struct_8018D9E0_entry *unused) {
struct_8018D9E0_entry *temp_t1;
// Find struct_8018D9E0_entry with a type/id of 0xDA
temp_t1 = func_800AAEF4(0xDA);
if ((gMenuState != 1) && (gMenuState != 2))
if ((gControllerPakMenuSelection != CONTROLLER_PAK_MENU_SELECT_RECORD) && (gControllerPakMenuSelection != CONTROLLER_PAK_MENU_END))
{
gDPSetPrimColor(gDisplayListHead++, 0, 0, 0xFF, temp_t1->unk20, 0x00, 0xFF);
gDisplayListHead = func_8009BA74(gDisplayListHead, &D_02001874, 0x24, (gControllerPakSelectedTableRow * 0xA) + 0x7C);
@@ -9283,7 +9283,7 @@ void *func_800AAEF4(?); // extern
extern ? D_0200184C;
extern ? D_800E7278;
extern void *gDisplayListHead;
extern s8 gMenuState;
extern s8 gControllerPakMenuSelection;
void func_800A0EB8(s32 arg0, s32 arg1) {
s8 temp_v0;
@@ -9294,15 +9294,15 @@ void func_800A0EB8(s32 arg0, s32 arg1) {
temp_t3 = func_800AAEF4(0xDA);
if (arg1 == 0) {
if (gMenuState == 2) {
if (gControllerPakMenuSelection == CONTROLLER_PAK_MENU_END) {
phi_t1 = 1;
} else {
phi_t1 = 0;
}
goto block_7;
}
temp_v0 = gMenuState;
if ((temp_v0 == 3) || (temp_v0 == 4)) {
temp_v0 = gControllerPakMenuSelection;
if ((temp_v0 == CONTROLLER_PAK_MENU_ERASE) || (temp_v0 == CONTROLLER_PAK_MENU_QUIT)) {
phi_t1 = ((arg1 * 2) + temp_v0) - 3;
block_7:
temp_t0 = gDisplayListHead;
@@ -11437,7 +11437,7 @@ void func_800A4EF8(void *arg0) {
temp_t3 = temp_v0->unk2C / 2;
temp_t4 = temp_v0->unk2E / 2;
gDisplayListHead = draw_box(gDisplayListHead, temp_v1 - temp_t3, temp_t0 - temp_t4, temp_v1 + temp_t3, temp_t0 + temp_t4, 0, 0, 0, 0x8C);
temp_s3 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8540;
temp_s3 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8540;
phi_a1 = 0;
phi_s2 = 0;
do {
@@ -11498,7 +11498,7 @@ void func_800A5084(void *arg0) {
temp_t3 = temp_v0->unk2C / 2;
temp_t4 = temp_v0->unk2E / 2;
gDisplayListHead = draw_box(gDisplayListHead, temp_v1 - temp_t3, temp_t0 - temp_t4, temp_v1 + temp_t3, temp_t0 + temp_t4, 0, 0, 0, 0x8C);
temp_s3 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E85C0;
temp_s3 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E85C0;
temp_s0 = ((get_string_width(*(&D_800E7500 + (gCupSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
temp_s1 = ((get_string_width(*(&D_800E76CC + (gCCSelection * 4))) * 1.0f) + 10.0f) / 2.0f;
set_text_color(TEXT_YELLOW);
@@ -11553,7 +11553,7 @@ void func_800A5360(void *arg0) {
temp_t3 = temp_v0->unk2C / 2;
temp_t4 = temp_v0->unk2E / 2;
gDisplayListHead = draw_box(gDisplayListHead, temp_v1 - temp_t3, temp_t0 - temp_t4, temp_v1 + temp_t3, temp_t0 + temp_t4, 0, 0, 0, 0x8C);
temp_s3 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8600;
temp_s3 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8600;
phi_a1 = 0;
phi_s2 = 0;
do {
@@ -11620,16 +11620,16 @@ void func_800A54EC(void) {
if (temp_t2 != BATTLE) {
phi_v1 = sp4C;
} else {
phi_v1 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8600;
phi_v1 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8600;
}
} else {
phi_v1 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8540;
phi_v1 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8540;
}
} else {
phi_v1 = &D_800E8538;
}
} else {
phi_v1 = ((D_800DC530 << 5) + (D_800DC5FC * 8)) - 8 + &D_800E85C0;
phi_v1 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E85C0;
}
sp50 = phi_v1->unk0 - 8;
sp52 = (phi_v1->unk2 + ((sp48->unk4 - *(&D_800F0B50 + temp_t2)) * 0xD)) - 8;
@@ -13076,18 +13076,18 @@ block_7:
break;
case 0x10: /* switch 4 */
case 0x11: /* switch 4 */
temp_t9 = D_8018EDED;
switch (temp_t9) { /* switch 5 */
case 1: /* switch 5 */
case 2: /* switch 5 */
case 3: /* switch 5 */
temp_t9 = gMainMenuSelectionDepth;
switch (temp_t9) { /* switch 5 */
case OPTIONS_SELECTION: /* switch 5 */
case DATA_SELECTION: /* switch 5 */
case PLAYER_NUM_SELECTION: /* switch 5 */
func_800A9B9C(phi_s1);
break;
case 4: /* switch 5 */
case 5: /* switch 5 */
case 6: /* switch 5 */
case 7: /* switch 5 */
case 8: /* switch 5 */
case GAME_MODE_SELECTION: /* switch 5 */
case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 5 */
case CONFIRM_OK_SELECTION: /* switch 5 */
case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 5 */
case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 5 */
func_800A9C40(phi_s1);
break;
}
@@ -13100,18 +13100,18 @@ block_7:
case 0xC: /* switch 4 */
case 0xD: /* switch 4 */
case 0xE: /* switch 4 */
temp_t1 = D_8018EDED;
switch (temp_t1) { /* switch 6 */
case 1: /* switch 6 */
case 2: /* switch 6 */
case 3: /* switch 6 */
temp_t1 = gMainMenuSelectionDepth;
switch (temp_t1) { /* switch 6 */
case OPTIONS_SELECTION: /* switch 6 */
case DATA_SELECTION: /* switch 6 */
case PLAYER_NUM_SELECTION: /* switch 6 */
func_800A9B9C(phi_s1);
break;
case 4: /* switch 6 */
case 5: /* switch 6 */
case 6: /* switch 6 */
case 7: /* switch 6 */
case 8: /* switch 6 */
case GAME_MODE_SELECTION: /* switch 6 */
case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 6 */
case CONFIRM_OK_SELECTION: /* switch 6 */
case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 6 */
case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 6 */
func_800A9C40(phi_s1);
break;
}
@@ -13230,7 +13230,7 @@ void *func_80098C18(void *, s32, s32, s32, s32, s32, s32, s32, s32); // extern
void *func_80098FC8(void *, s32, s32, s32, s32); // extern
extern ? D_800E86AC;
extern ? D_800F2B60;
extern s8 D_8018EDED;
extern s8 gMainMenuSelectionDepth;
extern void *gDisplayListHead;
void func_800A8270(s32 arg0, void *arg1) {
@@ -13278,10 +13278,10 @@ void func_800A8270(s32 arg0, void *arg1) {
temp_s3 = temp_t1 + temp_t6;
phi_s3 = temp_s3;
if ((arg0 + 1) == D_8018EDF3) {
temp_v0_4 = D_8018EDED;
temp_v0_4 = gMainMenuSelectionDepth;
temp_s3_2 = temp_t1 + temp_t6;
phi_s3 = temp_s3_2;
if ((temp_v0_4 == 1) || (temp_v0_4 == 2) || (temp_v0_4 == 3)) {
if ((temp_v0_4 == OPTIONS_SELECTION) || (temp_v0_4 == DATA_SELECTION) || (temp_v0_4 == PLAYER_NUM_SELECTION)) {
temp_s4_2 = (temp_t1 - temp_t6) + 0x3F;
phi_v0 = func_800959A0(gDisplayListHead, temp_s3_2, temp_s0, temp_s4_2, temp_s0 + 0x35);
phi_s4 = temp_s4_2;
@@ -13303,7 +13303,7 @@ void func_800A8270(s32 arg0, void *arg1) {
phi_s0 = temp_s0 + 0x41;
if (*temp_s7 >= 0) {
do {
if ((phi_s2 == *(arg0 + &D_800E86AC)) && ((arg0 + 1) == D_8018EDF3) && (temp_v0_5 = D_8018EDED, ((temp_v0_5 < 4) == 0))) {
if ((phi_s2 == *(arg0 + &D_800E86AC)) && ((arg0 + 1) == D_8018EDF3) && (temp_v0_5 = gMainMenuSelectionDepth, ((temp_v0_5 < GAME_MODE_SELECTION) == 0))) {
if (temp_v0_5 == 4) {
phi_v0_2 = func_800959A0(gDisplayListHead, phi_s3, phi_s0, phi_s4, phi_s0 + 0x11);
} else {
@@ -13333,7 +13333,7 @@ extern ? D_0200487C;
extern ? D_02004B74;
extern ? D_02004E80;
extern s8 D_8018EDEC;
extern s8 D_8018EDED;
extern s8 gMainMenuSelectionDepth;
extern s8 D_8018EDEE;
extern s32 gDisplayListHead;
@@ -13375,10 +13375,10 @@ void func_800A8564(void *arg0) {
}
goto block_12;
}
temp_v0_3 = D_8018EDED;
temp_v0_3 = gMainMenuSelectionDepth;
phi_a0 = &D_0200487C;
phi_a0 = &D_0200487C;
if ((temp_v0_3 == 6) || (temp_v0_3 == 7)) {
if ((temp_v0_3 == CONFIRM_OK_SELECTION) || (temp_v0_3 == CONFIRM_OK_SELECTION_FROM_BACK_OUT)) {
block_11:
phi_a1 = 1;
}
@@ -13998,22 +13998,22 @@ void func_800A9710(void *arg0) {
s8 temp_t6;
s32 phi_v0;
switch (gMenuState) {
case 3:
case 4:
switch (gControllerPakMenuSelection) {
case CONTROLLER_PAK_MENU_ERASE:
case CONTROLLER_PAK_MENU_QUIT:
phi_v0 = 1;
break;
case 6:
case 7:
case CONTROLLER_PAK_MENU_GO_TO_ERASING:
case CONTROLLER_PAK_MENU_ERASING:
phi_v0 = 5;
break;
case 8:
case CONTROLLER_PAK_MENU_ERASE_ERROR_NOT_ERASED:
phi_v0 = 2;
break;
case 9:
case CONTROLLER_PAK_MENU_ERASE_ERROR_NO_PAK:
phi_v0 = 3;
break;
case 10:
case CONTROLLER_PAK_MENU_ERASE_ERROR_PAK_CHANGED:
phi_v0 = 4;
break;
default:
@@ -14185,7 +14185,7 @@ extern ? D_800F0C9C;
extern ? D_800F0CA7;
extern ? D_800F0CAB;
extern s8 D_8018EDEC;
extern s8 D_8018EDED;
extern s8 gMainMenuSelectionDepth;
extern s8 D_8018EDEE;
void func_800A9A98(void *arg0) {
@@ -14208,7 +14208,7 @@ void func_800A9A98(void *arg0) {
phi_v0 = *(&D_800F0CA7 + D_8018EDEE);
}
} else {
phi_v0 = *(&D_800F0C9C + 3 + D_8018EDED);
phi_v0 = *(&D_800F0C9C + 3 + gMainMenuSelectionDepth);
}
if (phi_v0 != 0) {
if (phi_v0 != 1) {
@@ -14315,8 +14315,8 @@ void func_800A9C40(void *arg0) {
arg0->unk4 = 1;
case 1:
func_800AA280();
temp_v0 = D_8018EDED;
if ((temp_v0 == 7) || (temp_v0 == 8)) {
temp_v0 = gMainMenuSelectionDepth;
if ((temp_v0 == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || (temp_v0 == TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT)) {
arg0->unk1C = 0x20;
return;
}
@@ -14359,8 +14359,8 @@ void func_800A9D5C(void *arg0) {
temp_t1 = arg0->unk4;
switch (temp_t1) {
case 2:
temp_v0 = D_8018EDED;
if ((temp_v0 == 7) || (temp_v0 == 8)) {
temp_v0 = gMainMenuSelectionDepth;
if ((temp_v0 == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || (temp_v0 == TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT)) {
arg0->unkC = 0x80;
arg0->unk10 = 0x3E;
return;
@@ -14451,7 +14451,7 @@ block_5:
if (temp_v1 != 2) {
return;
}
temp_t9 = D_8018EDED;
temp_t9 = gMainMenuSelectionDepth;
switch (temp_t9) { /* switch 4 */
if ((temp_a1 != sp20) && (temp_a1 != sp1C)) {
arg0->unk15 = 0;
@@ -14474,7 +14474,7 @@ block_5:
goto block_37;
}
} else {
temp_t2 = D_8018EDED;
temp_t2 = gMainMenuSelectionDepth;
switch (temp_t2) { /* switch 3 */
if ((temp_a1 != sp20) && (temp_a1 != sp1C)) {
arg0->unk15 = 0;
@@ -14511,11 +14511,11 @@ block_37:
return;
}
arg0->unk20 = temp_a2;
temp_t5 = D_8018EDED;
temp_t5 = gMainMenuSelectionDepth;
switch (temp_t5) { /* switch 2 */
case 4: /* switch 2 */
case 5: /* switch 2 */
case 6: /* switch 2 */
case GAME_MODE_SELECTION: /* switch 2 */
case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 2 */
case CONFIRM_OK_SELECTION: /* switch 2 */
arg0->unk15 = 1;
temp_v0_4 = func_800AAE68(arg0, temp_a1, temp_a2);
arg0->unkC = temp_v0_4->unkC;
@@ -14523,8 +14523,8 @@ block_37:
arg0->unk4 = 1;
arg0->unk10 = (*(&D_800E86AB + D_8018EDF3) * 0x12) + temp_v0_4->unk10 + 0x41;
return;
case 7: /* switch 2 */
case 8: /* switch 2 */
case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 2 */
case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 2 */
temp_v0_5 = func_800AAE68(arg0, temp_a1, temp_a2);
temp_v1_4 = (arg0->unk0 * 8) + -(sp24 * 8) + &D_800E70E8;
arg0->unkC = temp_v0_5->unkC + temp_v1_4->unk0;
@@ -14548,15 +14548,15 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A9E58.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800A91D8(s16, s16); // extern
extern ? D_800E70A0;
extern s8 D_8018EDED;
extern s8 gMainMenuSelectionDepth;
void func_800AA280(void *arg0) {
s8 temp_v1;
void *temp_v0;
temp_v1 = D_8018EDED;
temp_v1 = gMainMenuSelectionDepth;
temp_v0 = (arg0->unk0 * 8) - 0x50 + &D_800E70A0;
if ((temp_v1 == 7) || (temp_v1 == 8)) {
if ((temp_v1 == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || (temp_v1 == TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT)) {
arg0->unkC = temp_v0->unk0;
arg0->unk10 = temp_v0->unk2;
return;
@@ -14590,19 +14590,19 @@ void func_800AA2EC(void *arg0) {
s8 temp_v0;
s32 phi_t1;
temp_t6 = D_8018EDED;
temp_t6 = gMainMenuSelectionDepth;
phi_t1 = 0;
switch (temp_t6) {
case 1:
case 2:
case 3:
case 4:
case OPTIONS_SELECTION:
case DATA_SELECTION:
case PLAYER_NUM_SELECTION:
case GAME_MODE_SELECTION:
arg0->unk4 = 0;
return;
case 5:
case 6:
case 7:
case 8:
case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION:
case CONFIRM_OK_SELECTION:
case CONFIRM_OK_SELECTION_FROM_BACK_OUT:
case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT:
if ((arg0->unk4 == 0) && (temp_v0 = D_8018EDF3, (temp_v0 == 1)) && (*(&D_800E86AB + temp_v0) == 1)) {
if (D_800E86F8 != 0) {
sp20 = 0;
@@ -14960,7 +14960,7 @@ void func_800AAC18(void *arg0) {
temp_v0 = func_800AAFCC(temp_a0, temp_a1, MIPS2C_ERROR(Read from unset register $a2), temp_a3);
temp_a3_2 = arg0;
if (temp_v0 >= 0) {
temp_t0 = (D_800DC530 << 5) + (temp_v0 * 8) + &D_800E7188;
temp_t0 = (gScreenModeSelection << 5) + (temp_v0 * 8) + &D_800E7188;
temp_a3_2->unkC = temp_t0->unk0;
temp_a3_2->unk4 = 2;
temp_a3_2->unk8 = 2;
@@ -14985,7 +14985,7 @@ void func_800AAC18(void *arg0) {
temp_v0_3 = func_800AAFCC(temp_a1, temp_a1, 2, temp_a3);
phi_a3 = arg0;
if (temp_v0_3 >= 0) {
sp18 = (D_800DC530 << 5) + (temp_v0_3 * 8) + &D_800E7188;
sp18 = (gScreenModeSelection << 5) + (temp_v0_3 * 8) + &D_800E7188;
}
phi_v1 = arg0->unk4;
phi_t0 = sp18;
src/code_800AF9B0.c
+80 -80
View File
@@ -475,7 +475,7 @@ void func_800B0350(void) {
do {
if ((func_800B4520() == 0) && (gEnableDebugMode != 0) && ((gControllers[phi_s0].buttonPressed & 0x1000) != 0)) {
temp_v0 = gMenuSelection;
if ((temp_v0 != GAME_SELECT_MENU) && (temp_v0 != PLAYER_SELECT_MENU)) {
if ((temp_v0 != MAIN_MENU) && (temp_v0 != PLAYER_SELECT_MENU)) {
if (temp_v0 == COURSE_SELECT_MENU) {
func_800CA330(0x19);
goto block_9;
@@ -512,8 +512,8 @@ block_9:
case START_MENU:
func_800B20F4(&gControllers[phi_s0], phi_s0 & 0xFFFF);
break;
case GAME_SELECT_MENU_FROM_QUIT:
case GAME_SELECT_MENU:
case MAIN_MENU_FROM_QUIT:
case MAIN_MENU:
func_800B29D8(&gControllers[phi_s0], phi_s0 & 0xFFFF);
break;
case PLAYER_SELECT_MENU_FROM_QUIT:
@@ -1476,22 +1476,22 @@ void func_800B1C90(void *arg0, s32 arg1) {
sp36 = arg0->unk6 | arg0->unkC;
if (func_800B4520() == 0) {
temp_t9 = gMenuState;
temp_t9 = gControllerPakMenuSelection;
switch (temp_t9) {
case 1:
case CONTROLLER_PAK_MENU_SELECT_RECORD:
if ((sp36 & 0x9000) != 0) {
gMenuState = 5;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA;
play_sound2(0x49008001);
return;
}
if ((sp36 & 0x300) != 0) {
gMenuState = 2;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_END;
play_sound2(0x49008000);
return;
}
/* Duplicate return node #49. Try simplifying control flow for better match */
return;
case 2:
case CONTROLLER_PAK_MENU_END:
if ((sp36 & 0x9000) != 0) {
play_sound2(0x49008001);
func_8009E1C0();
@@ -1499,16 +1499,16 @@ void func_800B1C90(void *arg0, s32 arg1) {
return;
}
if ((sp36 & 0x300) != 0) {
gMenuState = 1;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD;
play_sound2(0x49008000);
return;
}
/* Duplicate return node #49. Try simplifying control flow for better match */
return;
case 5:
case CONTROLLER_PAK_MENU_TABLE_GAME_DATA:
if ((sp36 & 0x9000) != 0) {
if (*(&D_8018EB38 + ((*(&D_800E86C6 + gControllerPakSelectedTableRow) - 1) * 4)) == 0) {
gMenuState = 4;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_QUIT;
play_sound2(0x49008001);
return;
}
@@ -1517,7 +1517,7 @@ void func_800B1C90(void *arg0, s32 arg1) {
}
if ((sp36 & 0x4000) != 0) {
if (*D_800E86D0 == 0) {
gMenuState = 1;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD;
play_sound2(0x49008002);
return;
}
@@ -1560,67 +1560,67 @@ void func_800B1C90(void *arg0, s32 arg1) {
}
/* Duplicate return node #49. Try simplifying control flow for better match */
return;
case 4:
case CONTROLLER_PAK_MENU_QUIT:
if ((sp36 & 0xD000) != 0) {
gMenuState = 5;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA;
play_sound2(0x49008002);
return;
}
if ((sp36 & 0x300) != 0) {
gMenuState = 3;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASE;
play_sound2(0x49008000);
return;
}
/* Duplicate return node #49. Try simplifying control flow for better match */
return;
case 3:
case CONTROLLER_PAK_MENU_ERASE:
if ((sp36 & 0x9000) != 0) {
gMenuState = 6;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_GO_TO_ERASING;
play_sound2(0x49008001);
return;
}
if ((sp36 & 0x4000) != 0) {
gMenuState = 5;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA;
play_sound2(0x49008002);
return;
}
if ((sp36 & 0x300) != 0) {
gMenuState = 4;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_QUIT;
play_sound2(0x49008000);
return;
}
/* Duplicate return node #49. Try simplifying control flow for better match */
return;
case 6:
gMenuState = 7;
case CONTROLLER_PAK_MENU_GO_TO_ERASING:
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASING;
return;
case 7:
case CONTROLLER_PAK_MENU_ERASING:
temp_t0 = *(&D_800E86C6 + gControllerPakSelectedTableRow) - 1;
temp_v1 = (temp_t0 << 5) + &D_8018E938;
sp20 = temp_v1;
sp2C = temp_t0;
temp_v0 = osPfsDeleteFile(&D_8018E868, temp_v1->unk8, temp_v1->unk4, temp_v1 + 0xE, temp_v1 + 0xA);
if (temp_v0 != 0) {
if (temp_v0 != 1) {
if (temp_v0 != 2) {
gMenuState = 8;
if (temp_v0 != PFS_ERR_NOPACK) {
if (temp_v0 != PFS_ERR_NEW_PACK) {
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASE_ERROR_NOT_ERASED;
return;
}
gMenuState = 0xA;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASE_ERROR_PAK_CHANGED;
return;
}
gMenuState = 9;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_ERASE_ERROR_NO_PAK;
return;
}
*(&D_8018EB38 + (temp_t0 * 4)) = -1;
gControllerPakNumPagesFree = gControllerPakNumPagesFree + (((temp_v1->unk0 + 0xFF) >> 8) & 0xFF);
gMenuState = 5;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA;
return;
case 8:
case 9:
case 10:
case CONTROLLER_PAK_MENU_ERASE_ERROR_NOT_ERASED:
case CONTROLLER_PAK_MENU_ERASE_ERROR_NO_PAK:
case CONTROLLER_PAK_MENU_ERASE_ERROR_PAK_CHANGED:
if ((sp36 & 0x9000) != 0) {
gMenuState = 5;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_TABLE_GAME_DATA;
}
/* Duplicate return node #49. Try simplifying control flow for better match */
return;
@@ -1741,7 +1741,7 @@ void func_800B20F4(void *arg0, s32 arg1) {
D_8018EDF1 = temp_v0_3 + 1;
sp24 = sp2E;
play_sound2(0x49008000);
D_800DC530 = *(&D_800F2B50 + D_8018EDF1);
gScreenModeSelection = *(&D_800F2B50 + D_8018EDF1);
}
}
if ((sp2E & 0x200) != 0) {
@@ -1750,7 +1750,7 @@ void func_800B20F4(void *arg0, s32 arg1) {
D_8018EDF1 = temp_v0_4 - 1;
sp24 = sp2E;
play_sound2(0x49008000);
D_800DC530 = *(&D_800F2B50 + D_8018EDF1);
gScreenModeSelection = *(&D_800F2B50 + D_8018EDF1);
}
}
if ((sp2E & 0x800) != 0) {
@@ -2064,13 +2064,13 @@ void func_800B29D8(void *arg0, u16 arg1) {
sp2E = phi_v1;
arg1 &= 0xFFFF;
if (func_800B4520(arg0) == 0) {
temp_t4 = D_8018EDED;
temp_t4 = gMainMenuSelectionDepth;
switch (temp_t4) {
case 0:
case BLANK_MAIN_MENU:
temp_t5 = D_8018EDF3;
phi_v1_3 = &D_800F2B70 + ((temp_t5 * 0xC) + (*(&D_800E86AB + temp_t5) * 4));
break;
case 3:
case PLAYER_NUM_SELECTION:
phi_a2 = phi_v1;
if ((phi_v1 & 0x100) != 0) {
temp_v0 = D_8018EDF3;
@@ -2084,14 +2084,14 @@ void func_800B29D8(void *arg0, u16 arg1) {
}
temp_v0_2 = D_8018EDF3;
phi_v0 = temp_v0_2;
phi_t0 = &D_8018EDED;
phi_t0 = &gMainMenuSelectionDepth;
if (((phi_a2 & 0x200) != 0) && (temp_v0_2 >= 2)) {
D_8018EDF3 = temp_v0_2 - 1;
sp1C = phi_a2;
func_800B44AC();
play_sound2(0x49008000);
phi_v0 = D_8018EDF3;
phi_t0 = &D_8018EDED;
phi_t0 = &gMainMenuSelectionDepth;
}
gPlayerCountSelection1 = phi_v0;
phi_a0 = &gPlayerCountSelection1;
@@ -2101,13 +2101,13 @@ void func_800B29D8(void *arg0, u16 arg1) {
if ((phi_v0 != 3) && (phi_v0 != 4)) {
} else {
D_800DC530 = 3;
gScreenModeSelection = SCREEN_MODE_3P_4P_SPLITSCREEN;
}
} else {
D_800DC530 = 1;
gScreenModeSelection = SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL;
}
} else {
D_800DC530 = 0;
gScreenModeSelection = SCREEN_MODE_1P;
}
if ((phi_a2 & 0x4000) != 0) {
func_8009E0F0(0x14);
@@ -2117,19 +2117,19 @@ void func_800B29D8(void *arg0, u16 arg1) {
temp_t7 = D_8018EDF3;
phi_v1_3 = &D_800F2B70 + ((temp_t7 * 0xC) + (*(&D_800E86AB + temp_t7) * 4));
} else if ((phi_a2 & 0x8000) != 0) {
*phi_t0 = 4;
*phi_t0 = GAME_MODE_SELECTION;
func_800B44AC(phi_a0);
play_sound2(0x49008001);
temp_t4_2 = D_8018EDF3;
phi_v1_3 = &D_800F2B70 + ((temp_t4_2 * 0xC) + (*(&D_800E86AB + temp_t4_2) * 4));
} else if ((phi_a2 & 0x20) != 0) {
*phi_t0 = 1;
*phi_t0 = OPTIONS_SELECTION;
func_8009E280(phi_a0);
play_sound2(0x49009010);
temp_t1 = D_8018EDF3;
phi_v1_3 = &D_800F2B70 + ((temp_t1 * 0xC) + (*(&D_800E86AB + temp_t1) * 4));
} else if ((phi_a2 & 0x10) != 0) {
*phi_t0 = 2;
*phi_t0 = DATA_SELECTION;
func_8009E258(phi_a0);
play_sound2(0x49009011);
temp_t6 = D_8018EDF3;
@@ -2138,7 +2138,7 @@ void func_800B29D8(void *arg0, u16 arg1) {
phi_v1_3 = &D_800F2B70 + ((phi_v0 * 0xC) + (*(&D_800E86AB + phi_v0) * 4));
}
break;
case 4:
case GAME_MODE_SELECTION:
if ((phi_v1 & 0x400) != 0) {
temp_v0_3 = D_8018EDF3;
temp_v1 = temp_v0_3 + &D_800E86AC;
@@ -2150,7 +2150,7 @@ void func_800B29D8(void *arg0, u16 arg1) {
play_sound2(0x49008000);
}
}
phi_t0_2 = &D_8018EDED;
phi_t0_2 = &gMainMenuSelectionDepth;
if ((phi_v1 & 0x800) != 0) {
temp_v1_2 = D_8018EDF3 + &D_800E86AC;
temp_a0_2 = temp_v1_2->unk-1;
@@ -2159,11 +2159,11 @@ void func_800B29D8(void *arg0, u16 arg1) {
sp1C = phi_v1;
func_800B44AC(temp_a0_2);
play_sound2(0x49008000);
phi_t0_2 = &D_8018EDED;
phi_t0_2 = &gMainMenuSelectionDepth;
}
}
if ((phi_v1 & 0x4000) != 0) {
*phi_t0_2 = 3;
*phi_t0_2 = PLAYER_NUM_SELECTION;
func_800B44AC(3);
play_sound2(0x49008002);
temp_t6_2 = D_8018EDF3;
@@ -2177,21 +2177,21 @@ void func_800B29D8(void *arg0, u16 arg1) {
if (temp_v1_3 != 1) {
if (temp_v1_3 != 2) {
if (temp_v1_3 != 3) {
*phi_t0_2 = 6;
*phi_t0_2 = CONFIRM_OK_SELECTION;
} else {
*phi_t0_2 = 6;
*phi_t0_2 = CONFIRM_OK_SELECTION;
play_sound2(0x4900900D);
}
} else {
*phi_t0_2 = 5;
*phi_t0_2 = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION;
play_sound2(0x4900900C);
}
} else {
*phi_t0_2 = 5;
*phi_t0_2 = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION;
play_sound2(0x4900900B);
}
} else {
*phi_t0_2 = 5;
*phi_t0_2 = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION;
play_sound2(0x4900900A);
}
func_800B44AC();
@@ -2203,8 +2203,8 @@ void func_800B29D8(void *arg0, u16 arg1) {
}
}
break;
case 5:
case 8:
case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION:
case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT:
if ((arg1 == 0) && ((temp_t7_3 = gMenuTimingCounter + 1, gMenuTimingCounter = temp_t7_3, (temp_t7_3 == 0x64)) || ((temp_t7_3 % 300) == 0)) && ((temp_v0_5 = D_8018EDF3, temp_v1_4 = *(&D_800F2B70 + ((temp_v0_5 * 0xC) + (*(&D_800E86AB + temp_v0_5) * 4))), (temp_v1_4 == 0)) || (temp_v1_4 == 2))) {
sp1C = phi_v1;
play_sound2(0x4900900E, arg1, phi_v1);
@@ -2260,7 +2260,7 @@ block_64:
temp_a0_7 = *(&D_800E86AB + temp_v0_9);
temp_a1 = *(&D_800E86AD + ((temp_v0_9 * 3) + temp_a0_7));
if ((phi_v1 & 0x4000) != 0) {
D_8018EDED = 4;
gMainMenuSelectionDepth = GAME_MODE_SELECTION;
func_800B44AC(temp_a0_7, temp_a1, phi_v1);
play_sound2(0x49008002);
temp_t5_2 = D_8018EDF3;
@@ -2273,7 +2273,7 @@ block_64:
func_8009E258();
play_sound2(0x49009011);
} else {
D_8018EDED = 6;
gMainMenuSelectionDepth = CONFIRM_OK_SELECTION;
play_sound2(0x49008001, temp_a1);
gMenuTimingCounter = 0;
}
@@ -2283,8 +2283,8 @@ block_64:
phi_v1_3 = &D_800F2B70 + ((temp_v0_9 * 0xC) + (temp_a0_7 * 4));
}
break;
case 6:
case 7:
case CONFIRM_OK_SELECTION:
case CONFIRM_OK_SELECTION_FROM_BACK_OUT:
if ((arg1 == 0) && ((temp_t7_5 = gMenuTimingCounter + 1, gMenuTimingCounter = temp_t7_5, (temp_t7_5 == 0x3C)) || ((temp_t7_5 % 300) == 0))) {
sp1C = phi_v1;
play_sound2(0x4900900F, arg1, phi_v1);
@@ -2296,9 +2296,9 @@ block_64:
if (temp_v1_7 != 3) {
}
D_8018EDED = 4;
gMainMenuSelectionDepth = GAME_MODE_SELECTION;
} else {
D_8018EDED = 5;
gMainMenuSelectionDepth = GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION;
}
func_800B44AC();
play_sound2(0x49008002);
@@ -2316,8 +2316,8 @@ block_64:
phi_v1_3 = &D_800F2B70 + ((temp_t4_3 * 0xC) + (*(&D_800E86AB + temp_t4_3) * 4));
}
break;
case 1:
case 2:
case OPTIONS_SELECTION:
case DATA_SELECTION:
temp_t2 = D_8018EDF3;
phi_v1_3 = &D_800F2B70 + ((temp_t2 * 0xC) + (*(&D_800E86AB + temp_t2) * 4));
break;
@@ -2483,7 +2483,7 @@ void func_800B3B58(struct Controller *arg0, u16 arg1) {
? play_sound2(?, s8 *, s8 *, s8); /* extern */
extern s32 D_800DC50C;
extern s32 D_800DC524;
extern s32 D_800DC530;
extern s32 gScreenModeSelection;
extern s32 D_800DC540;
extern s16 D_8015F890;
extern s16 D_8015F892;
@@ -2499,7 +2499,7 @@ extern s8 D_8018EDE9;
extern s8 D_8018EDEA;
extern s8 D_8018EDEB;
extern s8 D_8018EDEC;
extern s8 D_8018EDED;
extern s8 gMainMenuSelectionDepth;
extern s8 D_8018EDEE;
extern s8 gDebugMenuSelection;
extern s8 D_8018EDF1;
@@ -2564,7 +2564,7 @@ void func_800B3F74(u32 arg0) {
func_800CA008(0, 0);
break;
case CONTROLLER_PAK_MENU:
gMenuState = 1;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD;
func_800CA008(0, 0);
break;
case START_MENU_FROM_QUIT:
@@ -2587,8 +2587,8 @@ void func_800B3F74(u32 arg0) {
func_800C8EAC(1);
D_8018EDFC = 0;
break;
case GAME_SELECT_MENU_FROM_QUIT:
case GAME_SELECT_MENU:
case MAIN_MENU_FROM_QUIT:
case MAIN_MENU:
gEnableDebugMode = 0;
gIsMirrorMode = 0;
D_8018EDFC = 0;
@@ -2608,26 +2608,26 @@ void func_800B3F74(u32 arg0) {
if (temp_v0 != 4) {
} else {
D_8018EDED = 3;
gMainMenuSelectionDepth = PLAYER_NUM_SELECTION;
}
} else {
temp_v0_2 = D_8018EDED;
if ((temp_v0_2 != 1) && (temp_v0_2 != 2)) {
D_8018EDED = 8;
temp_v0_2 = gMainMenuSelectionDepth;
if ((temp_v0_2 != OPTIONS_SELECTION) && (temp_v0_2 != DATA_SELECTION)) {
gMainMenuSelectionDepth = TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT;
} else {
D_8018EDED = 3;
gMainMenuSelectionDepth = PLAYER_NUM_SELECTION;
}
}
} else {
D_8018EDED = 7;
gMainMenuSelectionDepth = CONFIRM_OK_SELECTION_FROM_BACK_OUT;
}
} else {
D_8018EDED = 3;
func_800C8EAC(2, &D_8018EDED, 3);
temp_v0_3 = D_800DC530;
gMainMenuSelectionDepth = PLAYER_NUM_SELECTION;
func_800C8EAC(2, &gMainMenuSelectionDepth, 3);
temp_v0_3 = gScreenModeSelection;
D_8018EDF3 = 1;
if ((temp_v0_3 >= 4) || (temp_v0_3 < 0)) {
D_800DC530 = 0;
if ((temp_v0_3 >= NUM_SCREEN_MODES) || (temp_v0_3 < SCREEN_MODE_1P)) {
gScreenModeSelection = SCREEN_MODE_1P;
}
}
break;
src/code_80280000.c
+1 -1
View File
@@ -129,7 +129,7 @@ void func_80280420(void) {
D_800DC5EC->screenHeight = 240;
D_800DC5EC->screenStartX = 160;
D_800DC5EC->screenStartY = 120;
D_800DC530 = 0;
gScreenModeSelection = SCREEN_MODE_1P;
D_800DC52C = 0;
gPrevLoadedAddress = D_8015F734;
load_course(gCurrentCourseId);
src/code_80281780.c
+1 -1
View File
@@ -89,7 +89,7 @@ void load_ending_sequence_royalraceway(void) {
D_800DC5EC->screenHeight = 240;
D_800DC5EC->screenStartX = 160;
D_800DC5EC->screenStartY = 120;
D_800DC530 = 0;
gScreenModeSelection = SCREEN_MODE_1P;
gPrevLoadedAddress = (s32) D_8015F734;
D_800DC52C = 0;
gModeSelection = GRAND_PRIX;
src/code_80281780.h
+1 -1
View File
@@ -23,7 +23,7 @@ extern s16 gCurrentCourseId;
extern u16 D_800DC5B4;
extern s32 gIsMirrorMode;
extern s32 D_800DC530;
extern s32 gScreenModeSelection;
extern s32 D_800DC52C;
extern s32 gModeSelection;
extern u16 D_800DC5BC;
src/code_8028DF00.c
+13 -13
View File
@@ -65,7 +65,7 @@ extern u16 D_800DC518;
extern u16 D_8015011E;
extern float gCourseTimer;
extern float D_800DC594;
extern s32 D_800DC530;
extern s32 gScreenModeSelection;
extern s32 D_8018D2AC;
extern s32 D_800DC52C;
extern s16 gCurrentCourseId;
@@ -336,14 +336,14 @@ void func_8028E678(void) {
break;
}
D_800DC5B8 = 0;
switch(D_800DC530) {
case 0:
switch(gScreenModeSelection) {
case SCREEN_MODE_1P:
D_8015F894 = 1;
break;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
D_8015F894 = 5;
break;
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
D_8015F894 = 6;
break;
}
@@ -505,7 +505,7 @@ void func_8028EC38(s32 arg0) {
void func_8028EC98(s32 arg0) {
if (D_800DC530 == 3) {
if (gScreenModeSelection == SCREEN_MODE_3P_4P_SPLITSCREEN) {
return;
}
@@ -1079,7 +1079,7 @@ void func_8028FCBC(void) {
D_800DC5B4 = 1;
D_802BA034 = 0.008f;
D_8015F894 = 0;
if (D_800DC530 != 0) {
if (gScreenModeSelection != SCREEN_MODE_1P) {
func_8005C64C(&D_8018D2AC);
}
for (i = 0; i < 8; i++) {
@@ -1149,14 +1149,14 @@ void func_8028FCBC(void) {
func_8028EF28();
func_8028F970();
switch(D_800DC530) {
case 0:
switch(gScreenModeSelection) {
case SCREEN_MODE_1P:
D_802BA038 = 690;
D_800DC510 = 5;
func_8028E298();
break;
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
if (((D_800DC4DC->unk_000 & PLAYER_CINEMATIC_MODE) != 0) && ((D_800DC4E0->unk_000 & PLAYER_CINEMATIC_MODE) != 0)) {
if (D_800DC4DC->unk_004 < D_800DC4E0->unk_004) {
@@ -1196,7 +1196,7 @@ void func_8028FCBC(void) {
case GRAND_PRIX:
if (D_80150120 != 0) {
func_8028E678();
} else if (D_800DC530 == 0) {
} else if (gScreenModeSelection == SCREEN_MODE_1P) {
func_80092564();
D_800DC510 = 7;
} else {
@@ -1235,7 +1235,7 @@ UNUSED void func_80290314(void) {
void func_80290338(void) {
gIsInQuitToMenuTransition = 1;
gQuitToMenuTransitionCounter = 5;
gMenuSelectionFromQuit = GAME_SELECT_MENU_FROM_QUIT;
gMenuSelectionFromQuit = MAIN_MENU_FROM_QUIT;
}
void func_80290360(void) {
src/code_80290C20.c
+3 -3
View File
@@ -210,10 +210,10 @@ void func_80291198(void) {
gSPDisplayList(gDisplayListHead++, 0x07001140);
}
extern s32 D_800DC530;
extern s32 gScreenModeSelection;
void func_802911C4(void) {
if (D_800DC530 == 0) {
if (gScreenModeSelection == SCREEN_MODE_1P) {
gSPDisplayList(gDisplayListHead++, 0x070008E8);
} else {
gSPDisplayList(gDisplayListHead++, 0x07002D68);
@@ -2306,7 +2306,7 @@ void func_80295D88(void) {
switch (temp_t7) {
case 0:
func_802AF588(0x7001140);
if (D_800DC530 == 0) {
if (gScreenModeSelection == SCREEN_MODE_1P) {
func_802AF588(0x70008E8);
} else {
func_802AF588(0x7002D68);
src/code_802A3730.c
+4 -4
View File
@@ -154,8 +154,8 @@ void func_802A38B4(void) {
gMenuSelection = START_MENU;
}
break;
case GAME_SELECT_MENU_FROM_QUIT:
gMenuSelection = GAME_SELECT_MENU;
case MAIN_MENU_FROM_QUIT:
gMenuSelection = MAIN_MENU;
break;
case PLAYER_SELECT_MENU_FROM_QUIT:
gMenuSelection = PLAYER_SELECT_MENU;
@@ -677,7 +677,7 @@ void func_802A4A0C(Vtx *arg0, void *arg1, ? arg2, ? arg3) {
*/
#ifdef MIPS_TO_C
extern s32 D_800DC530;
extern s32 gScreenModeSelection;
void func_802A4D18(void) {
f32 phi_f10;
@@ -734,7 +734,7 @@ void func_802A4D18(void) {
}
}
switch(D_800DC530) {
switch(gScreenModeSelection) {
case 0:
D_80150148 = 1.3333333730697632f; // D_802B9C1C
break;
src/main.c
+1 -1
View File
@@ -172,7 +172,7 @@ s32 D_800DC524 = 7; // = COURSE_DATA_MENU?;
UNUSED s32 D_800DC528 = 1;
s32 D_800DC52C = 0;
s32 D_800DC530[2] = {0};
s32 gScreenModeSelection[2] = {0};
s32 gPlayerCountSelection1 = 2;
s32 gModeSelection = GRAND_PRIX;