From e05111dccf61a558a047f4017af185cb9f115143 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 20 Jan 2020 18:26:37 +1000 Subject: [PATCH] Identify g_Is4Mb variable --- src/game/game_00c490.c | 8 ++++---- src/game/game_011110.c | 8 ++++---- src/game/game_0150a0.c | 4 ++-- src/game/game_015470.c | 8 ++++---- src/game/game_066310.c | 8 ++++---- src/game/game_0b28d0.c | 20 ++++++++++---------- src/game/game_0dcdb0.c | 4 ++-- src/game/game_0f09f0.c | 4 ++-- src/game/game_102240.c | 6 +++--- src/game/game_107fb0.c | 4 ++-- src/game/game_176d70.c | 16 ++++++++-------- src/game/game_1999b0.c | 2 +- src/game/pdoptions.c | 2 +- src/gvars/gvars.c | 2 +- src/include/gvars/gvars.h | 2 +- src/include/setup/setup_0160b0.h | 6 +++--- src/include/setup/setup_020df0.h | 2 +- src/library/library_08a20.c | 4 ++-- src/library/library_126b0.c | 4 ++-- src/setup/setup_0160b0.c | 6 +++--- src/setup/setup_020df0.c | 2 +- 21 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 1411bede0..bd2888988 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -4942,8 +4942,8 @@ glabel func0f00f174 GLOBAL_ASM( glabel func0f0108d0 -/* f0108d0: 3c088009 */ lui $t0,%hi(var80090af0) -/* f0108d4: 25080af0 */ addiu $t0,$t0,%lo(var80090af0) +/* f0108d0: 3c088009 */ lui $t0,%hi(g_Is4Mb) +/* f0108d4: 25080af0 */ addiu $t0,$t0,%lo(g_Is4Mb) /* f0108d8: 910e0000 */ lbu $t6,0x0($t0) /* f0108dc: 27bdffe8 */ addiu $sp,$sp,-24 /* f0108e0: 24070001 */ addiu $a3,$zero,0x1 @@ -4962,8 +4962,8 @@ glabel func0f0108d0 /* f01090c: 39e4000f */ xori $a0,$t7,0xf /* f010910: 0c0048f2 */ jal func000123c8 /* f010914: 24050004 */ addiu $a1,$zero,0x4 -/* f010918: 3c088009 */ lui $t0,%hi(var80090af0) -/* f01091c: 25080af0 */ addiu $t0,$t0,%lo(var80090af0) +/* f010918: 3c088009 */ lui $t0,%hi(g_Is4Mb) +/* f01091c: 25080af0 */ addiu $t0,$t0,%lo(g_Is4Mb) /* f010920: 91190000 */ lbu $t9,0x0($t0) /* f010924: 3c058007 */ lui $a1,%hi(var8006ae10) /* f010928: 24a5ae10 */ addiu $a1,$a1,%lo(var8006ae10) diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 4c78a493d..7aa4a62db 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -51,9 +51,9 @@ GLOBAL_ASM( glabel func0f011130 /* f011130: 3c01800a */ lui $at,0x800a /* f011134: ac24dd08 */ sw $a0,-0x22f8($at) -/* f011138: 3c0a8009 */ lui $t2,%hi(var80090af0) +/* f011138: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) /* f01113c: 3c01800a */ lui $at,0x800a -/* f011140: 254a0af0 */ addiu $t2,$t2,%lo(var80090af0) +/* f011140: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) /* f011144: ac25dd0c */ sw $a1,-0x22f4($at) /* f011148: 91480000 */ lbu $t0,0x0($t2) /* f01114c: 27bdffc0 */ addiu $sp,$sp,-64 @@ -153,8 +153,8 @@ glabel func0f011130 /* f011290: afa8001c */ sw $t0,0x1c($sp) /* f011294: 0c0048f2 */ jal func000123c8 /* f011298: 24050004 */ addiu $a1,$zero,0x4 -/* f01129c: 3c0a8009 */ lui $t2,%hi(var80090af0) -/* f0112a0: 254a0af0 */ addiu $t2,$t2,%lo(var80090af0) +/* f01129c: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) +/* f0112a0: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) /* f0112a4: 91480000 */ lbu $t0,0x0($t2) /* f0112a8: 3c07800a */ lui $a3,%hi(var8009dd10) /* f0112ac: 24090001 */ addiu $t1,$zero,0x1 diff --git a/src/game/game_0150a0.c b/src/game/game_0150a0.c index f81aae3c1..0f1368803 100644 --- a/src/game/game_0150a0.c +++ b/src/game/game_0150a0.c @@ -10,8 +10,8 @@ GLOBAL_ASM( glabel func0f0150a0 /* f0150a0: 27bdffc8 */ addiu $sp,$sp,-56 /* f0150a4: afb70030 */ sw $s7,0x30($sp) -/* f0150a8: 3c178009 */ lui $s7,%hi(var80090af0) -/* f0150ac: 26f70af0 */ addiu $s7,$s7,%lo(var80090af0) +/* f0150a8: 3c178009 */ lui $s7,%hi(g_Is4Mb) +/* f0150ac: 26f70af0 */ addiu $s7,$s7,%lo(g_Is4Mb) /* f0150b0: 92ee0000 */ lbu $t6,0x0($s7) /* f0150b4: afb6002c */ sw $s6,0x2c($sp) /* f0150b8: 24160001 */ addiu $s6,$zero,0x1 diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 71e6d9971..8b7b31f67 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -8594,11 +8594,11 @@ glabel func0f01bf28 /* f01cc5c: 3c0e8009 */ lui $t6,%hi(var8009000c) /* f01cc60: aeaf0008 */ sw $t7,0x8($s5) /* f01cc64: 91ce0af0 */ lbu $t6,0xaf0($t6) -/* f01cc68: 3c198007 */ lui $t9,%hi(menudialog_mainmenu) -/* f01cc6c: 27393a5c */ addiu $t9,$t9,%lo(menudialog_mainmenu) +/* f01cc68: 3c198007 */ lui $t9,%hi(g_MainMenuMenuDialog) +/* f01cc6c: 27393a5c */ addiu $t9,$t9,%lo(g_MainMenuMenuDialog) /* f01cc70: 16ce0004 */ bne $s6,$t6,.L0f01cc84 -/* f01cc74: 3c188007 */ lui $t8,%hi(menudialog_mainmenu2) -/* f01cc78: 27183a74 */ addiu $t8,$t8,%lo(menudialog_mainmenu2) +/* f01cc74: 3c188007 */ lui $t8,%hi(g_MainMenu4MbMenuDialog) +/* f01cc78: 27183a74 */ addiu $t8,$t8,%lo(g_MainMenu4MbMenuDialog) /* f01cc7c: 10000002 */ beqz $zero,.L0f01cc88 /* f01cc80: aeb8000c */ sw $t8,0xc($s5) .L0f01cc84: diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 52394a4c5..191679f9d 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -38145,9 +38145,9 @@ glabel func0f086f40 /* f0870f0: 24010047 */ addiu $at,$zero,0x47 /* f0870f4: 14410008 */ bne $v0,$at,.L0f087118 /* f0870f8: 24180001 */ addiu $t8,$zero,0x1 -/* f0870fc: 3c048007 */ lui $a0,%hi(menudialog_mainmenu) +/* f0870fc: 3c048007 */ lui $a0,%hi(g_MainMenuMenuDialog) /* f087100: a3b8002b */ sb $t8,0x2b($sp) -/* f087104: 24843a5c */ addiu $a0,$a0,%lo(menudialog_mainmenu) +/* f087104: 24843a5c */ addiu $a0,$a0,%lo(g_MainMenuMenuDialog) /* f087108: 0fc3e178 */ jal func0f0f85e0 /* f08710c: 24050002 */ addiu $a1,$zero,0x2 /* f087110: 1000000a */ beqz $zero,.L0f08713c @@ -52238,8 +52238,8 @@ GLOBAL_ASM( glabel func0f093508 /* f093508: 27bdffc8 */ addiu $sp,$sp,-56 /* f09350c: afb5002c */ sw $s5,0x2c($sp) -/* f093510: 3c158009 */ lui $s5,%hi(var80090af0) -/* f093514: 26b50af0 */ addiu $s5,$s5,%lo(var80090af0) +/* f093510: 3c158009 */ lui $s5,%hi(g_Is4Mb) +/* f093514: 26b50af0 */ addiu $s5,$s5,%lo(g_Is4Mb) /* f093518: 92a30000 */ lbu $v1,0x0($s5) /* f09351c: afb60030 */ sw $s6,0x30($sp) /* f093520: 24160001 */ addiu $s6,$zero,0x1 diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 520be6605..a85cd5b0f 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -537,8 +537,8 @@ glabel func0f0b2b64 /* f0b2cf0: 29210005 */ slti $at,$t1,0x5 /* f0b2cf4: 10200023 */ beqz $at,.L0f0b2d84 /* f0b2cf8: 00002825 */ or $a1,$zero,$zero -/* f0b2cfc: 3c0a8009 */ lui $t2,%hi(var80090af0) -/* f0b2d00: 254a0af0 */ addiu $t2,$t2,%lo(var80090af0) +/* f0b2cfc: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) +/* f0b2d00: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) /* f0b2d04: 91440000 */ lbu $a0,0x0($t2) /* f0b2d08: 24080001 */ addiu $t0,$zero,0x1 /* f0b2d0c: 00003025 */ or $a2,$zero,$zero @@ -576,8 +576,8 @@ glabel func0f0b2b64 /* f0b2d7c: 5420ffee */ bnezl $at,.L0f0b2d38 /* f0b2d80: 8c6e0000 */ lw $t6,0x0($v1) .L0f0b2d84: -/* f0b2d84: 3c0a8009 */ lui $t2,%hi(var80090af0) -/* f0b2d88: 254a0af0 */ addiu $t2,$t2,%lo(var80090af0) +/* f0b2d84: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) +/* f0b2d88: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) /* f0b2d8c: 14a00024 */ bnez $a1,.L0f0b2e20 /* f0b2d90: 24080001 */ addiu $t0,$zero,0x1 /* f0b2d94: 29210035 */ slti $at,$t1,0x35 @@ -696,8 +696,8 @@ glabel func0f0b2b64 /* f0b2f24: 2484dd10 */ addiu $a0,$a0,%lo(var8009dd10) /* f0b2f28: 8c8b0008 */ lw $t3,0x8($a0) /* f0b2f2c: 8fa70018 */ lw $a3,0x18($sp) -/* f0b2f30: 3c0a8009 */ lui $t2,%hi(var80090af0) -/* f0b2f34: 254a0af0 */ addiu $t2,$t2,%lo(var80090af0) +/* f0b2f30: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) +/* f0b2f34: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) /* f0b2f38: 01676021 */ addu $t4,$t3,$a3 /* f0b2f3c: ad820004 */ sw $v0,0x4($t4) /* f0b2f40: 8c8d0008 */ lw $t5,0x8($a0) @@ -726,8 +726,8 @@ glabel func0f0b2b64 /* f0b2f90: 10000005 */ beqz $zero,.L0f0b2fa8 /* f0b2f94: 8fb90044 */ lw $t9,0x44($sp) .L0f0b2f98: -/* f0b2f98: 3c0a8009 */ lui $t2,%hi(var80090af0) -/* f0b2f9c: 254a0af0 */ addiu $t2,$t2,%lo(var80090af0) +/* f0b2f98: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) +/* f0b2f9c: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) /* f0b2fa0: 24080001 */ addiu $t0,$zero,0x1 .L0f0b2fa4: /* f0b2fa4: 8fb90044 */ lw $t9,0x44($sp) @@ -822,8 +822,8 @@ glabel func0f0b30ac GLOBAL_ASM( glabel func0f0b30cc -/* f0b30cc: 3c098009 */ lui $t1,%hi(var80090af0) -/* f0b30d0: 25290af0 */ addiu $t1,$t1,%lo(var80090af0) +/* f0b30cc: 3c098009 */ lui $t1,%hi(g_Is4Mb) +/* f0b30d0: 25290af0 */ addiu $t1,$t1,%lo(g_Is4Mb) /* f0b30d4: 91250000 */ lbu $a1,0x0($t1) /* f0b30d8: 27bdffe8 */ addiu $sp,$sp,-24 /* f0b30dc: 24070001 */ addiu $a3,$zero,0x1 diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 13d9a80b7..ccd5aa621 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -6375,9 +6375,9 @@ glabel func0f0de7fc /* f0dead4: 00000000 */ sll $zero,$zero,0x0 /* f0dead8: 0fc54bcd */ jal optionsGetScreenSplit /* f0deadc: afa90034 */ sw $t1,0x34($sp) -/* f0deae0: 3c038009 */ lui $v1,%hi(var80090af0) +/* f0deae0: 3c038009 */ lui $v1,%hi(g_Is4Mb) /* f0deae4: 241f0001 */ addiu $ra,$zero,0x1 -/* f0deae8: 24630af0 */ addiu $v1,$v1,%lo(var80090af0) +/* f0deae8: 24630af0 */ addiu $v1,$v1,%lo(g_Is4Mb) /* f0deaec: 13e20003 */ beq $ra,$v0,.L0f0deafc /* f0deaf0: 8fa90034 */ lw $t1,0x34($sp) /* f0deaf4: 90780000 */ lbu $t8,0x0($v1) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 0b48532b1..8356aaed9 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -9209,9 +9209,9 @@ glabel func0f0f8330 GLOBAL_ASM( glabel func0f0f85e0 -/* f0f85e0: 3c0e8007 */ lui $t6,%hi(menudialog_mainmenu) +/* f0f85e0: 3c0e8007 */ lui $t6,%hi(g_MainMenuMenuDialog) /* f0f85e4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0f85e8: 25ce3a5c */ addiu $t6,$t6,%lo(menudialog_mainmenu) +/* f0f85e8: 25ce3a5c */ addiu $t6,$t6,%lo(g_MainMenuMenuDialog) /* f0f85ec: afbf0014 */ sw $ra,0x14($sp) /* f0f85f0: 148e0004 */ bne $a0,$t6,.L0f0f8604 /* f0f85f4: afa5001c */ sw $a1,0x1c($sp) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 6c086a3c1..3b14b7e5f 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -765,7 +765,7 @@ s32 menuhandlerHiRes(u32 operation, struct menu_item *item, bool *enable) { switch (operation) { case MENUOP_CHECKHIDDEN: - if (var80090af0 == 1) { + if (g_Is4Mb == 1) { return true; } if (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) { @@ -4770,8 +4770,8 @@ glabel func0f106b20 /* f106cf4: 24050001 */ addiu $a1,$zero,0x1 .L0f106cf8: /* f106cf8: 14a00008 */ bnez $a1,.L0f106d1c -/* f106cfc: 3c048007 */ lui $a0,%hi(menudialog_mainmenu2) -/* f106d00: 24843a74 */ addiu $a0,$a0,%lo(menudialog_mainmenu2) +/* f106cfc: 3c048007 */ lui $a0,%hi(g_MainMenu4MbMenuDialog) +/* f106d00: 24843a74 */ addiu $a0,$a0,%lo(g_MainMenu4MbMenuDialog) /* f106d04: 0fc3e0cc */ jal func0f0f8330 /* f106d08: 24050002 */ addiu $a1,$zero,0x2 /* f106d0c: 10000006 */ beqz $zero,.L0f106d28 diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 3ddf52a17..a9bbb8ef2 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1144,9 +1144,9 @@ glabel func0f108a80 /* f108b8c: 3c0f8009 */ lui $t7,0x8009 /* f108b90: 91ef0af0 */ lbu $t7,0xaf0($t7) /* f108b94: 24010001 */ addiu $at,$zero,0x1 -/* f108b98: 3c048007 */ lui $a0,%hi(menudialog_mainmenu) +/* f108b98: 3c048007 */ lui $a0,%hi(g_MainMenuMenuDialog) /* f108b9c: 15e10007 */ bne $t7,$at,.L0f108bbc -/* f108ba0: 24843a5c */ addiu $a0,$a0,%lo(menudialog_mainmenu) +/* f108ba0: 24843a5c */ addiu $a0,$a0,%lo(g_MainMenuMenuDialog) /* f108ba4: 3c048007 */ lui $a0,%hi(g_4MbMainMenu) /* f108ba8: 24845294 */ addiu $a0,$a0,%lo(g_4MbMainMenu) /* f108bac: 0fc3e083 */ jal func0f0f820c diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index a427e8e6d..50ea3fc32 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -6848,10 +6848,10 @@ s32 menuhandlerMpSimulantSlot(u32 operation, struct menu_item *item, s32 *value) if ((g_MpSetup.chrslots & (1 << (item->param + 4))) == 0) { menuPushDialog(&g_MpAddSimulantMenuDialog); - } else if (var80090af0 == 1) { - menuPushDialog(&menudialog_1b414); + } else if (g_Is4Mb == 1) { + menuPushDialog(&g_MpEditSimulant4MbMenuDialog); } else { - menuPushDialog(&menudialog_mpeditsimulant); + menuPushDialog(&g_MpEditSimulantMenuDialog); } break; case MENUOP_CHECKHIDDEN: @@ -8510,10 +8510,10 @@ s32 menuhandler0017ef30(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_CITRAINING) { - if (var80090af0 == 1) { - func0f0f820c(&menudialog_mainmenu2, 2); + if (g_Is4Mb == 1) { + func0f0f820c(&g_MainMenu4MbMenuDialog, 2); } else { - func0f0f820c(&menudialog_mainmenu, 2); + func0f0f820c(&g_MainMenuMenuDialog, 2); } } else { func0f0f820c(&menudialog_196b0, 2); @@ -9217,7 +9217,7 @@ glabel func0f17fa28 /* f17fa60: 3c128008 */ lui $s2,%hi(menudialog_mpsavesetup) /* f17fa64: 3c138008 */ lui $s3,%hi(g_MpAddSimulantMenuDialog) /* f17fa68: 3c148008 */ lui $s4,%hi(g_MpChangeSimulantMenuDialog) -/* f17fa6c: 3c158008 */ lui $s5,%hi(menudialog_mpeditsimulant) +/* f17fa6c: 3c158008 */ lui $s5,%hi(g_MpEditSimulantMenuDialog) /* f17fa70: 3c168008 */ lui $s6,%hi(menudialog_mpcombatoptions) /* f17fa74: 3c178008 */ lui $s7,%hi(menudialog_mpbriefcaseoptions) /* f17fa78: 3c1e8008 */ lui $s8,%hi(menudialog_mpcaptureoptions) @@ -9231,7 +9231,7 @@ glabel func0f17fa28 /* f17fa98: 27de6b48 */ addiu $s8,$s8,%lo(menudialog_mpcaptureoptions) /* f17fa9c: 26f769d4 */ addiu $s7,$s7,%lo(menudialog_mpbriefcaseoptions) /* f17faa0: 26d668b8 */ addiu $s6,$s6,%lo(menudialog_mpcombatoptions) -/* f17faa4: 26b5592c */ addiu $s5,$s5,%lo(menudialog_mpeditsimulant) +/* f17faa4: 26b5592c */ addiu $s5,$s5,%lo(g_MpEditSimulantMenuDialog) /* f17faa8: 26945834 */ addiu $s4,$s4,%lo(g_MpChangeSimulantMenuDialog) /* f17faac: 2673581c */ addiu $s3,$s3,%lo(g_MpAddSimulantMenuDialog) /* f17fab0: 26524d80 */ addiu $s2,$s2,%lo(menudialog_mpsavesetup) diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index d96191794..e72fe59a3 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -1360,7 +1360,7 @@ glabel ai0176 void func0f19ab40(void) { - if (var80090af0) { + if (g_Is4Mb) { var80090af4 = 0; var80090af8 = 0; var80090afc = 0; diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index 39bc0e05a..3e9527983 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -217,7 +217,7 @@ void optionsSetHeadRoll(s32 mpchrnum, bool enable) s32 optionsGetEffectiveScreenSize(void) { - if (var80090af0 == 1) { + if (g_Is4Mb == 1) { return SCREENSIZE_FULL; } diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index f451208b7..b1da890c6 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -4143,7 +4143,7 @@ u32 var80090ae0 = 0; u32 var80090ae4 = 0; u32 var80090ae8 = 0; u32 var80090aec = 0; -u8 var80090af0 = 0; +u8 g_Is4Mb = 0; u32 var80090af4 = 0; u32 var80090af8 = 0; u32 var80090afc = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index c6486d57a..c732358b3 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -348,7 +348,7 @@ extern struct bootbufferthing var8008de48[3]; extern s32 var8008fa6c; extern s32 var8008fa70; extern s32 var8008fa74; -extern u8 var80090af0; +extern u8 g_Is4Mb; extern u32 var80090af4; extern u32 var80090af8; extern u32 var80090afc; diff --git a/src/include/setup/setup_0160b0.h b/src/include/setup/setup_0160b0.h index 482ee3701..d87040bdb 100644 --- a/src/include/setup/setup_0160b0.h +++ b/src/include/setup/setup_0160b0.h @@ -205,8 +205,8 @@ extern struct cutscenegroup cutscenegrouptable[]; extern struct menu_dialog g_SelectMissionMenuDialog; extern u16 mainmenulabels_nocheats[]; extern u16 mainmenulabels_withcheats[]; -extern struct menu_dialog menudialog_mainmenu; -extern struct menu_dialog menudialog_mainmenu2; +extern struct menu_dialog g_MainMenuMenuDialog; +extern struct menu_dialog g_MainMenu4MbMenuDialog; extern struct cheat g_Cheats[NUM_CHEATS]; extern struct menu_item menuitems_cheats_buddies[]; extern struct menu_dialog menudialog_cheats_buddies; @@ -240,7 +240,7 @@ extern struct menu_dialog menudialog_mpquickgo2; extern struct menu_dialog menudialog_1b1bc; extern struct menu_dialog g_4MbMainMenu; extern struct menu_dialog menudialog_mpdropout; -extern struct menu_dialog menudialog_1b414; +extern struct menu_dialog g_MpEditSimulant4MbMenuDialog; extern struct menu_dialog g_4MbAdvancedSetupMenuDialog; extern struct menu_dialog menudialog_1b5c0; extern struct menu_dialog menudialog_promptnextmission; diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h index efdc283c5..aaf522f52 100644 --- a/src/include/setup/setup_020df0.h +++ b/src/include/setup/setup_020df0.h @@ -265,7 +265,7 @@ extern struct menu_item menuitems_mpcharacter[]; extern u32 var800857d0; extern struct menu_dialog g_MpAddSimulantMenuDialog; extern struct menu_dialog g_MpChangeSimulantMenuDialog; -extern struct menu_dialog menudialog_mpeditsimulant; +extern struct menu_dialog g_MpEditSimulantMenuDialog; extern u32 var80085a74; extern u8 g_TeamIdsForPairing[4]; extern struct menu_dialog g_MpChangeTeamNameMenuDialog; diff --git a/src/library/library_08a20.c b/src/library/library_08a20.c index 24833a80c..f75cabc67 100644 --- a/src/library/library_08a20.c +++ b/src/library/library_08a20.c @@ -50,9 +50,9 @@ glabel func00008a48 /* 8a80: 468021a0 */ cvt.s.w $f6,$f4 /* 8a84: 8fa505c0 */ lw $a1,0x5c0($sp) /* 8a88: 3c0e7001 */ lui $t6,0x7001 -/* 8a8c: 3c158009 */ lui $s5,%hi(var80090af0) +/* 8a8c: 3c158009 */ lui $s5,%hi(g_Is4Mb) /* 8a90: 25ce9844 */ addiu $t6,$t6,-26556 -/* 8a94: 26b50af0 */ addiu $s5,$s5,%lo(var80090af0) +/* 8a94: 26b50af0 */ addiu $s5,$s5,%lo(g_Is4Mb) /* 8a98: 46083083 */ div.s $f2,$f6,$f8 /* 8a9c: aca20018 */ sw $v0,0x18($a1) /* 8aa0: acae0010 */ sw $t6,0x10($a1) diff --git a/src/library/library_126b0.c b/src/library/library_126b0.c index 52c1d860f..3bc02ab02 100644 --- a/src/library/library_126b0.c +++ b/src/library/library_126b0.c @@ -328,14 +328,14 @@ glabel func00012ab0 /* 12ac0: afb50028 */ sw $s5,0x28($sp) /* 12ac4: afb00014 */ sw $s0,0x14($sp) /* 12ac8: 3c11800a */ lui $s1,%hi(var80099484) -/* 12acc: 3c078009 */ lui $a3,%hi(var80090af0) +/* 12acc: 3c078009 */ lui $a3,%hi(g_Is4Mb) /* 12ad0: afbf002c */ sw $ra,0x2c($sp) /* 12ad4: afb40024 */ sw $s4,0x24($sp) /* 12ad8: afb30020 */ sw $s3,0x20($sp) /* 12adc: 26319484 */ addiu $s1,$s1,%lo(var80099484) /* 12ae0: 2404ffff */ addiu $a0,$zero,-1 /* 12ae4: 00004025 */ or $t0,$zero,$zero -/* 12ae8: 24e70af0 */ addiu $a3,$a3,%lo(var80090af0) +/* 12ae8: 24e70af0 */ addiu $a3,$a3,%lo(g_Is4Mb) /* 12aec: 00008025 */ or $s0,$zero,$zero /* 12af0: 2415ffff */ addiu $s5,$zero,-1 /* 12af4: 24060001 */ addiu $a2,$zero,0x1 diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index af3839142..f1a024ad2 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -2938,7 +2938,7 @@ struct menu_item menuitems_mainmenu[] = { }; // 19a7c -struct menu_dialog menudialog_mainmenu = { +struct menu_dialog g_MainMenuMenuDialog = { MENUDIALOGTYPE_DEFAULT, 0x5674, // "Perfect Menu" menuitems_mainmenu, @@ -2948,7 +2948,7 @@ struct menu_dialog menudialog_mainmenu = { }; // 19a94 -struct menu_dialog menudialog_mainmenu2 = { +struct menu_dialog g_MainMenu4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, 0x5674, // "Perfect Menu" menuitems_mainmenu, @@ -3862,7 +3862,7 @@ struct menu_item menuitems_1b39c[] = { }; // 1b414 -struct menu_dialog menudialog_1b414 = { +struct menu_dialog g_MpEditSimulant4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17cfc0, menuitems_1b39c, diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 95d02ae34..b80ef87e4 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -10785,7 +10785,7 @@ struct menu_item menuitems_mpeditsimulant[] = { }; // 2b94c -struct menu_dialog menudialog_mpeditsimulant = { +struct menu_dialog g_MpEditSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17cfc0, menuitems_mpeditsimulant,