From a8c85b377aa07a501f68085d08e38c84d5ab5edd Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Sat, 30 Oct 2021 19:53:55 +0100 Subject: [PATCH] Share 1370.c across versions (#509) * split jp gfxRetrace_Callback * func_80025F70 * use 1370_len_7d0 on jp * rename 1370_len_7d0 to main * coverage.py --- diff.py | 2 +- src/jp/1370.c | 12 -- src/jp/3A300.c | 2 +- src/jp/3A340.c | 2 +- src/jp/3A4B0.c | 2 +- src/jp/3A4E0.c | 2 +- src/jp/3A610.c | 4 +- src/jp/40DD0.c | 2 +- src/jp/421E0.c | 2 +- src/jp/42230.c | 2 +- src/{1370_len_7d0.c => main.c} | 39 ++++++- tools/to_rename.txt | 110 +----------------- ver/jp/asm/nonmatchings/10080/func_80034E48.s | 4 +- ver/jp/asm/nonmatchings/10080/func_80035384.s | 4 +- ver/jp/asm/nonmatchings/1060/func_80026710.s | 4 +- ver/jp/asm/nonmatchings/1060/func_80026AD4.s | 4 +- ver/jp/asm/nonmatchings/1060/func_80026DA8.s | 4 +- ver/jp/asm/nonmatchings/10E70/func_80035AD4.s | 4 +- ver/jp/asm/nonmatchings/10E70/func_80035B6C.s | 16 +-- ver/jp/asm/nonmatchings/10E70/func_80035D7C.s | 4 +- ver/jp/asm/nonmatchings/10E70/func_80035DB0.s | 4 +- ver/jp/asm/nonmatchings/10E70/func_80035DFC.s | 12 +- ver/jp/asm/nonmatchings/10E70/func_800360EC.s | 8 +- ver/jp/asm/nonmatchings/116D0/func_800362D0.s | 8 +- ver/jp/asm/nonmatchings/116D0/func_800364D4.s | 36 +++--- ver/jp/asm/nonmatchings/11E70/func_80036A70.s | 4 +- ver/jp/asm/nonmatchings/11E70/func_80036D44.s | 44 +++---- ver/jp/asm/nonmatchings/11E70/func_80037234.s | 8 +- ver/jp/asm/nonmatchings/11E70/func_800372C8.s | 12 +- ver/jp/asm/nonmatchings/13140/func_80037D40.s | 4 +- ver/jp/asm/nonmatchings/13140/func_80037DB4.s | 24 ++-- ver/jp/asm/nonmatchings/13530/func_8003817C.s | 4 +- ver/jp/asm/nonmatchings/13530/func_800381EC.s | 4 +- ver/jp/asm/nonmatchings/13530/func_80038258.s | 4 +- ver/jp/asm/nonmatchings/13530/func_8003D448.s | 4 +- ver/jp/asm/nonmatchings/13530/func_8003E0C0.s | 12 +- ver/jp/asm/nonmatchings/13530/func_8003E338.s | 8 +- ver/jp/asm/nonmatchings/19EB0/func_8003F48C.s | 4 +- ver/jp/asm/nonmatchings/19EB0/func_80041024.s | 4 +- ver/jp/asm/nonmatchings/19EB0/func_80041624.s | 4 +- ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s | 12 +- ver/jp/asm/nonmatchings/1B10/func_80026710.s | 4 +- ver/jp/asm/nonmatchings/1B10/func_80026AD4.s | 4 +- ver/jp/asm/nonmatchings/1B10/func_80026DA8.s | 4 +- ver/jp/asm/nonmatchings/1F240/func_80043F58.s | 4 +- ver/jp/asm/nonmatchings/20B80/func_80045A3C.s | 4 +- ver/jp/asm/nonmatchings/20B80/func_8004628C.s | 56 ++++----- ver/jp/asm/nonmatchings/20B80/func_800472B4.s | 4 +- ver/jp/asm/nonmatchings/23330/func_80049DD4.s | 4 +- ver/jp/asm/nonmatchings/2570/func_80027DE0.s | 12 +- ver/jp/asm/nonmatchings/33E80/func_80059A00.s | 4 +- ver/jp/asm/nonmatchings/33E80/func_80059BA4.s | 4 +- ver/jp/asm/nonmatchings/33E80/func_80059C44.s | 4 +- ver/jp/asm/nonmatchings/33E80/func_80059F6C.s | 4 +- ver/jp/asm/nonmatchings/35770/func_8005A3A4.s | 20 ++-- ver/jp/asm/nonmatchings/39960/func_8005E5BC.s | 6 +- ver/jp/asm/nonmatchings/39960/func_8005E660.s | 6 +- .../3A300/{func_8005EF00.s => nuGfxFuncSet.s} | 2 +- .../{func_8005EF40.s => nuGfxPreNMIFuncSet.s} | 2 +- .../{func_8005F0B0.s => nuGfxDisplayOff.s} | 2 +- .../{func_8005F0E0.s => nuGfxDisplayOn.s} | 2 +- .../3A610/{func_8005F2C0.s => nuContInit.s} | 2 +- .../3A610/{func_8005F210.s => nuGfxInitEX2.s} | 2 +- ver/jp/asm/nonmatchings/3BC0/func_800287C0.s | 4 +- ver/jp/asm/nonmatchings/3BC0/func_80028844.s | 32 ++--- .../40DD0/{func_800659D0.s => osGetCount.s} | 2 +- ver/jp/asm/nonmatchings/41670/func_80066270.s | 2 +- ver/jp/asm/nonmatchings/41720/func_80066320.s | 2 +- ver/jp/asm/nonmatchings/41850/func_800664A4.s | 2 +- ver/jp/asm/nonmatchings/41850/func_800665E0.s | 2 +- ver/jp/asm/nonmatchings/41E40/func_80066BE0.s | 4 +- .../421E0/{func_80066DE0.s => osViSetMode.s} | 2 +- ...nc_80066E30.s => osViSetSpecialFeatures.s} | 2 +- ver/jp/asm/nonmatchings/42B0/func_80028ED8.s | 4 +- ver/jp/asm/nonmatchings/42B0/func_80028F4C.s | 4 +- ver/jp/asm/nonmatchings/42B0/func_800298C0.s | 8 +- ver/jp/asm/nonmatchings/42B0/func_80029DE0.s | 4 +- ver/jp/asm/nonmatchings/42B0/func_80029E10.s | 4 +- ver/jp/asm/nonmatchings/44B20/func_80069798.s | 2 +- ver/jp/asm/nonmatchings/45A30/func_8006A6E8.s | 4 +- ver/jp/asm/nonmatchings/47E70/func_8006CA70.s | 8 +- ver/jp/asm/nonmatchings/4AC70/func_80072B10.s | 4 +- ver/jp/asm/nonmatchings/4AC70/func_80072DF4.s | 40 +++---- ver/jp/asm/nonmatchings/5FC0/func_8002ACA4.s | 4 +- ver/jp/asm/nonmatchings/5FC0/func_8002ACEC.s | 4 +- ver/jp/asm/nonmatchings/5FC0/func_8002AD70.s | 4 +- ver/jp/asm/nonmatchings/5FC0/func_8002ADB4.s | 4 +- ver/jp/asm/nonmatchings/6200/func_8002B290.s | 4 +- ver/jp/asm/nonmatchings/6200/func_8002B334.s | 4 +- ver/jp/asm/nonmatchings/6200/func_8002B450.s | 8 +- ver/jp/asm/nonmatchings/6200/func_8002B5C8.s | 4 +- ver/jp/asm/nonmatchings/6200/func_8002B5F0.s | 8 +- ver/jp/asm/nonmatchings/6E00/func_8002BA40.s | 8 +- ver/jp/asm/nonmatchings/80A0/func_8002CCA0.s | 2 +- ver/jp/asm/nonmatchings/8490/func_8002D3CC.s | 4 +- ver/jp/asm/nonmatchings/8490/func_8002DFA4.s | 4 +- ver/jp/asm/nonmatchings/E5D0/func_800331D0.s | 4 +- ver/jp/asm/nonmatchings/E5D0/func_800331F8.s | 12 +- ver/jp/asm/nonmatchings/E860/func_80033460.s | 4 +- ver/jp/asm/nonmatchings/E860/func_80033470.s | 4 +- ver/jp/asm/nonmatchings/E860/func_80033488.s | 4 +- ver/jp/asm/nonmatchings/E860/func_800334C0.s | 4 +- ver/jp/asm/nonmatchings/E860/func_80033504.s | 4 +- ver/jp/asm/nonmatchings/E860/func_80033574.s | 4 +- ver/jp/asm/nonmatchings/E860/func_80033850.s | 4 +- ver/jp/asm/nonmatchings/EF00/func_80033B00.s | 4 +- ver/jp/asm/nonmatchings/EF00/func_80033D34.s | 48 ++++---- ver/jp/asm/nonmatchings/EF00/func_80034054.s | 4 +- ver/jp/asm/nonmatchings/EF00/func_800345FC.s | 12 +- ver/jp/asm/nonmatchings/EF00/func_800348BC.s | 8 +- .../{1370 => main}/func_80026148.s | 0 .../{1370 => main}/func_80026710.s | 4 +- .../{1370 => main}/func_800269C0.s | 0 .../{1370 => main}/func_80026AD4.s | 4 +- .../{1370 => main}/func_80026DA8.s | 4 +- .../{1370 => main}/func_80027054.s | 0 .../{1370 => main}/func_8002715C.s | 0 .../gfxRetrace_Callback.s} | 57 +-------- ver/jp/splat.yaml | 2 +- ver/jp/undefined_syms.txt | 1 + ver/jp/undefined_syms_auto.txt | 8 +- .../{1370_len_7d0 => main}/gfx_task_main.s | 0 ver/us/splat.yaml | 4 +- 123 files changed, 433 insertions(+), 574 deletions(-) delete mode 100644 src/jp/1370.c rename src/{1370_len_7d0.c => main.c} (87%) rename ver/jp/asm/nonmatchings/3A300/{func_8005EF00.s => nuGfxFuncSet.s} (97%) rename ver/jp/asm/nonmatchings/3A340/{func_8005EF40.s => nuGfxPreNMIFuncSet.s} (97%) rename ver/jp/asm/nonmatchings/3A4B0/{func_8005F0B0.s => nuGfxDisplayOff.s} (96%) rename ver/jp/asm/nonmatchings/3A4E0/{func_8005F0E0.s => nuGfxDisplayOn.s} (95%) rename ver/jp/asm/nonmatchings/3A610/{func_8005F2C0.s => nuContInit.s} (97%) rename ver/jp/asm/nonmatchings/3A610/{func_8005F210.s => nuGfxInitEX2.s} (99%) rename ver/jp/asm/nonmatchings/40DD0/{func_800659D0.s => osGetCount.s} (92%) rename ver/jp/asm/nonmatchings/421E0/{func_80066DE0.s => osViSetMode.s} (98%) rename ver/jp/asm/nonmatchings/42230/{func_80066E30.s => osViSetSpecialFeatures.s} (99%) rename ver/jp/asm/nonmatchings/{1370 => main}/func_80026148.s (100%) rename ver/jp/asm/nonmatchings/{1370 => main}/func_80026710.s (98%) rename ver/jp/asm/nonmatchings/{1370 => main}/func_800269C0.s (100%) rename ver/jp/asm/nonmatchings/{1370 => main}/func_80026AD4.s (98%) rename ver/jp/asm/nonmatchings/{1370 => main}/func_80026DA8.s (98%) rename ver/jp/asm/nonmatchings/{1370 => main}/func_80027054.s (100%) rename ver/jp/asm/nonmatchings/{1370 => main}/func_8002715C.s (100%) rename ver/jp/asm/nonmatchings/{1370/func_80025F70.s => main/gfxRetrace_Callback.s} (56%) rename ver/us/asm/nonmatchings/{1370_len_7d0 => main}/gfx_task_main.s (100%) diff --git a/diff.py b/diff.py index 646b6f6585..f55217225a 100755 --- a/diff.py +++ b/diff.py @@ -1283,7 +1283,7 @@ def dump_objfile( if not os.path.isfile(objfile): fail(f"Not able to find .o file for function: {objfile} is not a file.") - refobjfile = "ver/us/expected/" + objfile + refobjfile = "ver/current/expected/" + objfile if not os.path.isfile(refobjfile): fail(f'Please ensure an OK .o file exists at "{refobjfile}".') diff --git a/src/jp/1370.c b/src/jp/1370.c deleted file mode 100644 index 06a710ffb1..0000000000 --- a/src/jp/1370.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -extern s32 D_80073DE0; - -INCLUDE_ASM(s32, "1370", func_80025F70); - -INCLUDE_ASM(s32, "1370", func_80026148); - -void gfxPreNMI_Callback(void) { - D_80073DE0 = 1; - nuContRmbForceStop(); -} diff --git a/src/jp/3A300.c b/src/jp/3A300.c index 6ae0913cbc..de8a4d989b 100644 --- a/src/jp/3A300.c +++ b/src/jp/3A300.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "3A300", func_8005EF00); +INCLUDE_ASM(s32, "3A300", nuGfxFuncSet); diff --git a/src/jp/3A340.c b/src/jp/3A340.c index dc4960ca4c..149c5359ca 100644 --- a/src/jp/3A340.c +++ b/src/jp/3A340.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "3A340", func_8005EF40); +INCLUDE_ASM(s32, "3A340", nuGfxPreNMIFuncSet); diff --git a/src/jp/3A4B0.c b/src/jp/3A4B0.c index 392f152cdd..728c588b59 100644 --- a/src/jp/3A4B0.c +++ b/src/jp/3A4B0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "3A4B0", func_8005F0B0); +INCLUDE_ASM(s32, "3A4B0", nuGfxDisplayOff); diff --git a/src/jp/3A4E0.c b/src/jp/3A4E0.c index 0b1b1fb40d..b343733277 100644 --- a/src/jp/3A4E0.c +++ b/src/jp/3A4E0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "3A4E0", func_8005F0E0); +INCLUDE_ASM(s32, "3A4E0", nuGfxDisplayOn); diff --git a/src/jp/3A610.c b/src/jp/3A610.c index c70e899a3a..48d5683b54 100644 --- a/src/jp/3A610.c +++ b/src/jp/3A610.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "3A610", func_8005F210); +INCLUDE_ASM(s32, "3A610", nuGfxInitEX2); -INCLUDE_ASM(s32, "3A610", func_8005F2C0); +INCLUDE_ASM(s32, "3A610", nuContInit); diff --git a/src/jp/40DD0.c b/src/jp/40DD0.c index 0bd40dac59..2fca8e86bb 100644 --- a/src/jp/40DD0.c +++ b/src/jp/40DD0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "40DD0", func_800659D0); +INCLUDE_ASM(s32, "40DD0", osGetCount); diff --git a/src/jp/421E0.c b/src/jp/421E0.c index 12931b42a9..92056a0fec 100644 --- a/src/jp/421E0.c +++ b/src/jp/421E0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "421E0", func_80066DE0); +INCLUDE_ASM(s32, "421E0", osViSetMode); diff --git a/src/jp/42230.c b/src/jp/42230.c index e862e1aeb3..111131d9e3 100644 --- a/src/jp/42230.c +++ b/src/jp/42230.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "42230", func_80066E30); +INCLUDE_ASM(s32, "42230", osViSetSpecialFeatures); diff --git a/src/1370_len_7d0.c b/src/main.c similarity index 87% rename from src/1370_len_7d0.c rename to src/main.c index cc8722f9b4..0e8bfc1a8f 100644 --- a/src/1370_len_7d0.c +++ b/src/main.c @@ -7,7 +7,12 @@ void gfxRetrace_Callback(s32); void gfxPreNMI_Callback(void); void gfx_task_main(void); +// TODO: name these symbols the same, this is just a shift +#ifdef VERSION_US extern s32 D_80073E00; +#else +extern s32 D_80073DE0; +#endif extern u16* D_80073E04; extern s16 D_80073E08; extern s16 D_80073E0A; @@ -17,8 +22,16 @@ extern OSViMode _osViModeNtscLan1; extern OSViMode _osViModeMPalLan1; void boot_main(void) { - OSViMode* viMode; - +#ifdef VERSION_JP + if (osTvType == OS_TV_NTSC) { + nuGfxDisplayOff(); + osViSetMode(&_osViModeNtscLan1); + osViSetSpecialFeatures(OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF | OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON); + nuGfxDisplayOff(); + } else { + PANIC(); + } +#else // VERSION_JP if (osTvType == OS_TV_NTSC) { osViSetMode(&_osViModeNtscLan1); osViSetSpecialFeatures(OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF | OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON); @@ -31,12 +44,20 @@ void boot_main(void) { nuGfxDisplayOff(); crash_screen_init(); +#endif + is_debug_init(); nuGfxInit(); gGameStatusPtr->contBitPattern = nuContInit(); +#ifdef VERSION_US func_8002D160(); func_802B2000(); func_802B203C(); +#else + func_8002CA00(); + func_802B2000(); + func_802B203C(); +#endif nuGfxFuncSet((NUGfxFunc) gfxRetrace_Callback); nuGfxPreNMIFuncSet(gfxPreNMI_Callback); gRandSeed += osGetCount(); @@ -45,6 +66,7 @@ void boot_main(void) { while (TRUE) {} } +#ifdef VERSION_US void gfxRetrace_Callback(s32 arg0) { if (D_80073E00 != 0) { if (D_80073E00 == 1) { @@ -79,6 +101,9 @@ void gfxRetrace_Callback(s32 arg0) { } } } +#else +INCLUDE_ASM(s32, "main", gfxRetrace_Callback); +#endif //gfx stuff #ifdef NON_MATCHING @@ -153,10 +178,18 @@ void gfx_task_main(void) { gCurrentDisplayContextIndex ^= 1; } #else -INCLUDE_ASM(void, "1370_len_7d0", gfx_task_main); + #ifdef VERSION_US +INCLUDE_ASM(void, "main", gfx_task_main); + #else +INCLUDE_ASM(s32, "main", func_80026148); + #endif #endif void gfxPreNMI_Callback(void) { +#ifdef VERSION_US D_80073E00 = 1; +#else + D_80073DE0 = 1; +#endif nuContRmbForceStop(); } diff --git a/tools/to_rename.txt b/tools/to_rename.txt index dcbdb18081..10001214ed 100644 --- a/tools/to_rename.txt +++ b/tools/to_rename.txt @@ -1,109 +1 @@ -func_E00E495C fx_114_appendGfx -func_E006C5E8 fx_54_appendGfx -func_E0050308 fx_40_appendGfx -func_E0034310 fx_26_appendGfx -func_E011C1C4 fx_128_appendGfx -func_E007685C fx_59_appendGfx -func_E011849C fx_126_appendGfx -func_E00D048C fx_104_appendGfx -func_E00624EC fx_49_appendGfx -func_E0066770 fx_51_appendGfx -func_E0038748 fx_28_appendGfx -func_E01264EC fx_133_appendGfx -func_E00E2218 fx_113_appendGfx -func_E00C8454 fx_100_appendGfx -func_E005C2F8 fx_46_appendGfx -func_E007E54C fx_63_appendGfx -func_E0048218 fx_36_appendGfx -func_E002C414 fx_22_appendGfx -func_E00E6524 fx_115_appendGfx -func_E00745E0 fx_58_appendGfx -func_E004491C fx_34_appendGfx -func_E002E368 fx_23_appendGfx -func_E00423B8 fx_33_appendGfx -func_E00942FC fx_74_appendGfx -func_E00462C0 fx_35_appendGfx -func_E006A94C fx_53_appendGfx -func_E0060450 fx_48_appendGfx -func_E00264F4 fx_19_appendGfx -func_E008A728 fx_69_appendGfx -func_E001A440 fx_13_appendGfx -func_E01124CC fx_123_appendGfx -func_E00BA620 fx_93_appendGfx -func_E008E4E0 fx_71_appendGfx -func_E007C1F4 fx_62_appendGfx -func_E001C30C fx_14_appendGfx -func_E00C67B0 fx_99_appendGfx -func_E00D6980 fx_107_appendGfx -func_E00AE54C fx_87_appendGfx -func_E0036224 fx_27_appendGfx -func_E0016454 fx_11_appendGfx -func_E009C220 fx_78_appendGfx -func_E00A63A4 fx_83_appendGfx -func_E005A3F4 fx_45_appendGfx -func_E011E578 fx_129_appendGfx -func_E00DE2A8 fx_111_appendGfx -func_E00B62E0 fx_91_appendGfx -func_E0116884 fx_125_appendGfx -func_E00BC374 fx_94_appendGfx -func_E003245C fx_25_appendGfx -func_E009E424 fx_79_appendGfx -func_E0064414 fx_50_appendGfx -func_E002852C fx_20_appendGfx -func_E010C39C fx_120_appendGfx -func_E00723D4 fx_57_appendGfx -func_E00CC9D0 fx_102_appendGfx -func_E00B457C fx_90_appendGfx -func_E0056BD0 fx_43_appendGfx -func_E00144E0 fx_10_appendGfx -func_E007827C fx_60_appendGfx -func_E0114388 fx_124_appendGfx -func_E009A3E0 fx_77_appendGfx -func_E002A3C4 fx_21_appendGfx -func_E00205D0 fx_16_appendGfx -func_E00DC304 fx_110_appendGfx -func_E00CA4CC fx_101_appendGfx -func_E0022998 fx_17_appendGfx -func_E012270C fx_131_appendGfx -func_E00E83BC fx_116_appendGfx -func_E0040348 fx_32_appendGfx -func_E00AA404 fx_85_appendGfx -func_E0052460 fx_41_appendGfx -func_E0030A68 fx_24_appendGfx -func_E001E730 fx_15_appendGfx -func_E010E558 fx_121_appendGfx -func_E00BE5BC fx_95_appendGfx -func_E00EA66C fx_117_appendGfx -func_E003E638 fx_31_appendGfx -func_E0070740 fx_56_appendGfx -func_E00A8320 fx_84_appendGfx -func_E00A223C fx_81_appendGfx -func_E00B24B0 fx_89_appendGfx -func_E00584D4 fx_44_appendGfx -func_E004C3A8 fx_38_appendGfx -func_E00A4650 fx_82_appendGfx -func_E010A4E8 fx_119_appendGfx -func_E00887E0 fx_68_appendGfx -func_E004E214 fx_39_appendGfx -func_E004A78C fx_37_appendGfx -func_E007A88C fx_61_appendGfx -func_E003A354 fx_29_appendGfx -func_E00CE478 fx_103_appendGfx -func_E01103EC fx_122_appendGfx -func_E0024454 fx_18_appendGfx -func_E0068234 fx_52_appendGfx -func_E00183D8 fx_12_appendGfx -func_E00E0600 fx_112_appendGfx -func_E008C6FC fx_70_appendGfx -func_E01281E0 fx_134_appendGfx -func_E01203E4 fx_130_appendGfx -func_E01244C4 fx_132_appendGfx -func_E00C4308 fx_98_appendGfx -func_E00B8208 fx_92_appendGfx -func_E00D2284 fx_105_appendGfx -func_E00C0760 fx_96_appendGfx -func_E00982EC fx_76_appendGfx -func_E00B0234 fx_88_appendGfx -func_E00DA230 fx_109_appendGfx -func_E00C221C fx_97_appendGfx -func_E006E764 fx_55_appendGfx +nuGfxInit nuGfxInitEX2 diff --git a/ver/jp/asm/nonmatchings/10080/func_80034E48.s b/ver/jp/asm/nonmatchings/10080/func_80034E48.s index b7cc3af5a6..60749aae7e 100644 --- a/ver/jp/asm/nonmatchings/10080/func_80034E48.s +++ b/ver/jp/asm/nonmatchings/10080/func_80034E48.s @@ -130,8 +130,8 @@ glabel func_80034E48 /* 1041C 8003501C A2020000 */ sb $v0, ($s0) /* 10420 80035020 0C00EB9A */ jal func_8003AE68 /* 10424 80035024 00000000 */ nop -/* 10428 80035028 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1042C 8003502C 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 10428 80035028 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1042C 8003502C 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 10430 80035030 0C016AD4 */ jal func_8005AB50 /* 10434 80035034 A0530070 */ sb $s3, 0x70($v0) /* 10438 80035038 0C00AB18 */ jal func_8002AC60 diff --git a/ver/jp/asm/nonmatchings/10080/func_80035384.s b/ver/jp/asm/nonmatchings/10080/func_80035384.s index 0bec30644d..0cacaaa3d0 100644 --- a/ver/jp/asm/nonmatchings/10080/func_80035384.s +++ b/ver/jp/asm/nonmatchings/10080/func_80035384.s @@ -108,8 +108,8 @@ glabel func_80035384 /* 1090C 8003550C 00431024 */ and $v0, $v0, $v1 /* 10910 80035510 0C016A28 */ jal func_8005A8A0 /* 10914 80035514 AC820000 */ sw $v0, ($a0) -/* 10918 80035518 3C108007 */ lui $s0, %hi(D_8007417C) -/* 1091C 8003551C 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 10918 80035518 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 1091C 8003551C 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 10920 80035520 8E040000 */ lw $a0, ($s0) /* 10924 80035524 84830086 */ lh $v1, 0x86($a0) /* 10928 80035528 00031900 */ sll $v1, $v1, 4 diff --git a/ver/jp/asm/nonmatchings/1060/func_80026710.s b/ver/jp/asm/nonmatchings/1060/func_80026710.s index 914140ba19..7a59583a08 100644 --- a/ver/jp/asm/nonmatchings/1060/func_80026710.s +++ b/ver/jp/asm/nonmatchings/1060/func_80026710.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80026710 -/* 1B10 80026710 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1B14 80026714 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1B10 80026710 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1B14 80026714 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1B18 80026718 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 1B1C 8002671C AFBF0018 */ sw $ra, 0x18($sp) /* 1B20 80026720 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/1060/func_80026AD4.s b/ver/jp/asm/nonmatchings/1060/func_80026AD4.s index 7dd8d2611c..6808cc29e5 100644 --- a/ver/jp/asm/nonmatchings/1060/func_80026AD4.s +++ b/ver/jp/asm/nonmatchings/1060/func_80026AD4.s @@ -68,8 +68,8 @@ glabel func_80026AD4 /* 1FC4 80026BC4 30420002 */ andi $v0, $v0, 2 /* 1FC8 80026BC8 14400009 */ bnez $v0, .L80026BF0 /* 1FCC 80026BCC 3C100010 */ lui $s0, 0x10 -/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1FD8 80026BD8 80420078 */ lb $v0, 0x78($v0) /* 1FDC 80026BDC 14400004 */ bnez $v0, .L80026BF0 /* 1FE0 80026BE0 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/1060/func_80026DA8.s b/ver/jp/asm/nonmatchings/1060/func_80026DA8.s index bf8be950c8..fc9cca68c0 100644 --- a/ver/jp/asm/nonmatchings/1060/func_80026DA8.s +++ b/ver/jp/asm/nonmatchings/1060/func_80026DA8.s @@ -52,8 +52,8 @@ glabel func_80026DA8 /* 2264 80026E64 24C66380 */ addiu $a2, $a2, %lo(D_802E6380) /* 2268 80026E68 0C00A5BF */ jal func_800296FC /* 226C 80026E6C 00000000 */ nop -/* 2270 80026E70 3C108007 */ lui $s0, %hi(D_8007417C) -/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 2270 80026E70 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 2278 80026E78 8E020000 */ lw $v0, ($s0) /* 227C 80026E7C 3C01800A */ lui $at, %hi(D_8009A630) /* 2280 80026E80 AC20A630 */ sw $zero, %lo(D_8009A630)($at) diff --git a/ver/jp/asm/nonmatchings/10E70/func_80035AD4.s b/ver/jp/asm/nonmatchings/10E70/func_80035AD4.s index f0a3e219cd..8e1d073974 100644 --- a/ver/jp/asm/nonmatchings/10E70/func_80035AD4.s +++ b/ver/jp/asm/nonmatchings/10E70/func_80035AD4.s @@ -5,8 +5,8 @@ glabel func_80035AD4 /* 10ED4 80035AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 10ED8 80035AD8 24020004 */ addiu $v0, $zero, 4 /* 10EDC 80035ADC AFB10014 */ sw $s1, 0x14($sp) -/* 10EE0 80035AE0 3C118007 */ lui $s1, %hi(D_8007417C) -/* 10EE4 80035AE4 2631417C */ addiu $s1, $s1, %lo(D_8007417C) +/* 10EE0 80035AE0 3C118007 */ lui $s1, %hi(gGameStatusPtr) +/* 10EE4 80035AE4 2631417C */ addiu $s1, $s1, %lo(gGameStatusPtr) /* 10EE8 80035AE8 AFB00010 */ sw $s0, 0x10($sp) /* 10EEC 80035AEC 3C10800A */ lui $s0, %hi(D_8009E750) /* 10EF0 80035AF0 2610E750 */ addiu $s0, $s0, %lo(D_8009E750) diff --git a/ver/jp/asm/nonmatchings/10E70/func_80035B6C.s b/ver/jp/asm/nonmatchings/10E70/func_80035B6C.s index 0cc5e98a05..6d40b024dd 100644 --- a/ver/jp/asm/nonmatchings/10E70/func_80035B6C.s +++ b/ver/jp/asm/nonmatchings/10E70/func_80035B6C.s @@ -29,8 +29,8 @@ glabel func_80035B6C /* 10FC4 80035BC4 94830000 */ lhu $v1, ($a0) /* 10FC8 80035BC8 1440003B */ bnez $v0, .L80035CB8 /* 10FCC 80035BCC 2462FFFF */ addiu $v0, $v1, -1 -/* 10FD0 80035BD0 3C038007 */ lui $v1, %hi(D_8007417C) -/* 10FD4 80035BD4 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 10FD0 80035BD0 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 10FD4 80035BD4 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 10FD8 80035BD8 8C620000 */ lw $v0, ($v1) /* 10FDC 80035BDC A0400070 */ sb $zero, 0x70($v0) /* 10FE0 80035BE0 8C620000 */ lw $v0, ($v1) @@ -51,8 +51,8 @@ glabel func_80035B6C .L80035C18: /* 11018 80035C18 0C0168E9 */ jal func_8005A3A4 /* 1101C 80035C1C 00000000 */ nop -/* 11020 80035C20 3C108007 */ lui $s0, %hi(D_8007417C) -/* 11024 80035C24 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 11020 80035C20 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 11024 80035C24 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 11028 80035C28 8E020000 */ lw $v0, ($s0) /* 1102C 80035C2C 94430086 */ lhu $v1, 0x86($v0) /* 11030 80035C30 0000202D */ daddu $a0, $zero, $zero @@ -95,8 +95,8 @@ glabel func_80035B6C /* 110B8 80035CB8 0800D75B */ j .L80035D6C /* 110BC 80035CBC A4820000 */ sh $v0, ($a0) .L80035CC0: -/* 110C0 80035CC0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 110C4 80035CC4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 110C0 80035CC0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 110C4 80035CC4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 110C8 80035CC8 0C0B1059 */ jal func_802C4164 /* 110CC 80035CCC 8C44006C */ lw $a0, 0x6c($v0) /* 110D0 80035CD0 14400026 */ bnez $v0, .L80035D6C @@ -127,8 +127,8 @@ glabel func_80035B6C /* 11130 80035D30 00021400 */ sll $v0, $v0, 0x10 /* 11134 80035D34 1040000D */ beqz $v0, .L80035D6C /* 11138 80035D38 00000000 */ nop -/* 1113C 80035D3C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 11140 80035D40 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1113C 80035D3C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 11140 80035D40 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 11144 80035D44 80420071 */ lb $v0, 0x71($v0) /* 11148 80035D48 14400003 */ bnez $v0, .L80035D58 /* 1114C 80035D4C 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/10E70/func_80035D7C.s b/ver/jp/asm/nonmatchings/10E70/func_80035D7C.s index c5649970ea..55c7b53e49 100644 --- a/ver/jp/asm/nonmatchings/10E70/func_80035D7C.s +++ b/ver/jp/asm/nonmatchings/10E70/func_80035D7C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80035D7C -/* 1117C 80035D7C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 11180 80035D80 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1117C 80035D7C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 11180 80035D80 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 11184 80035D84 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 11188 80035D88 AFBF0010 */ sw $ra, 0x10($sp) /* 1118C 80035D8C 804300AC */ lb $v1, 0xac($v0) diff --git a/ver/jp/asm/nonmatchings/10E70/func_80035DB0.s b/ver/jp/asm/nonmatchings/10E70/func_80035DB0.s index c4be8e602c..6175805a97 100644 --- a/ver/jp/asm/nonmatchings/10E70/func_80035DB0.s +++ b/ver/jp/asm/nonmatchings/10E70/func_80035DB0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80035DB0 -/* 111B0 80035DB0 3C058007 */ lui $a1, %hi(D_8007417C) -/* 111B4 80035DB4 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* 111B0 80035DB0 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* 111B4 80035DB4 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* 111B8 80035DB8 84A40088 */ lh $a0, 0x88($a1) /* 111BC 80035DBC 84A30086 */ lh $v1, 0x86($a1) /* 111C0 80035DC0 24020014 */ addiu $v0, $zero, 0x14 diff --git a/ver/jp/asm/nonmatchings/10E70/func_80035DFC.s b/ver/jp/asm/nonmatchings/10E70/func_80035DFC.s index 3b9ca368a9..f6eef472b5 100644 --- a/ver/jp/asm/nonmatchings/10E70/func_80035DFC.s +++ b/ver/jp/asm/nonmatchings/10E70/func_80035DFC.s @@ -52,8 +52,8 @@ glabel func_80035DFC /* 112B8 80035EB8 24420001 */ addiu $v0, $v0, 1 /* 112BC 80035EBC 0800D81A */ j .L80036068 /* 112C0 80035EC0 A4820000 */ sh $v0, ($a0) -/* 112C4 80035EC4 3C108007 */ lui $s0, %hi(D_8007417C) -/* 112C8 80035EC8 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 112C4 80035EC4 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 112C8 80035EC8 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 112CC 80035ECC 8E020000 */ lw $v0, ($s0) /* 112D0 80035ED0 80420071 */ lb $v0, 0x71($v0) /* 112D4 80035ED4 10400003 */ beqz $v0, .L80035EE4 @@ -117,8 +117,8 @@ glabel func_80035DFC /* 113B0 80035FB0 0800D81A */ j .L80036068 /* 113B4 80035FB4 A4820000 */ sh $v0, ($a0) .L80035FB8: -/* 113B8 80035FB8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 113BC 80035FBC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 113B8 80035FB8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 113BC 80035FBC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 113C0 80035FC0 0C0B1059 */ jal func_802C4164 /* 113C4 80035FC4 8C44006C */ lw $a0, 0x6c($v0) /* 113C8 80035FC8 14400027 */ bnez $v0, .L80036068 @@ -149,8 +149,8 @@ glabel func_80035DFC /* 1142C 8003602C 00021400 */ sll $v0, $v0, 0x10 /* 11430 80036030 1040000D */ beqz $v0, .L80036068 /* 11434 80036034 00000000 */ nop -/* 11438 80036038 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1143C 8003603C 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 11438 80036038 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1143C 8003603C 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 11440 80036040 80420071 */ lb $v0, 0x71($v0) /* 11444 80036044 14400003 */ bnez $v0, .L80036054 /* 11448 80036048 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/10E70/func_800360EC.s b/ver/jp/asm/nonmatchings/10E70/func_800360EC.s index 82c05a2b63..7172157805 100644 --- a/ver/jp/asm/nonmatchings/10E70/func_800360EC.s +++ b/ver/jp/asm/nonmatchings/10E70/func_800360EC.s @@ -49,8 +49,8 @@ glabel func_800360EC /* 11590 80036190 0800D8A4 */ j .L80036290 /* 11594 80036194 A4820000 */ sh $v0, ($a0) .L80036198: -/* 11598 80036198 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1159C 8003619C 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 11598 80036198 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1159C 8003619C 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 115A0 800361A0 8C620000 */ lw $v0, ($v1) /* 115A4 800361A4 A0400070 */ sb $zero, 0x70($v0) /* 115A8 800361A8 8C620000 */ lw $v0, ($v1) @@ -72,8 +72,8 @@ glabel func_800360EC /* 115E0 800361E0 00000000 */ nop /* 115E4 800361E4 0C00E57C */ jal func_800395F0 /* 115E8 800361E8 00000000 */ nop -/* 115EC 800361EC 3C028007 */ lui $v0, %hi(D_8007417C) -/* 115F0 800361F0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 115EC 800361EC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 115F0 800361F0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 115F4 800361F4 0C0B1059 */ jal func_802C4164 /* 115F8 800361F8 8C44006C */ lw $a0, 0x6c($v0) /* 115FC 800361FC 1440002C */ bnez $v0, .L800362B0 diff --git a/ver/jp/asm/nonmatchings/116D0/func_800362D0.s b/ver/jp/asm/nonmatchings/116D0/func_800362D0.s index 7c8fd4f3da..15bc390c37 100644 --- a/ver/jp/asm/nonmatchings/116D0/func_800362D0.s +++ b/ver/jp/asm/nonmatchings/116D0/func_800362D0.s @@ -4,8 +4,8 @@ glabel func_800362D0 /* 116D0 800362D0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 116D4 800362D4 AFB10014 */ sw $s1, 0x14($sp) -/* 116D8 800362D8 3C118007 */ lui $s1, %hi(D_8007417C) -/* 116DC 800362DC 2631417C */ addiu $s1, $s1, %lo(D_8007417C) +/* 116D8 800362D8 3C118007 */ lui $s1, %hi(gGameStatusPtr) +/* 116DC 800362DC 2631417C */ addiu $s1, $s1, %lo(gGameStatusPtr) /* 116E0 800362E0 AFBF0018 */ sw $ra, 0x18($sp) /* 116E4 800362E4 AFB00010 */ sw $s0, 0x10($sp) /* 116E8 800362E8 8E220000 */ lw $v0, ($s1) @@ -89,8 +89,8 @@ glabel func_800362D0 /* 11814 80036414 0C00CD1C */ jal func_80033470 /* 11818 80036418 240400D0 */ addiu $a0, $zero, 0xd0 /* 1181C 8003641C 2402FFFF */ addiu $v0, $zero, -1 -/* 11820 80036420 3C038007 */ lui $v1, %hi(D_8007417C) -/* 11824 80036424 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 11820 80036420 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 11824 80036424 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 11828 80036428 3C048007 */ lui $a0, %hi(D_80077980) /* 1182C 8003642C 24847980 */ addiu $a0, $a0, %lo(D_80077980) /* 11830 80036430 A06200A8 */ sb $v0, 0xa8($v1) diff --git a/ver/jp/asm/nonmatchings/116D0/func_800364D4.s b/ver/jp/asm/nonmatchings/116D0/func_800364D4.s index 7da7342732..2da296a1cd 100644 --- a/ver/jp/asm/nonmatchings/116D0/func_800364D4.s +++ b/ver/jp/asm/nonmatchings/116D0/func_800364D4.s @@ -6,8 +6,8 @@ glabel func_800364D4 /* 118D8 800364D8 AFB10014 */ sw $s1, 0x14($sp) /* 118DC 800364DC 3C118011 */ lui $s1, %hi(D_8010F450) /* 118E0 800364E0 2631F450 */ addiu $s1, $s1, %lo(D_8010F450) -/* 118E4 800364E4 3C028007 */ lui $v0, %hi(D_8007417C) -/* 118E8 800364E8 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 118E4 800364E4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 118E8 800364E8 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 118EC 800364EC 2404FFFF */ addiu $a0, $zero, -1 /* 118F0 800364F0 AFBF0018 */ sw $ra, 0x18($sp) /* 118F4 800364F4 AFB00010 */ sw $s0, 0x10($sp) @@ -29,8 +29,8 @@ glabel func_800364D4 /* 11930 80036530 24020001 */ addiu $v0, $zero, 1 /* 11934 80036534 14620010 */ bne $v1, $v0, .L80036578 /* 11938 80036538 24020002 */ addiu $v0, $zero, 2 -/* 1193C 8003653C 3C048007 */ lui $a0, %hi(D_8007417C) -/* 11940 80036540 8C84417C */ lw $a0, %lo(D_8007417C)($a0) +/* 1193C 8003653C 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 11940 80036540 8C84417C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 11944 80036544 908300AC */ lbu $v1, 0xac($a0) /* 11948 80036548 2C620002 */ sltiu $v0, $v1, 2 /* 1194C 8003654C 14400018 */ bnez $v0, .L800365B0 @@ -48,8 +48,8 @@ glabel func_800364D4 .L80036578: /* 11978 80036578 14620011 */ bne $v1, $v0, .L800365C0 /* 1197C 8003657C 00000000 */ nop -/* 11980 80036580 3C048007 */ lui $a0, %hi(D_8007417C) -/* 11984 80036584 8C84417C */ lw $a0, %lo(D_8007417C)($a0) +/* 11980 80036580 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 11984 80036584 8C84417C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 11988 80036588 908300AC */ lbu $v1, 0xac($a0) /* 1198C 8003658C 2C620002 */ sltiu $v0, $v1, 2 /* 11990 80036590 14400005 */ bnez $v0, .L800365A8 @@ -67,8 +67,8 @@ glabel func_800364D4 /* 119B8 800365B8 0800DA92 */ j .L80036A48 /* 119BC 800365BC 00000000 */ nop .L800365C0: -/* 119C0 800365C0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 119C4 800365C4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 119C0 800365C0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 119C4 800365C4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 119C8 800365C8 804300AC */ lb $v1, 0xac($v0) /* 119CC 800365CC 2C620016 */ sltiu $v0, $v1, 0x16 /* 119D0 800365D0 10400109 */ beqz $v0, .L800369F8 @@ -82,8 +82,8 @@ glabel func_800364D4 /* 119F0 800365F0 00000000 */ nop /* 119F4 800365F4 0C00B424 */ jal func_8002D090 /* 119F8 800365F8 00000000 */ nop -/* 119FC 800365FC 3C108007 */ lui $s0, %hi(D_8007417C) -/* 11A00 80036600 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 119FC 800365FC 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 11A00 80036600 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 11A04 80036604 8E060000 */ lw $a2, ($s0) /* 11A08 80036608 80C300A8 */ lb $v1, 0xa8($a2) /* 11A0C 8003660C 2402FFFF */ addiu $v0, $zero, -1 @@ -152,15 +152,15 @@ glabel func_800364D4 /* 11B04 80036704 00431024 */ and $v0, $v0, $v1 /* 11B08 80036708 AC820000 */ sw $v0, ($a0) .L8003670C: -/* 11B0C 8003670C 3C038007 */ lui $v1, %hi(D_8007417C) -/* 11B10 80036710 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 11B0C 8003670C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 11B10 80036710 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 11B14 80036714 24020002 */ addiu $v0, $zero, 2 /* 11B18 80036718 0800DA7E */ j .L800369F8 /* 11B1C 8003671C A06200AC */ sb $v0, 0xac($v1) /* 11B20 80036720 0C00AFB1 */ jal func_8002BEC4 /* 11B24 80036724 0000202D */ daddu $a0, $zero, $zero -/* 11B28 80036728 3C038007 */ lui $v1, %hi(D_8007417C) -/* 11B2C 8003672C 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 11B28 80036728 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 11B2C 8003672C 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 11B30 80036730 8C620000 */ lw $v0, ($v1) /* 11B34 80036734 A0400070 */ sb $zero, 0x70($v0) /* 11B38 80036738 8C620000 */ lw $v0, ($v1) @@ -249,8 +249,8 @@ glabel func_800364D4 /* 11C7C 8003687C 2484FFFF */ addiu $a0, $a0, -1 /* 11C80 80036880 0481FFFD */ bgez $a0, .L80036878 /* 11C84 80036884 2463FFF8 */ addiu $v1, $v1, -8 -/* 11C88 80036888 3C108007 */ lui $s0, %hi(D_8007417C) -/* 11C8C 8003688C 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 11C88 80036888 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 11C8C 8003688C 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 11C90 80036890 8E020000 */ lw $v0, ($s0) /* 11C94 80036894 A2200012 */ sb $zero, 0x12($s1) /* 11C98 80036898 84440086 */ lh $a0, 0x86($v0) @@ -301,8 +301,8 @@ glabel func_800364D4 /* 11D48 80036948 00000000 */ nop /* 11D4C 8003694C 0C00B424 */ jal func_8002D090 /* 11D50 80036950 00000000 */ nop -/* 11D54 80036954 3C108007 */ lui $s0, %hi(D_8007417C) -/* 11D58 80036958 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 11D54 80036954 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 11D58 80036958 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 11D5C 8003695C 8E020000 */ lw $v0, ($s0) /* 11D60 80036960 0C0B1059 */ jal func_802C4164 /* 11D64 80036964 8C44006C */ lw $a0, 0x6c($v0) diff --git a/ver/jp/asm/nonmatchings/11E70/func_80036A70.s b/ver/jp/asm/nonmatchings/11E70/func_80036A70.s index 8460bd729e..0e7f7d7f57 100644 --- a/ver/jp/asm/nonmatchings/11E70/func_80036A70.s +++ b/ver/jp/asm/nonmatchings/11E70/func_80036A70.s @@ -22,8 +22,8 @@ glabel func_80036A70 /* 11EB4 80036AB4 00000000 */ nop /* 11EB8 80036AB8 0C053A2B */ jal func_8014E8AC /* 11EBC 80036ABC 0000202D */ daddu $a0, $zero, $zero -/* 11EC0 80036AC0 3C038007 */ lui $v1, %hi(D_8007417C) -/* 11EC4 80036AC4 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 11EC0 80036AC0 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 11EC4 80036AC4 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 11EC8 80036AC8 8C620000 */ lw $v0, ($v1) /* 11ECC 80036ACC A04000AC */ sb $zero, 0xac($v0) /* 11ED0 80036AD0 8C620000 */ lw $v0, ($v1) diff --git a/ver/jp/asm/nonmatchings/11E70/func_80036D44.s b/ver/jp/asm/nonmatchings/11E70/func_80036D44.s index 2f50bc498c..0f40e193cf 100644 --- a/ver/jp/asm/nonmatchings/11E70/func_80036D44.s +++ b/ver/jp/asm/nonmatchings/11E70/func_80036D44.s @@ -4,8 +4,8 @@ glabel func_80036D44 /* 12144 80036D44 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 12148 80036D48 AFB00018 */ sw $s0, 0x18($sp) -/* 1214C 80036D4C 3C108007 */ lui $s0, %hi(D_8007417C) -/* 12150 80036D50 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 1214C 80036D4C 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 12150 80036D50 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 12154 80036D54 AFBF0020 */ sw $ra, 0x20($sp) /* 12158 80036D58 AFB1001C */ sw $s1, 0x1c($sp) /* 1215C 80036D5C 8E020000 */ lw $v0, ($s0) @@ -42,8 +42,8 @@ glabel func_80036D44 /* 121D4 80036DD4 A423E780 */ sh $v1, %lo(D_8009E780)($at) /* 121D8 80036DD8 34420008 */ ori $v0, $v0, 8 /* 121DC 80036DDC AC820000 */ sw $v0, ($a0) -/* 121E0 80036DE0 3C048007 */ lui $a0, %hi(D_8007417C) -/* 121E4 80036DE4 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* 121E0 80036DE0 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 121E4 80036DE4 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* 121E8 80036DE8 8C830000 */ lw $v1, ($a0) /* 121EC 80036DEC 24020014 */ addiu $v0, $zero, 0x14 /* 121F0 80036DF0 A06200B0 */ sb $v0, 0xb0($v1) @@ -64,8 +64,8 @@ glabel func_80036D44 /* 1222C 80036E2C 0800DC7F */ j .L800371FC /* 12230 80036E30 A4820000 */ sh $v0, ($a0) .L80036E34: -/* 12234 80036E34 3C108007 */ lui $s0, %hi(D_8007417C) -/* 12238 80036E38 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 12234 80036E34 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 12238 80036E38 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 1223C 80036E3C 8E040000 */ lw $a0, ($s0) /* 12240 80036E40 808200AF */ lb $v0, 0xaf($a0) /* 12244 80036E44 908300AF */ lbu $v1, 0xaf($a0) @@ -108,8 +108,8 @@ glabel func_80036D44 /* 122D0 80036ED0 8442E798 */ lh $v0, %lo(D_8009E798)($v0) /* 122D4 80036ED4 14400012 */ bnez $v0, .L80036F20 /* 122D8 80036ED8 32229000 */ andi $v0, $s1, 0x9000 -/* 122DC 80036EDC 3C028007 */ lui $v0, %hi(D_8007417C) -/* 122E0 80036EE0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 122DC 80036EDC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 122E0 80036EE0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 122E4 80036EE4 24030004 */ addiu $v1, $zero, 4 /* 122E8 80036EE8 A04300AC */ sb $v1, 0xac($v0) /* 122EC 80036EEC 3C028007 */ lui $v0, %hi(D_80077A04) @@ -129,8 +129,8 @@ glabel func_80036D44 .L80036F20: /* 12320 80036F20 104000B6 */ beqz $v0, .L800371FC /* 12324 80036F24 24020004 */ addiu $v0, $zero, 4 -/* 12328 80036F28 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1232C 80036F2C 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 12328 80036F28 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1232C 80036F2C 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 12330 80036F30 A06200AC */ sb $v0, 0xac($v1) /* 12334 80036F34 24020005 */ addiu $v0, $zero, 5 /* 12338 80036F38 3C018007 */ lui $at, %hi(D_80077990) @@ -147,8 +147,8 @@ glabel func_80036D44 /* 12364 80036F64 0800DC88 */ j .L80037220 /* 12368 80036F68 00000000 */ nop /* 1236C 80036F6C 240400D0 */ addiu $a0, $zero, 0xd0 -/* 12370 80036F70 3C108007 */ lui $s0, %hi(D_8007417C) -/* 12374 80036F74 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 12370 80036F70 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 12374 80036F74 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 12378 80036F78 8E030000 */ lw $v1, ($s0) /* 1237C 80036F7C 24020005 */ addiu $v0, $zero, 5 /* 12380 80036F80 0C00CD1C */ jal func_80033470 @@ -167,8 +167,8 @@ glabel func_80036D44 /* 123B0 80036FB0 2402000A */ addiu $v0, $zero, 0xa /* 123B4 80036FB4 A06200B0 */ sb $v0, 0xb0($v1) .L80036FB8: -/* 123B8 80036FB8 3C038007 */ lui $v1, %hi(D_8007417C) -/* 123BC 80036FBC 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 123B8 80036FB8 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 123BC 80036FBC 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 123C0 80036FC0 906200B0 */ lbu $v0, 0xb0($v1) /* 123C4 80036FC4 0800DC7F */ j .L800371FC /* 123C8 80036FC8 A06200AF */ sb $v0, 0xaf($v1) @@ -178,8 +178,8 @@ glabel func_80036D44 /* 123D8 80036FD8 2C420002 */ sltiu $v0, $v0, 2 /* 123DC 80036FDC 1040001E */ beqz $v0, .L80037058 /* 123E0 80036FE0 00031400 */ sll $v0, $v1, 0x10 -/* 123E4 80036FE4 3C108007 */ lui $s0, %hi(D_8007417C) -/* 123E8 80036FE8 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 123E4 80036FE4 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 123E8 80036FE8 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 123EC 80036FEC 8E040000 */ lw $a0, ($s0) /* 123F0 80036FF0 808200AF */ lb $v0, 0xaf($a0) /* 123F4 80036FF4 908300AF */ lbu $v1, 0xaf($a0) @@ -214,8 +214,8 @@ glabel func_80036D44 /* 1245C 8003705C 24030005 */ addiu $v1, $zero, 5 /* 12460 80037060 14430012 */ bne $v0, $v1, .L800370AC /* 12464 80037064 24020003 */ addiu $v0, $zero, 3 -/* 12468 80037068 3C058007 */ lui $a1, %hi(D_8007417C) -/* 1246C 8003706C 24A5417C */ addiu $a1, $a1, %lo(D_8007417C) +/* 12468 80037068 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* 1246C 8003706C 24A5417C */ addiu $a1, $a1, %lo(gGameStatusPtr) /* 12470 80037070 8CA40000 */ lw $a0, ($a1) /* 12474 80037074 808200AF */ lb $v0, 0xaf($a0) /* 12478 80037078 908300AF */ lbu $v1, 0xaf($a0) @@ -232,8 +232,8 @@ glabel func_80036D44 /* 124A4 800370A4 0800DC36 */ j .L800370D8 /* 124A8 800370A8 24020006 */ addiu $v0, $zero, 6 .L800370AC: -/* 124AC 800370AC 3C048007 */ lui $a0, %hi(D_8007417C) -/* 124B0 800370B0 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* 124AC 800370AC 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 124B0 800370B0 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* 124B4 800370B4 8C830000 */ lw $v1, ($a0) /* 124B8 800370B8 A06200AF */ sb $v0, 0xaf($v1) /* 124BC 800370BC 3C03800A */ lui $v1, %hi(D_8009A630) @@ -246,8 +246,8 @@ glabel func_80036D44 .L800370D8: /* 124D8 800370D8 0800DC7F */ j .L800371FC /* 124DC 800370DC A06200AC */ sb $v0, 0xac($v1) -/* 124E0 800370E0 3C108007 */ lui $s0, %hi(D_8007417C) -/* 124E4 800370E4 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 124E0 800370E0 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 124E4 800370E4 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 124E8 800370E8 8E040000 */ lw $a0, ($s0) /* 124EC 800370EC 808200AF */ lb $v0, 0xaf($a0) /* 124F0 800370F0 908300AF */ lbu $v1, 0xaf($a0) diff --git a/ver/jp/asm/nonmatchings/11E70/func_80037234.s b/ver/jp/asm/nonmatchings/11E70/func_80037234.s index cb3ec7e18a..4f74836991 100644 --- a/ver/jp/asm/nonmatchings/11E70/func_80037234.s +++ b/ver/jp/asm/nonmatchings/11E70/func_80037234.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80037234 -/* 12634 80037234 3C028007 */ lui $v0, %hi(D_8007417C) -/* 12638 80037238 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 12634 80037234 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 12638 80037238 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1263C 8003723C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 12640 80037240 AFBF0010 */ sw $ra, 0x10($sp) /* 12644 80037244 804300AC */ lb $v1, 0xac($v0) @@ -24,8 +24,8 @@ glabel func_80037234 /* 12680 80037280 AC207A00 */ sw $zero, %lo(D_80077A00)($at) /* 12684 80037284 0C00DD7C */ jal func_800375F0 /* 12688 80037288 00000000 */ nop -/* 1268C 8003728C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 12690 80037290 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1268C 8003728C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 12690 80037290 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 12694 80037294 90420073 */ lbu $v0, 0x73($v0) /* 12698 80037298 30420001 */ andi $v0, $v0, 1 /* 1269C 8003729C 10400007 */ beqz $v0, .L800372BC diff --git a/ver/jp/asm/nonmatchings/11E70/func_800372C8.s b/ver/jp/asm/nonmatchings/11E70/func_800372C8.s index b8fa1a76bb..6496a080c8 100644 --- a/ver/jp/asm/nonmatchings/11E70/func_800372C8.s +++ b/ver/jp/asm/nonmatchings/11E70/func_800372C8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_800372C8 -/* 126C8 800372C8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 126CC 800372CC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 126C8 800372C8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 126CC 800372CC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 126D0 800372D0 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 126D4 800372D4 AFBF0030 */ sw $ra, 0x30($sp) /* 126D8 800372D8 AFB7002C */ sw $s7, 0x2c($sp) @@ -23,8 +23,8 @@ glabel func_800372C8 /* 12710 80037310 8C2283C0 */ lw $v0, %lo(D_800983C0)($at) /* 12714 80037314 00400008 */ jr $v0 /* 12718 80037318 00000000 */ nop -/* 1271C 8003731C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 12720 80037320 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1271C 8003731C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 12720 80037320 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 12724 80037324 804300AF */ lb $v1, 0xaf($v0) /* 12728 80037328 804200B0 */ lb $v0, 0xb0($v0) /* 1272C 8003732C 44836000 */ mtc1 $v1, $f12 @@ -41,8 +41,8 @@ glabel func_800372C8 /* 12758 80037358 44806000 */ mtc1 $zero, $f12 /* 1275C 8003735C 0800DCE8 */ j .L800373A0 /* 12760 80037360 00000000 */ nop -/* 12764 80037364 3C038007 */ lui $v1, %hi(D_8007417C) -/* 12768 80037368 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 12764 80037364 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 12768 80037368 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1276C 8003736C 806200AF */ lb $v0, 0xaf($v1) /* 12770 80037370 806300B0 */ lb $v1, 0xb0($v1) /* 12774 80037374 2442FFFF */ addiu $v0, $v0, -1 diff --git a/ver/jp/asm/nonmatchings/13140/func_80037D40.s b/ver/jp/asm/nonmatchings/13140/func_80037D40.s index 50493d3894..5bfa09f648 100644 --- a/ver/jp/asm/nonmatchings/13140/func_80037D40.s +++ b/ver/jp/asm/nonmatchings/13140/func_80037D40.s @@ -3,8 +3,8 @@ glabel func_80037D40 /* 13140 80037D40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 13144 80037D44 3C048007 */ lui $a0, %hi(D_8007417C) -/* 13148 80037D48 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* 13144 80037D44 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 13148 80037D48 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* 1314C 80037D4C AFBF0010 */ sw $ra, 0x10($sp) /* 13150 80037D50 8C830000 */ lw $v1, ($a0) /* 13154 80037D54 80620071 */ lb $v0, 0x71($v1) diff --git a/ver/jp/asm/nonmatchings/13140/func_80037DB4.s b/ver/jp/asm/nonmatchings/13140/func_80037DB4.s index b6303570d7..e5daf2a389 100644 --- a/ver/jp/asm/nonmatchings/13140/func_80037DB4.s +++ b/ver/jp/asm/nonmatchings/13140/func_80037DB4.s @@ -3,8 +3,8 @@ glabel func_80037DB4 /* 131B4 80037DB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 131B8 80037DB8 3C058007 */ lui $a1, %hi(D_8007417C) -/* 131BC 80037DBC 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* 131B8 80037DB8 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* 131BC 80037DBC 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* 131C0 80037DC0 3C048007 */ lui $a0, %hi(D_80077AB0) /* 131C4 80037DC4 24847AB0 */ addiu $a0, $a0, %lo(D_80077AB0) /* 131C8 80037DC8 AFBF002C */ sw $ra, 0x2c($sp) @@ -42,8 +42,8 @@ glabel func_80037DB4 /* 13240 80037E40 240400FF */ addiu $a0, $zero, 0xff /* 13244 80037E44 0C00CD1C */ jal func_80033470 /* 13248 80037E48 240400E0 */ addiu $a0, $zero, 0xe0 -/* 1324C 80037E4C 3C108007 */ lui $s0, %hi(D_8007417C) -/* 13250 80037E50 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 1324C 80037E4C 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 13250 80037E50 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 13254 80037E54 8E030000 */ lw $v1, ($s0) /* 13258 80037E58 24020003 */ addiu $v0, $zero, 3 /* 1325C 80037E5C A06200AC */ sb $v0, 0xac($v1) @@ -57,8 +57,8 @@ glabel func_80037DB4 /* 1327C 80037E7C 24020005 */ addiu $v0, $zero, 5 /* 13280 80037E80 0800E035 */ j .L800380D4 /* 13284 80037E84 A0620071 */ sb $v0, 0x71($v1) -/* 13288 80037E88 3C108007 */ lui $s0, %hi(D_8007417C) -/* 1328C 80037E8C 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 13288 80037E88 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 1328C 80037E8C 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 13290 80037E90 8E040000 */ lw $a0, ($s0) /* 13294 80037E94 808200AC */ lb $v0, 0xac($a0) /* 13298 80037E98 908300AC */ lbu $v1, 0xac($a0) @@ -150,8 +150,8 @@ glabel func_80037DB4 /* 133EC 80037FEC 27A6001A */ addiu $a2, $sp, 0x1a /* 133F0 80037FF0 0000202D */ daddu $a0, $zero, $zero /* 133F4 80037FF4 2405001D */ addiu $a1, $zero, 0x1d -/* 133F8 80037FF8 3C108007 */ lui $s0, %hi(D_8007417C) -/* 133FC 80037FFC 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 133F8 80037FF8 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 133FC 80037FFC 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 13400 80038000 8E020000 */ lw $v0, ($s0) /* 13404 80038004 97A30018 */ lhu $v1, 0x18($sp) /* 13408 80038008 97A7001A */ lhu $a3, 0x1a($sp) @@ -170,8 +170,8 @@ glabel func_80037DB4 /* 1343C 8003803C 0000202D */ daddu $a0, $zero, $zero /* 13440 80038040 2405001D */ addiu $a1, $zero, 0x1d /* 13444 80038044 24060014 */ addiu $a2, $zero, 0x14 -/* 13448 80038048 3C108007 */ lui $s0, %hi(D_8007417C) -/* 1344C 8003804C 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 13448 80038048 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 1344C 8003804C 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 13450 80038050 8E030000 */ lw $v1, ($s0) /* 13454 80038054 97A20018 */ lhu $v0, 0x18($sp) /* 13458 80038058 97A8001A */ lhu $t0, 0x1a($sp) @@ -208,8 +208,8 @@ glabel func_80037DB4 /* 134CC 800380CC 0C01CB7D */ jal func_80072DF4 /* 134D0 800380D0 96240002 */ lhu $a0, 2($s1) .L800380D4: -/* 134D4 800380D4 3C048007 */ lui $a0, %hi(D_8007417C) -/* 134D8 800380D8 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* 134D4 800380D4 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 134D8 800380D8 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* 134DC 800380DC 8C830000 */ lw $v1, ($a0) /* 134E0 800380E0 90620072 */ lbu $v0, 0x72($v1) /* 134E4 800380E4 24420001 */ addiu $v0, $v0, 1 diff --git a/ver/jp/asm/nonmatchings/13530/func_8003817C.s b/ver/jp/asm/nonmatchings/13530/func_8003817C.s index 38de907b18..958ba4198d 100644 --- a/ver/jp/asm/nonmatchings/13530/func_8003817C.s +++ b/ver/jp/asm/nonmatchings/13530/func_8003817C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8003817C -/* 1357C 8003817C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 13580 80038180 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1357C 8003817C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 13580 80038180 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 13584 80038184 80420070 */ lb $v0, 0x70($v0) /* 13588 80038188 14400005 */ bnez $v0, .L800381A0 /* 1358C 8003818C 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/13530/func_800381EC.s b/ver/jp/asm/nonmatchings/13530/func_800381EC.s index 2a305b2a3b..24da91c27c 100644 --- a/ver/jp/asm/nonmatchings/13530/func_800381EC.s +++ b/ver/jp/asm/nonmatchings/13530/func_800381EC.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_800381EC -/* 135EC 800381EC 3C028007 */ lui $v0, %hi(D_8007417C) -/* 135F0 800381F0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 135EC 800381EC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 135F0 800381F0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 135F4 800381F4 80420070 */ lb $v0, 0x70($v0) /* 135F8 800381F8 14400005 */ bnez $v0, .L80038210 /* 135FC 800381FC 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/13530/func_80038258.s b/ver/jp/asm/nonmatchings/13530/func_80038258.s index fe999d8339..fe6c6b8fc7 100644 --- a/ver/jp/asm/nonmatchings/13530/func_80038258.s +++ b/ver/jp/asm/nonmatchings/13530/func_80038258.s @@ -171,8 +171,8 @@ glabel func_80038258 /* 138B8 800384B8 0000202D */ daddu $a0, $zero, $zero /* 138BC 800384BC 3C013F80 */ lui $at, 0x3f80 /* 138C0 800384C0 44810000 */ mtc1 $at, $f0 -/* 138C4 800384C4 3C038007 */ lui $v1, %hi(D_8007417C) -/* 138C8 800384C8 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 138C4 800384C4 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 138C8 800384C8 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 138CC 800384CC AE020078 */ sw $v0, 0x78($s0) /* 138D0 800384D0 E600007C */ swc1 $f0, 0x7c($s0) /* 138D4 800384D4 80620070 */ lb $v0, 0x70($v1) diff --git a/ver/jp/asm/nonmatchings/13530/func_8003D448.s b/ver/jp/asm/nonmatchings/13530/func_8003D448.s index bbd5c06b7e..c2c0ee5955 100644 --- a/ver/jp/asm/nonmatchings/13530/func_8003D448.s +++ b/ver/jp/asm/nonmatchings/13530/func_8003D448.s @@ -5,8 +5,8 @@ glabel func_8003D448 /* 18848 8003D448 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 1884C 8003D44C AFB00030 */ sw $s0, 0x30($sp) /* 18850 8003D450 0080802D */ daddu $s0, $a0, $zero -/* 18854 8003D454 3C038007 */ lui $v1, %hi(D_8007417C) -/* 18858 8003D458 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 18854 8003D454 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 18858 8003D458 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1885C 8003D45C AFBF0038 */ sw $ra, 0x38($sp) /* 18860 8003D460 AFB10034 */ sw $s1, 0x34($sp) /* 18864 8003D464 84620086 */ lh $v0, 0x86($v1) diff --git a/ver/jp/asm/nonmatchings/13530/func_8003E0C0.s b/ver/jp/asm/nonmatchings/13530/func_8003E0C0.s index 2643fc79c8..d447eccc50 100644 --- a/ver/jp/asm/nonmatchings/13530/func_8003E0C0.s +++ b/ver/jp/asm/nonmatchings/13530/func_8003E0C0.s @@ -13,8 +13,8 @@ glabel func_8003E0C0 /* 194DC 8003E0DC 24A5FFFF */ addiu $a1, $a1, -1 /* 194E0 8003E0E0 04A1FFFD */ bgez $a1, .L8003E0D8 /* 194E4 8003E0E4 2442FFFC */ addiu $v0, $v0, -4 -/* 194E8 8003E0E8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 194EC 8003E0EC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 194E8 8003E0E8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 194EC 8003E0EC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 194F0 8003E0F0 8442008A */ lh $v0, 0x8a($v0) /* 194F4 8003E0F4 10400019 */ beqz $v0, .L8003E15C /* 194F8 8003E0F8 0000282D */ daddu $a1, $zero, $zero @@ -33,8 +33,8 @@ glabel func_8003E0C0 /* 19524 8003E124 28A2003C */ slti $v0, $a1, 0x3c /* 19528 8003E128 1440FFF5 */ bnez $v0, .L8003E100 /* 1952C 8003E12C 24C60030 */ addiu $a2, $a2, 0x30 -/* 19530 8003E130 3C028007 */ lui $v0, %hi(D_8007417C) -/* 19534 8003E134 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 19530 8003E130 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 19534 8003E134 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 19538 8003E138 8442008A */ lh $v0, 0x8a($v0) /* 1953C 8003E13C 10400007 */ beqz $v0, .L8003E15C /* 19540 8003E140 2403FFFF */ addiu $v1, $zero, -1 @@ -46,8 +46,8 @@ glabel func_8003E0C0 /* 19554 8003E154 04A1FFFD */ bgez $a1, .L8003E14C /* 19558 8003E158 2442FFFE */ addiu $v0, $v0, -2 .L8003E15C: -/* 1955C 8003E15C 3C048007 */ lui $a0, %hi(D_8007417C) -/* 19560 8003E160 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* 1955C 8003E15C 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 19560 8003E160 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* 19564 8003E164 8C820000 */ lw $v0, ($a0) /* 19568 8003E168 A0E0001C */ sb $zero, 0x1c($a3) /* 1956C 8003E16C A0E00004 */ sb $zero, 4($a3) diff --git a/ver/jp/asm/nonmatchings/13530/func_8003E338.s b/ver/jp/asm/nonmatchings/13530/func_8003E338.s index 337de01feb..7044e84893 100644 --- a/ver/jp/asm/nonmatchings/13530/func_8003E338.s +++ b/ver/jp/asm/nonmatchings/13530/func_8003E338.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8003E338 -/* 19738 8003E338 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1973C 8003E33C 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 19738 8003E338 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1973C 8003E33C 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 19740 8003E340 3C08800B */ lui $t0, %hi(D_800B0EF0) /* 19744 8003E344 25080EF0 */ addiu $t0, $t0, %lo(D_800B0EF0) /* 19748 8003E348 A1040021 */ sb $a0, 0x21($t0) @@ -28,8 +28,8 @@ glabel func_8003E338 /* 1978C 8003E38C 28A2003C */ slti $v0, $a1, 0x3c /* 19790 8003E390 1440FFF5 */ bnez $v0, .L8003E368 /* 19794 8003E394 24E70030 */ addiu $a3, $a3, 0x30 -/* 19798 8003E398 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1979C 8003E39C 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 19798 8003E398 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1979C 8003E39C 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 197A0 8003E3A0 8442008A */ lh $v0, 0x8a($v0) /* 197A4 8003E3A4 10400008 */ beqz $v0, .L8003E3C8 /* 197A8 8003E3A8 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/19EB0/func_8003F48C.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F48C.s index e2ce53e43c..8b72aeeb77 100644 --- a/ver/jp/asm/nonmatchings/19EB0/func_8003F48C.s +++ b/ver/jp/asm/nonmatchings/19EB0/func_8003F48C.s @@ -406,8 +406,8 @@ glabel func_8003F48C /* 1AE70 8003FA70 8262000A */ lb $v0, 0xa($s3) /* 1AE74 8003FA74 144002C4 */ bnez $v0, .L80040588 /* 1AE78 8003FA78 24080001 */ addiu $t0, $zero, 1 -/* 1AE7C 8003FA7C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1AE80 8003FA80 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1AE7C 8003FA7C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1AE80 8003FA80 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1AE84 8003FA84 80420074 */ lb $v0, 0x74($v0) /* 1AE88 8003FA88 104802BF */ beq $v0, $t0, .L80040588 /* 1AE8C 8003FA8C 3C030008 */ lui $v1, 8 diff --git a/ver/jp/asm/nonmatchings/19EB0/func_80041024.s b/ver/jp/asm/nonmatchings/19EB0/func_80041024.s index f56bd317f5..57b864f1c1 100644 --- a/ver/jp/asm/nonmatchings/19EB0/func_80041024.s +++ b/ver/jp/asm/nonmatchings/19EB0/func_80041024.s @@ -108,8 +108,8 @@ glabel func_80041024 /* 1C5A0 800411A0 0801057E */ j .L800415F8 /* 1C5A4 800411A4 00000000 */ nop .L800411A8: -/* 1C5A8 800411A8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1C5AC 800411AC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1C5A8 800411A8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1C5AC 800411AC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1C5B0 800411B0 80420074 */ lb $v0, 0x74($v0) /* 1C5B4 800411B4 24110002 */ addiu $s1, $zero, 2 /* 1C5B8 800411B8 14510009 */ bne $v0, $s1, .L800411E0 diff --git a/ver/jp/asm/nonmatchings/19EB0/func_80041624.s b/ver/jp/asm/nonmatchings/19EB0/func_80041624.s index 15a639a965..347e6a1fb2 100644 --- a/ver/jp/asm/nonmatchings/19EB0/func_80041624.s +++ b/ver/jp/asm/nonmatchings/19EB0/func_80041624.s @@ -59,8 +59,8 @@ glabel func_80041624 /* 1CAF4 800416F4 4600C686 */ mov.s $f26, $f24 /* 1CAF8 800416F8 4600B706 */ mov.s $f28, $f22 .L800416FC: -/* 1CAFC 800416FC 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1CB00 80041700 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1CAFC 800416FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1CB00 80041700 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1CB04 80041704 80430071 */ lb $v1, 0x71($v0) /* 1CB08 80041708 24020002 */ addiu $v0, $zero, 2 /* 1CB0C 8004170C 1462003C */ bne $v1, $v0, .L80041800 diff --git a/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s b/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s index d93bad5b67..328a97a6a1 100644 --- a/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s +++ b/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s @@ -458,8 +458,8 @@ glabel func_80041BD0 /* 1D648 80042248 30420002 */ andi $v0, $v0, 2 /* 1D64C 8004224C 14400009 */ bnez $v0, .L80042274 /* 1D650 80042250 00000000 */ nop -/* 1D654 80042254 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1D658 80042258 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1D654 80042254 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1D658 80042258 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1D65C 8004225C 80620040 */ lb $v0, 0x40($v1) /* 1D660 80042260 54400004 */ bnel $v0, $zero, .L80042274 /* 1D664 80042264 AEC00094 */ sw $zero, 0x94($s6) @@ -739,8 +739,8 @@ glabel func_80041BD0 /* 1DA34 80042634 8EC20094 */ lw $v0, 0x94($s6) /* 1DA38 80042638 1040000D */ beqz $v0, .L80042670 /* 1DA3C 8004263C 2442FFFF */ addiu $v0, $v0, -1 -/* 1DA40 80042640 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1DA44 80042644 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1DA40 80042640 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1DA44 80042644 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1DA48 80042648 AEC20094 */ sw $v0, 0x94($s6) /* 1DA4C 8004264C 8C620000 */ lw $v0, ($v1) /* 1DA50 80042650 14400007 */ bnez $v0, .L80042670 @@ -908,8 +908,8 @@ glabel func_80041BD0 /* 1DC90 80042890 8EC20094 */ lw $v0, 0x94($s6) /* 1DC94 80042894 104000D3 */ beqz $v0, .L80042BE4 /* 1DC98 80042898 2442FFFF */ addiu $v0, $v0, -1 -/* 1DC9C 8004289C 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1DCA0 800428A0 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1DC9C 8004289C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1DCA0 800428A0 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1DCA4 800428A4 AEC20094 */ sw $v0, 0x94($s6) /* 1DCA8 800428A8 8C620000 */ lw $v0, ($v1) /* 1DCAC 800428AC 144000CD */ bnez $v0, .L80042BE4 diff --git a/ver/jp/asm/nonmatchings/1B10/func_80026710.s b/ver/jp/asm/nonmatchings/1B10/func_80026710.s index 914140ba19..7a59583a08 100644 --- a/ver/jp/asm/nonmatchings/1B10/func_80026710.s +++ b/ver/jp/asm/nonmatchings/1B10/func_80026710.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80026710 -/* 1B10 80026710 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1B14 80026714 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1B10 80026710 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1B14 80026714 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1B18 80026718 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 1B1C 8002671C AFBF0018 */ sw $ra, 0x18($sp) /* 1B20 80026720 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/1B10/func_80026AD4.s b/ver/jp/asm/nonmatchings/1B10/func_80026AD4.s index 7dd8d2611c..6808cc29e5 100644 --- a/ver/jp/asm/nonmatchings/1B10/func_80026AD4.s +++ b/ver/jp/asm/nonmatchings/1B10/func_80026AD4.s @@ -68,8 +68,8 @@ glabel func_80026AD4 /* 1FC4 80026BC4 30420002 */ andi $v0, $v0, 2 /* 1FC8 80026BC8 14400009 */ bnez $v0, .L80026BF0 /* 1FCC 80026BCC 3C100010 */ lui $s0, 0x10 -/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1FD8 80026BD8 80420078 */ lb $v0, 0x78($v0) /* 1FDC 80026BDC 14400004 */ bnez $v0, .L80026BF0 /* 1FE0 80026BE0 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/1B10/func_80026DA8.s b/ver/jp/asm/nonmatchings/1B10/func_80026DA8.s index bf8be950c8..fc9cca68c0 100644 --- a/ver/jp/asm/nonmatchings/1B10/func_80026DA8.s +++ b/ver/jp/asm/nonmatchings/1B10/func_80026DA8.s @@ -52,8 +52,8 @@ glabel func_80026DA8 /* 2264 80026E64 24C66380 */ addiu $a2, $a2, %lo(D_802E6380) /* 2268 80026E68 0C00A5BF */ jal func_800296FC /* 226C 80026E6C 00000000 */ nop -/* 2270 80026E70 3C108007 */ lui $s0, %hi(D_8007417C) -/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 2270 80026E70 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 2278 80026E78 8E020000 */ lw $v0, ($s0) /* 227C 80026E7C 3C01800A */ lui $at, %hi(D_8009A630) /* 2280 80026E80 AC20A630 */ sw $zero, %lo(D_8009A630)($at) diff --git a/ver/jp/asm/nonmatchings/1F240/func_80043F58.s b/ver/jp/asm/nonmatchings/1F240/func_80043F58.s index 89fe7f1173..3704d392f8 100644 --- a/ver/jp/asm/nonmatchings/1F240/func_80043F58.s +++ b/ver/jp/asm/nonmatchings/1F240/func_80043F58.s @@ -27,8 +27,8 @@ glabel func_80043F58 /* 1F3A8 80043FA8 8E050000 */ lw $a1, ($s0) /* 1F3AC 80043FAC 0C0B1EAF */ jal func_802C7ABC /* 1F3B0 80043FB0 0040802D */ daddu $s0, $v0, $zero -/* 1F3B4 80043FB4 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1F3B8 80043FB8 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1F3B4 80043FB4 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1F3B8 80043FB8 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1F3BC 80043FBC 0200202D */ daddu $a0, $s0, $zero /* 1F3C0 80043FC0 8465008C */ lh $a1, 0x8c($v1) /* 1F3C4 80043FC4 0C00F8CE */ jal func_8003E338 diff --git a/ver/jp/asm/nonmatchings/20B80/func_80045A3C.s b/ver/jp/asm/nonmatchings/20B80/func_80045A3C.s index db8dca2ebe..f0430dac46 100644 --- a/ver/jp/asm/nonmatchings/20B80/func_80045A3C.s +++ b/ver/jp/asm/nonmatchings/20B80/func_80045A3C.s @@ -22,8 +22,8 @@ glabel func_80045A3C /* 20E80 80045A80 24020002 */ addiu $v0, $zero, 2 /* 20E84 80045A84 080116B6 */ j .L80045AD8 /* 20E88 80045A88 A2020016 */ sb $v0, 0x16($s0) -/* 20E8C 80045A8C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 20E90 80045A90 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 20E8C 80045A8C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 20E90 80045A90 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 20E94 80045A94 8C420010 */ lw $v0, 0x10($v0) /* 20E98 80045A98 3042C000 */ andi $v0, $v0, 0xc000 /* 20E9C 80045A9C 54400001 */ bnel $v0, $zero, .L80045AA4 diff --git a/ver/jp/asm/nonmatchings/20B80/func_8004628C.s b/ver/jp/asm/nonmatchings/20B80/func_8004628C.s index b91f1b71fc..920b359b36 100644 --- a/ver/jp/asm/nonmatchings/20B80/func_8004628C.s +++ b/ver/jp/asm/nonmatchings/20B80/func_8004628C.s @@ -143,8 +143,8 @@ glabel func_8004628C .L800464B0: /* 218B0 800464B0 14400006 */ bnez $v0, .L800464CC /* 218B4 800464B4 00000000 */ nop -/* 218B8 800464B8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 218BC 800464BC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 218B8 800464B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 218BC 800464BC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 218C0 800464C0 80420070 */ lb $v0, 0x70($v0) /* 218C4 800464C4 105E002D */ beq $v0, $fp, .L8004657C /* 218C8 800464C8 00000000 */ nop @@ -202,8 +202,8 @@ glabel func_8004628C /* 21990 80046590 00581024 */ and $v0, $v0, $t8 /* 21994 80046594 14400006 */ bnez $v0, .L800465B0 /* 21998 80046598 00000000 */ nop -/* 2199C 8004659C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 219A0 800465A0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 2199C 8004659C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 219A0 800465A0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 219A4 800465A4 80420070 */ lb $v0, 0x70($v0) /* 219A8 800465A8 105E002D */ beq $v0, $fp, .L80046660 /* 219AC 800465AC 00000000 */ nop @@ -270,8 +270,8 @@ glabel func_8004628C .L80046694: /* 21A94 80046694 14400006 */ bnez $v0, .L800466B0 /* 21A98 80046698 00000000 */ nop -/* 21A9C 8004669C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 21AA0 800466A0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 21A9C 8004669C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 21AA0 800466A0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21AA4 800466A4 80420070 */ lb $v0, 0x70($v0) /* 21AA8 800466A8 105E0034 */ beq $v0, $fp, .L8004677C /* 21AAC 800466AC 00000000 */ nop @@ -337,8 +337,8 @@ glabel func_8004628C /* 21B90 80046790 00581024 */ and $v0, $v0, $t8 /* 21B94 80046794 14400006 */ bnez $v0, .L800467B0 /* 21B98 80046798 00000000 */ nop -/* 21B9C 8004679C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 21BA0 800467A0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 21B9C 8004679C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 21BA0 800467A0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21BA4 800467A4 80420070 */ lb $v0, 0x70($v0) /* 21BA8 800467A8 105E0034 */ beq $v0, $fp, .L8004687C /* 21BAC 800467AC 00000000 */ nop @@ -413,8 +413,8 @@ glabel func_8004628C .L800468B0: /* 21CB0 800468B0 14400006 */ bnez $v0, .L800468CC /* 21CB4 800468B4 00000000 */ nop -/* 21CB8 800468B8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 21CBC 800468BC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 21CB8 800468B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 21CBC 800468BC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21CC0 800468C0 80420070 */ lb $v0, 0x70($v0) /* 21CC4 800468C4 105E0036 */ beq $v0, $fp, .L800469A0 /* 21CC8 800468C8 00000000 */ nop @@ -483,8 +483,8 @@ glabel func_8004628C /* 21DB4 800469B4 00581024 */ and $v0, $v0, $t8 /* 21DB8 800469B8 14400006 */ bnez $v0, .L800469D4 /* 21DBC 800469BC 00000000 */ nop -/* 21DC0 800469C0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 21DC4 800469C4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 21DC0 800469C0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 21DC4 800469C4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21DC8 800469C8 80420070 */ lb $v0, 0x70($v0) /* 21DCC 800469CC 105E0036 */ beq $v0, $fp, .L80046AA8 /* 21DD0 800469D0 00000000 */ nop @@ -598,8 +598,8 @@ glabel func_8004628C .L80046B54: /* 21F54 80046B54 14400006 */ bnez $v0, .L80046B70 /* 21F58 80046B58 00000000 */ nop -/* 21F5C 80046B5C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 21F60 80046B60 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 21F5C 80046B5C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 21F60 80046B60 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 21F64 80046B64 80420070 */ lb $v0, 0x70($v0) /* 21F68 80046B68 105E0039 */ beq $v0, $fp, .L80046C50 /* 21F6C 80046B6C 00000000 */ nop @@ -672,8 +672,8 @@ glabel func_8004628C /* 22064 80046C64 00581024 */ and $v0, $v0, $t8 /* 22068 80046C68 14400006 */ bnez $v0, .L80046C84 /* 2206C 80046C6C 00000000 */ nop -/* 22070 80046C70 3C028007 */ lui $v0, %hi(D_8007417C) -/* 22074 80046C74 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 22070 80046C70 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 22074 80046C74 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22078 80046C78 80420070 */ lb $v0, 0x70($v0) /* 2207C 80046C7C 105E0036 */ beq $v0, $fp, .L80046D58 /* 22080 80046C80 00000000 */ nop @@ -744,8 +744,8 @@ glabel func_8004628C /* 22170 80046D70 30620002 */ andi $v0, $v1, 2 /* 22174 80046D74 14400006 */ bnez $v0, .L80046D90 /* 22178 80046D78 00000000 */ nop -/* 2217C 80046D7C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 22180 80046D80 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 2217C 80046D7C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 22180 80046D80 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22184 80046D84 80420070 */ lb $v0, 0x70($v0) /* 22188 80046D88 105E001E */ beq $v0, $fp, .L80046E04 /* 2218C 80046D8C 00000000 */ nop @@ -822,8 +822,8 @@ glabel func_8004628C /* 2229C 80046E9C 30620002 */ andi $v0, $v1, 2 /* 222A0 80046EA0 14400006 */ bnez $v0, .L80046EBC /* 222A4 80046EA4 00000000 */ nop -/* 222A8 80046EA8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 222AC 80046EAC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 222A8 80046EA8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 222AC 80046EAC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 222B0 80046EB0 80420070 */ lb $v0, 0x70($v0) /* 222B4 80046EB4 105E001E */ beq $v0, $fp, .L80046F30 /* 222B8 80046EB8 00000000 */ nop @@ -900,8 +900,8 @@ glabel func_8004628C /* 223C8 80046FC8 30620002 */ andi $v0, $v1, 2 /* 223CC 80046FCC 14400006 */ bnez $v0, .L80046FE8 /* 223D0 80046FD0 00000000 */ nop -/* 223D4 80046FD4 3C028007 */ lui $v0, %hi(D_8007417C) -/* 223D8 80046FD8 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 223D4 80046FD4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 223D8 80046FD8 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 223DC 80046FDC 80420070 */ lb $v0, 0x70($v0) /* 223E0 80046FE0 105E001E */ beq $v0, $fp, .L8004705C /* 223E4 80046FE4 00000000 */ nop @@ -945,8 +945,8 @@ glabel func_8004628C /* 22474 80047074 30620002 */ andi $v0, $v1, 2 /* 22478 80047078 14400006 */ bnez $v0, .L80047094 /* 2247C 8004707C 00000000 */ nop -/* 22480 80047080 3C028007 */ lui $v0, %hi(D_8007417C) -/* 22484 80047084 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 22480 80047080 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 22484 80047084 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22488 80047088 80420070 */ lb $v0, 0x70($v0) /* 2248C 8004708C 105E001E */ beq $v0, $fp, .L80047108 /* 22490 80047090 00000000 */ nop @@ -990,8 +990,8 @@ glabel func_8004628C /* 22520 80047120 30620002 */ andi $v0, $v1, 2 /* 22524 80047124 14400006 */ bnez $v0, .L80047140 /* 22528 80047128 00000000 */ nop -/* 2252C 8004712C 3C028007 */ lui $v0, %hi(D_8007417C) -/* 22530 80047130 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 2252C 8004712C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 22530 80047130 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 22534 80047134 80420070 */ lb $v0, 0x70($v0) /* 22538 80047138 105E001E */ beq $v0, $fp, .L800471B4 /* 2253C 8004713C 00000000 */ nop @@ -1035,8 +1035,8 @@ glabel func_8004628C /* 225CC 800471CC 30620002 */ andi $v0, $v1, 2 /* 225D0 800471D0 14400006 */ bnez $v0, .L800471EC /* 225D4 800471D4 00000000 */ nop -/* 225D8 800471D8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 225DC 800471DC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 225D8 800471D8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 225DC 800471DC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 225E0 800471E0 80420070 */ lb $v0, 0x70($v0) /* 225E4 800471E4 505E001F */ beql $v0, $fp, .L80047264 /* 225E8 800471E8 263100B0 */ addiu $s1, $s1, 0xb0 diff --git a/ver/jp/asm/nonmatchings/20B80/func_800472B4.s b/ver/jp/asm/nonmatchings/20B80/func_800472B4.s index 3b6ef90b0b..f6cf845f4c 100644 --- a/ver/jp/asm/nonmatchings/20B80/func_800472B4.s +++ b/ver/jp/asm/nonmatchings/20B80/func_800472B4.s @@ -21,8 +21,8 @@ glabel func_800472B4 /* 226E8 800472E8 08011CBA */ j .L800472E8 /* 226EC 800472EC 00000000 */ nop .L800472F0: -/* 226F0 800472F0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 226F4 800472F4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 226F0 800472F0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 226F4 800472F4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 226F8 800472F8 AC830000 */ sw $v1, ($a0) /* 226FC 800472FC 80420070 */ lb $v0, 0x70($v0) /* 22700 80047300 10400002 */ beqz $v0, .L8004730C diff --git a/ver/jp/asm/nonmatchings/23330/func_80049DD4.s b/ver/jp/asm/nonmatchings/23330/func_80049DD4.s index 6e7903c6d0..5f8b684b7c 100644 --- a/ver/jp/asm/nonmatchings/23330/func_80049DD4.s +++ b/ver/jp/asm/nonmatchings/23330/func_80049DD4.s @@ -149,8 +149,8 @@ glabel func_80049DD4 /* 25408 8004A008 00000000 */ nop /* 2540C 8004A00C 45000012 */ bc1f .L8004A058 /* 25410 8004A010 00000000 */ nop -/* 25414 8004A014 3C028007 */ lui $v0, %hi(D_8007417C) -/* 25418 8004A018 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 25414 8004A014 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 25418 8004A018 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 2541C 8004A01C 94430134 */ lhu $v1, 0x134($v0) /* 25420 8004A020 3C02CCCC */ lui $v0, 0xcccc /* 25424 8004A024 3442CCCD */ ori $v0, $v0, 0xcccd diff --git a/ver/jp/asm/nonmatchings/2570/func_80027DE0.s b/ver/jp/asm/nonmatchings/2570/func_80027DE0.s index 2fc111b626..d2cabb5204 100644 --- a/ver/jp/asm/nonmatchings/2570/func_80027DE0.s +++ b/ver/jp/asm/nonmatchings/2570/func_80027DE0.s @@ -19,8 +19,8 @@ glabel func_80027DE0 /* 3218 80027E18 AFB10024 */ sw $s1, 0x24($sp) /* 321C 80027E1C AFB00020 */ sw $s0, 0x20($sp) /* 3220 80027E20 8D8B0000 */ lw $t3, ($t4) -/* 3224 80027E24 3C108007 */ lui $s0, %hi(D_8007417C) -/* 3228 80027E28 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 3224 80027E24 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 3228 80027E28 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 322C 80027E2C 0160182D */ daddu $v1, $t3, $zero /* 3230 80027E30 256B0008 */ addiu $t3, $t3, 8 /* 3234 80027E34 AD8B0000 */ sw $t3, ($t4) @@ -431,8 +431,8 @@ glabel func_80027DE0 /* 3868 80028468 34820001 */ ori $v0, $a0, 1 /* 386C 8002846C 00021400 */ sll $v0, $v0, 0x10 /* 3870 80028470 34420001 */ ori $v0, $v0, 1 -/* 3874 80028474 3C038007 */ lui $v1, %hi(D_8007417C) -/* 3878 80028478 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 3874 80028474 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 3878 80028478 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 387C 8002847C 00441025 */ or $v0, $v0, $a0 /* 3880 80028480 ACA20004 */ sw $v0, 4($a1) /* 3884 80028484 8470014A */ lh $s0, 0x14a($v1) @@ -491,8 +491,8 @@ glabel func_80027DE0 /* 392C 8002852C 50400001 */ beql $v0, $zero, .L80028534 /* 3930 80028530 241200F0 */ addiu $s2, $zero, 0xf0 .L80028534: -/* 3934 80028534 3C028007 */ lui $v0, %hi(D_8007417C) -/* 3938 80028538 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 3934 80028534 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 3938 80028538 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 393C 8002853C 94420148 */ lhu $v0, 0x148($v0) /* 3940 80028540 30420001 */ andi $v0, $v0, 1 /* 3944 80028544 14400017 */ bnez $v0, .L800285A4 diff --git a/ver/jp/asm/nonmatchings/33E80/func_80059A00.s b/ver/jp/asm/nonmatchings/33E80/func_80059A00.s index 470e9df5ee..2835003a14 100644 --- a/ver/jp/asm/nonmatchings/33E80/func_80059A00.s +++ b/ver/jp/asm/nonmatchings/33E80/func_80059A00.s @@ -45,8 +45,8 @@ glabel func_80059A00 /* 34E94 80059A94 26520001 */ addiu $s2, $s2, 1 /* 34E98 80059A98 8E030010 */ lw $v1, 0x10($s0) /* 34E9C 80059A9C 8C620000 */ lw $v0, ($v1) -/* 34EA0 80059AA0 3C048007 */ lui $a0, %hi(D_8007417C) -/* 34EA4 80059AA4 8C84417C */ lw $a0, %lo(D_8007417C)($a0) +/* 34EA0 80059AA0 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 34EA4 80059AA4 8C84417C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 34EA8 80059AA8 00531024 */ and $v0, $v0, $s3 /* 34EAC 80059AAC AC620000 */ sw $v0, ($v1) /* 34EB0 80059AB0 80820070 */ lb $v0, 0x70($a0) diff --git a/ver/jp/asm/nonmatchings/33E80/func_80059BA4.s b/ver/jp/asm/nonmatchings/33E80/func_80059BA4.s index 41d86bc2b4..9adf69ab6d 100644 --- a/ver/jp/asm/nonmatchings/33E80/func_80059BA4.s +++ b/ver/jp/asm/nonmatchings/33E80/func_80059BA4.s @@ -20,8 +20,8 @@ glabel func_80059BA4 /* 34FDC 80059BDC 30620008 */ andi $v0, $v1, 8 /* 34FE0 80059BE0 50400010 */ beql $v0, $zero, .L80059C24 /* 34FE4 80059BE4 26310001 */ addiu $s1, $s1, 1 -/* 34FE8 80059BE8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 34FEC 80059BEC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 34FE8 80059BE8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 34FEC 80059BEC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 34FF0 80059BF0 80420070 */ lb $v0, 0x70($v0) /* 34FF4 80059BF4 10400005 */ beqz $v0, .L80059C0C /* 34FF8 80059BF8 30620004 */ andi $v0, $v1, 4 diff --git a/ver/jp/asm/nonmatchings/33E80/func_80059C44.s b/ver/jp/asm/nonmatchings/33E80/func_80059C44.s index 8a1bf9c396..d4ab0afcf6 100644 --- a/ver/jp/asm/nonmatchings/33E80/func_80059C44.s +++ b/ver/jp/asm/nonmatchings/33E80/func_80059C44.s @@ -35,8 +35,8 @@ glabel func_80059C44 /* 350B8 80059CB8 30620008 */ andi $v0, $v1, 8 /* 350BC 80059CBC 5040009E */ beql $v0, $zero, .L80059F38 /* 350C0 80059CC0 26520001 */ addiu $s2, $s2, 1 -/* 350C4 80059CC4 3C028007 */ lui $v0, %hi(D_8007417C) -/* 350C8 80059CC8 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 350C4 80059CC4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 350C8 80059CC8 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 350CC 80059CCC 80420070 */ lb $v0, 0x70($v0) /* 350D0 80059CD0 10400005 */ beqz $v0, .L80059CE8 /* 350D4 80059CD4 30620004 */ andi $v0, $v1, 4 diff --git a/ver/jp/asm/nonmatchings/33E80/func_80059F6C.s b/ver/jp/asm/nonmatchings/33E80/func_80059F6C.s index d00de5f65b..a58d605b37 100644 --- a/ver/jp/asm/nonmatchings/33E80/func_80059F6C.s +++ b/ver/jp/asm/nonmatchings/33E80/func_80059F6C.s @@ -104,8 +104,8 @@ glabel func_80059F6C /* 354BC 8005A0BC 0040F809 */ jalr $v0 /* 354C0 8005A0C0 0220202D */ daddu $a0, $s1, $zero .L8005A0C4: -/* 354C4 8005A0C4 3C028007 */ lui $v0, %hi(D_8007417C) -/* 354C8 8005A0C8 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 354C4 8005A0C4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 354C8 8005A0C8 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 354CC 8005A0CC 80420070 */ lb $v0, 0x70($v0) /* 354D0 8005A0D0 10400005 */ beqz $v0, .L8005A0E8 /* 354D4 8005A0D4 0220102D */ daddu $v0, $s1, $zero diff --git a/ver/jp/asm/nonmatchings/35770/func_8005A3A4.s b/ver/jp/asm/nonmatchings/35770/func_8005A3A4.s index 9125cd3f5b..212ee17a91 100644 --- a/ver/jp/asm/nonmatchings/35770/func_8005A3A4.s +++ b/ver/jp/asm/nonmatchings/35770/func_8005A3A4.s @@ -17,8 +17,8 @@ glabel func_8005A3A4 /* 357D4 8005A3D4 3C05800A */ lui $a1, %hi(D_8009A630) /* 357D8 8005A3D8 24A5A630 */ addiu $a1, $a1, %lo(D_8009A630) /* 357DC 8005A3DC 2402FFBF */ addiu $v0, $zero, -0x41 -/* 357E0 8005A3E0 3C128007 */ lui $s2, %hi(D_8007417C) -/* 357E4 8005A3E4 2652417C */ addiu $s2, $s2, %lo(D_8007417C) +/* 357E0 8005A3E0 3C128007 */ lui $s2, %hi(gGameStatusPtr) +/* 357E4 8005A3E4 2652417C */ addiu $s2, $s2, %lo(gGameStatusPtr) /* 357E8 8005A3E8 8CA30000 */ lw $v1, ($a1) /* 357EC 8005A3EC 8E440000 */ lw $a0, ($s2) /* 357F0 8005A3F0 00621824 */ and $v1, $v1, $v0 @@ -60,8 +60,8 @@ glabel func_8005A3A4 .L8005A478: /* 35878 8005A478 3C04800E */ lui $a0, %hi(D_800D9210) /* 3587C 8005A47C 24849210 */ addiu $a0, $a0, %lo(D_800D9210) -/* 35880 8005A480 3C028007 */ lui $v0, %hi(D_8007417C) -/* 35884 8005A484 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 35880 8005A480 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 35884 8005A484 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 35888 8005A488 00131C00 */ sll $v1, $s3, 0x10 /* 3588C 8005A48C AC400144 */ sw $zero, 0x144($v0) /* 35890 8005A490 00111400 */ sll $v0, $s1, 0x10 @@ -178,8 +178,8 @@ glabel func_8005A3A4 /* 35A34 8005A634 00000000 */ nop /* 35A38 8005A638 0C00B6E1 */ jal func_8002DB84 /* 35A3C 8005A63C 00000000 */ nop -/* 35A40 8005A640 3C108007 */ lui $s0, %hi(D_8007417C) -/* 35A44 8005A644 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 35A40 8005A640 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 35A44 8005A644 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 35A48 8005A648 8E020000 */ lw $v0, ($s0) /* 35A4C 8005A64C 0C044512 */ jal func_80111448 /* 35A50 8005A650 80440084 */ lb $a0, 0x84($v0) @@ -285,8 +285,8 @@ glabel func_8005A3A4 /* 35BCC 8005A7CC 34420002 */ ori $v0, $v0, 2 /* 35BD0 8005A7D0 A4820558 */ sh $v0, 0x558($a0) /* 35BD4 8005A7D4 94821008 */ lhu $v0, 0x1008($a0) -/* 35BD8 8005A7D8 3C038007 */ lui $v1, %hi(D_8007417C) -/* 35BDC 8005A7DC 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 35BD8 8005A7D8 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 35BDC 8005A7DC 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 35BE0 8005A7E0 34420002 */ ori $v0, $v0, 2 /* 35BE4 8005A7E4 A4821008 */ sh $v0, 0x1008($a0) /* 35BE8 8005A7E8 806300A8 */ lb $v1, 0xa8($v1) @@ -313,8 +313,8 @@ glabel func_8005A3A4 /* 35C34 8005A834 00000000 */ nop /* 35C38 8005A838 0000282D */ daddu $a1, $zero, $zero /* 35C3C 8005A83C 00A0302D */ daddu $a2, $a1, $zero -/* 35C40 8005A840 3C108007 */ lui $s0, %hi(D_8007417C) -/* 35C44 8005A844 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 35C40 8005A840 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 35C44 8005A844 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 35C48 8005A848 8E030000 */ lw $v1, ($s0) /* 35C4C 8005A84C 240203E8 */ addiu $v0, $zero, 0x3e8 /* 35C50 8005A850 A4620090 */ sh $v0, 0x90($v1) diff --git a/ver/jp/asm/nonmatchings/39960/func_8005E5BC.s b/ver/jp/asm/nonmatchings/39960/func_8005E5BC.s index e06fbd067f..2186466446 100644 --- a/ver/jp/asm/nonmatchings/39960/func_8005E5BC.s +++ b/ver/jp/asm/nonmatchings/39960/func_8005E5BC.s @@ -11,7 +11,7 @@ glabel func_8005E5BC /* 399D4 8005E5D4 24040002 */ addiu $a0, $zero, 2 /* 399D8 8005E5D8 0C017998 */ jal func_8005E660 /* 399DC 8005E5DC 24050001 */ addiu $a1, $zero, 1 -/* 399E0 8005E5E0 0C019B8C */ jal func_80066E30 +/* 399E0 8005E5E0 0C019B8C */ jal osViSetSpecialFeatures /* 399E4 8005E5E4 2404005A */ addiu $a0, $zero, 0x5a /* 399E8 8005E5E8 3C10800A */ lui $s0, %hi(D_800A2230) /* 399EC 8005E5EC 26102230 */ addiu $s0, $s0, %lo(D_800A2230) @@ -21,8 +21,8 @@ glabel func_8005E5BC /* 399FC 8005E5FC 24428570 */ addiu $v0, $v0, %lo(D_800B8570) /* 39A00 8005E600 AFA20010 */ sw $v0, 0x10($sp) /* 39A04 8005E604 2402000A */ addiu $v0, $zero, 0xa -/* 39A08 8005E608 3C068002 */ lui $a2, %hi(func_80025F70) -/* 39A0C 8005E60C 24C65F70 */ addiu $a2, $a2, %lo(func_80025F70) +/* 39A08 8005E608 3C068002 */ lui $a2, %hi(boot_main) +/* 39A0C 8005E60C 24C65F70 */ addiu $a2, $a2, %lo(boot_main) /* 39A10 8005E610 0000382D */ daddu $a3, $zero, $zero /* 39A14 8005E614 0C01978C */ jal func_80065E30 /* 39A18 8005E618 AFA20014 */ sw $v0, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/39960/func_8005E660.s b/ver/jp/asm/nonmatchings/39960/func_8005E660.s index f56052183c..349f5ecb40 100644 --- a/ver/jp/asm/nonmatchings/39960/func_8005E660.s +++ b/ver/jp/asm/nonmatchings/39960/func_8005E660.s @@ -19,8 +19,8 @@ glabel func_8005E660 /* 39A98 8005E698 326200FF */ andi $v0, $s3, 0xff /* 39A9C 8005E69C AC82000C */ sw $v0, 0xc($a0) /* 39AA0 8005E6A0 A0830011 */ sb $v1, 0x11($a0) -/* 39AA4 8005E6A4 3C028000 */ lui $v0, %hi(D_80000300) -/* 39AA8 8005E6A8 8C420300 */ lw $v0, %lo(D_80000300)($v0) +/* 39AA4 8005E6A4 3C028000 */ lui $v0, %hi(osTvType) +/* 39AA8 8005E6A8 8C420300 */ lw $v0, %lo(osTvType)($v0) /* 39AAC 8005E6AC A483F996 */ sh $v1, -0x66a($a0) /* 39AB0 8005E6B0 2483F994 */ addiu $v1, $a0, -0x66c /* 39AB4 8005E6B4 AC800000 */ sw $zero, ($a0) @@ -73,7 +73,7 @@ glabel func_8005E660 /* 39B68 8005E768 00042100 */ sll $a0, $a0, 4 /* 39B6C 8005E76C 3C028009 */ lui $v0, %hi(D_80094680) /* 39B70 8005E770 24424680 */ addiu $v0, $v0, %lo(D_80094680) -/* 39B74 8005E774 0C019B78 */ jal func_80066DE0 +/* 39B74 8005E774 0C019B78 */ jal osViSetMode /* 39B78 8005E778 00822021 */ addu $a0, $a0, $v0 /* 39B7C 8005E77C 0C019CD4 */ jal func_80067350 /* 39B80 8005E780 24040001 */ addiu $a0, $zero, 1 diff --git a/ver/jp/asm/nonmatchings/3A300/func_8005EF00.s b/ver/jp/asm/nonmatchings/3A300/nuGfxFuncSet.s similarity index 97% rename from ver/jp/asm/nonmatchings/3A300/func_8005EF00.s rename to ver/jp/asm/nonmatchings/3A300/nuGfxFuncSet.s index 0eda8693c3..478d13ea66 100644 --- a/ver/jp/asm/nonmatchings/3A300/func_8005EF00.s +++ b/ver/jp/asm/nonmatchings/3A300/nuGfxFuncSet.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005EF00 +glabel nuGfxFuncSet /* 3A300 8005EF00 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3A304 8005EF04 AFB00010 */ sw $s0, 0x10($sp) /* 3A308 8005EF08 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/3A340/func_8005EF40.s b/ver/jp/asm/nonmatchings/3A340/nuGfxPreNMIFuncSet.s similarity index 97% rename from ver/jp/asm/nonmatchings/3A340/func_8005EF40.s rename to ver/jp/asm/nonmatchings/3A340/nuGfxPreNMIFuncSet.s index 69119457b3..74f7426631 100644 --- a/ver/jp/asm/nonmatchings/3A340/func_8005EF40.s +++ b/ver/jp/asm/nonmatchings/3A340/nuGfxPreNMIFuncSet.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005EF40 +glabel nuGfxPreNMIFuncSet /* 3A340 8005EF40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3A344 8005EF44 AFB00010 */ sw $s0, 0x10($sp) /* 3A348 8005EF48 0080802D */ daddu $s0, $a0, $zero diff --git a/ver/jp/asm/nonmatchings/3A4B0/func_8005F0B0.s b/ver/jp/asm/nonmatchings/3A4B0/nuGfxDisplayOff.s similarity index 96% rename from ver/jp/asm/nonmatchings/3A4B0/func_8005F0B0.s rename to ver/jp/asm/nonmatchings/3A4B0/nuGfxDisplayOff.s index 6eb4e02478..222eeaaa2d 100644 --- a/ver/jp/asm/nonmatchings/3A4B0/func_8005F0B0.s +++ b/ver/jp/asm/nonmatchings/3A4B0/nuGfxDisplayOff.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005F0B0 +glabel nuGfxDisplayOff /* 3A4B0 8005F0B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3A4B4 8005F0B4 AFBF0010 */ sw $ra, 0x10($sp) /* 3A4B8 8005F0B8 3C01800A */ lui $at, %hi(D_8009A5D8) diff --git a/ver/jp/asm/nonmatchings/3A4E0/func_8005F0E0.s b/ver/jp/asm/nonmatchings/3A4E0/nuGfxDisplayOn.s similarity index 95% rename from ver/jp/asm/nonmatchings/3A4E0/func_8005F0E0.s rename to ver/jp/asm/nonmatchings/3A4E0/nuGfxDisplayOn.s index 5365ddd1ea..e59ec06e3c 100644 --- a/ver/jp/asm/nonmatchings/3A4E0/func_8005F0E0.s +++ b/ver/jp/asm/nonmatchings/3A4E0/nuGfxDisplayOn.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005F0E0 +glabel nuGfxDisplayOn /* 3A4E0 8005F0E0 24020080 */ addiu $v0, $zero, 0x80 /* 3A4E4 8005F0E4 3C01800A */ lui $at, %hi(D_8009A5D8) /* 3A4E8 8005F0E8 AC22A5D8 */ sw $v0, %lo(D_8009A5D8)($at) diff --git a/ver/jp/asm/nonmatchings/3A610/func_8005F2C0.s b/ver/jp/asm/nonmatchings/3A610/nuContInit.s similarity index 97% rename from ver/jp/asm/nonmatchings/3A610/func_8005F2C0.s rename to ver/jp/asm/nonmatchings/3A610/nuContInit.s index dd636e9400..fc6feab2e5 100644 --- a/ver/jp/asm/nonmatchings/3A610/func_8005F2C0.s +++ b/ver/jp/asm/nonmatchings/3A610/nuContInit.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005F2C0 +glabel nuContInit /* 3A6C0 8005F2C0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3A6C4 8005F2C4 AFBF0014 */ sw $ra, 0x14($sp) /* 3A6C8 8005F2C8 0C01808C */ jal func_80060230 diff --git a/ver/jp/asm/nonmatchings/3A610/func_8005F210.s b/ver/jp/asm/nonmatchings/3A610/nuGfxInitEX2.s similarity index 99% rename from ver/jp/asm/nonmatchings/3A610/func_8005F210.s rename to ver/jp/asm/nonmatchings/3A610/nuGfxInitEX2.s index 5c08765b93..5b8be84cc2 100644 --- a/ver/jp/asm/nonmatchings/3A610/func_8005F210.s +++ b/ver/jp/asm/nonmatchings/3A610/nuGfxInitEX2.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_8005F210 +glabel nuGfxInitEX2 /* 3A610 8005F210 27BDF7E8 */ addiu $sp, $sp, -0x818 /* 3A614 8005F214 AFBF0810 */ sw $ra, 0x810($sp) /* 3A618 8005F218 0C017FA8 */ jal func_8005FEA0 diff --git a/ver/jp/asm/nonmatchings/3BC0/func_800287C0.s b/ver/jp/asm/nonmatchings/3BC0/func_800287C0.s index 84f4132d42..ce251c66f2 100644 --- a/ver/jp/asm/nonmatchings/3BC0/func_800287C0.s +++ b/ver/jp/asm/nonmatchings/3BC0/func_800287C0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_800287C0 -/* 3BC0 800287C0 3C038007 */ lui $v1, %hi(D_8007417C) -/* 3BC4 800287C4 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 3BC0 800287C0 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 3BC4 800287C4 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 3BC8 800287C8 8C620000 */ lw $v0, ($v1) /* 3BCC 800287CC A0400040 */ sb $zero, 0x40($v0) /* 3BD0 800287D0 8C640000 */ lw $a0, ($v1) diff --git a/ver/jp/asm/nonmatchings/3BC0/func_80028844.s b/ver/jp/asm/nonmatchings/3BC0/func_80028844.s index 26f2ce3c5f..b20adf339c 100644 --- a/ver/jp/asm/nonmatchings/3BC0/func_80028844.s +++ b/ver/jp/asm/nonmatchings/3BC0/func_80028844.s @@ -4,8 +4,8 @@ glabel func_80028844 /* 3C44 80028844 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 3C48 80028848 AFB20018 */ sw $s2, 0x18($sp) -/* 3C4C 8002884C 3C128007 */ lui $s2, %hi(D_8007417C) -/* 3C50 80028850 2652417C */ addiu $s2, $s2, %lo(D_8007417C) +/* 3C4C 8002884C 3C128007 */ lui $s2, %hi(gGameStatusPtr) +/* 3C50 80028850 2652417C */ addiu $s2, $s2, %lo(gGameStatusPtr) /* 3C54 80028854 AFBF001C */ sw $ra, 0x1c($sp) /* 3C58 80028858 AFB10014 */ sw $s1, 0x14($sp) /* 3C5C 8002885C AFB00010 */ sw $s0, 0x10($sp) @@ -35,8 +35,8 @@ glabel func_80028844 /* 3CB8 800288B8 24020002 */ addiu $v0, $zero, 2 /* 3CBC 800288BC A0620071 */ sb $v0, 0x71($v1) .L800288C0: -/* 3CC0 800288C0 3C048007 */ lui $a0, %hi(D_8007417C) -/* 3CC4 800288C4 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* 3CC0 800288C0 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 3CC4 800288C4 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* 3CC8 800288C8 8C830000 */ lw $v1, ($a0) /* 3CCC 800288CC 94620068 */ lhu $v0, 0x68($v1) /* 3CD0 800288D0 A6220000 */ sh $v0, ($s1) @@ -91,8 +91,8 @@ glabel func_80028844 /* 3D80 80028980 5C400001 */ bgtzl $v0, .L80028988 /* 3D84 80028984 0000382D */ daddu $a3, $zero, $zero .L80028988: -/* 3D88 80028988 3C038007 */ lui $v1, %hi(D_8007417C) -/* 3D8C 8002898C 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 3D88 80028988 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 3D8C 8002898C 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 3D90 80028990 8C620000 */ lw $v0, ($v1) /* 3D94 80028994 A0450040 */ sb $a1, 0x40($v0) /* 3D98 80028998 8C620000 */ lw $v0, ($v1) @@ -140,8 +140,8 @@ glabel func_80028844 /* 3E2C 80028A2C 1040001D */ beqz $v0, .L80028AA4 /* 3E30 80028A30 0100102D */ daddu $v0, $t0, $zero /* 3E34 80028A34 24080001 */ addiu $t0, $zero, 1 -/* 3E38 80028A38 3C028007 */ lui $v0, %hi(D_8007417C) -/* 3E3C 80028A3C 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 3E38 80028A38 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 3E3C 80028A3C 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 3E40 80028A40 3C030004 */ lui $v1, 4 /* 3E44 80028A44 8C420030 */ lw $v0, 0x30($v0) /* 3E48 80028A48 00431024 */ and $v0, $v0, $v1 @@ -184,8 +184,8 @@ glabel func_80028844 /* 3EC4 80028AC4 1440001C */ bnez $v0, .L80028B38 /* 3EC8 80028AC8 0000402D */ daddu $t0, $zero, $zero /* 3ECC 80028ACC 24080001 */ addiu $t0, $zero, 1 -/* 3ED0 80028AD0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 3ED4 80028AD4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 3ED0 80028AD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 3ED4 80028AD4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 3ED8 80028AD8 3C030001 */ lui $v1, 1 /* 3EDC 80028ADC 8C420030 */ lw $v0, 0x30($v0) /* 3EE0 80028AE0 00431024 */ and $v0, $v0, $v1 @@ -221,8 +221,8 @@ glabel func_80028844 /* 3F44 80028B44 1040002B */ beqz $v0, .L80028BF4 /* 3F48 80028B48 0100102D */ daddu $v0, $t0, $zero /* 3F4C 80028B4C 24080001 */ addiu $t0, $zero, 1 -/* 3F50 80028B50 3C028007 */ lui $v0, %hi(D_8007417C) -/* 3F54 80028B54 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 3F50 80028B50 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 3F54 80028B54 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 3F58 80028B58 3C030002 */ lui $v1, 2 /* 3F5C 80028B5C 8C420030 */ lw $v0, 0x30($v0) /* 3F60 80028B60 00431024 */ and $v0, $v0, $v1 @@ -407,8 +407,8 @@ glabel func_80028844 /* 41EC 80028DEC 3C01800A */ lui $at, %hi(D_8009A686) /* 41F0 80028DF0 A422A686 */ sh $v0, %lo(D_8009A686)($at) .L80028DF4: -/* 41F4 80028DF4 3C058007 */ lui $a1, %hi(D_8007417C) -/* 41F8 80028DF8 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* 41F4 80028DF4 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* 41F8 80028DF8 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* 41FC 80028DFC 8CA20030 */ lw $v0, 0x30($a1) /* 4200 80028E00 ACA40000 */ sw $a0, ($a1) /* 4204 80028E04 0080182D */ daddu $v1, $a0, $zero @@ -444,8 +444,8 @@ glabel func_80028844 .L80028E78: /* 4278 80028E78 A4A30060 */ sh $v1, 0x60($a1) .L80028E7C: -/* 427C 80028E7C 3C038007 */ lui $v1, %hi(D_8007417C) -/* 4280 80028E80 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 427C 80028E7C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 4280 80028E80 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 4284 80028E84 8C620000 */ lw $v0, ($v1) /* 4288 80028E88 AC620030 */ sw $v0, 0x30($v1) .L80028E8C: diff --git a/ver/jp/asm/nonmatchings/40DD0/func_800659D0.s b/ver/jp/asm/nonmatchings/40DD0/osGetCount.s similarity index 92% rename from ver/jp/asm/nonmatchings/40DD0/func_800659D0.s rename to ver/jp/asm/nonmatchings/40DD0/osGetCount.s index 95e855c5a6..a00118fb0a 100644 --- a/ver/jp/asm/nonmatchings/40DD0/func_800659D0.s +++ b/ver/jp/asm/nonmatchings/40DD0/osGetCount.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_800659D0 +glabel osGetCount /* 40DD0 800659D0 40024800 */ mfc0 $v0, $9 /* 40DD4 800659D4 03E00008 */ jr $ra /* 40DD8 800659D8 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/41670/func_80066270.s b/ver/jp/asm/nonmatchings/41670/func_80066270.s index 4545c4e2c5..f9dcab469b 100644 --- a/ver/jp/asm/nonmatchings/41670/func_80066270.s +++ b/ver/jp/asm/nonmatchings/41670/func_80066270.s @@ -10,7 +10,7 @@ glabel func_80066270 /* 41684 80066284 AFB10014 */ sw $s1, 0x14($sp) /* 41688 80066288 0C01ACD0 */ jal func_8006B340 /* 4168C 8006628C AFB00010 */ sw $s0, 0x10($sp) -/* 41690 80066290 0C019674 */ jal func_800659D0 +/* 41690 80066290 0C019674 */ jal osGetCount /* 41694 80066294 0040A021 */ addu $s4, $v0, $zero /* 41698 80066298 3C03800A */ lui $v1, %hi(D_8009A5A8) /* 4169C 8006629C 8C63A5A8 */ lw $v1, %lo(D_8009A5A8)($v1) diff --git a/ver/jp/asm/nonmatchings/41720/func_80066320.s b/ver/jp/asm/nonmatchings/41720/func_80066320.s index 73ff6ef0c9..c343b44af9 100644 --- a/ver/jp/asm/nonmatchings/41720/func_80066320.s +++ b/ver/jp/asm/nonmatchings/41720/func_80066320.s @@ -33,7 +33,7 @@ glabel func_80066320 /* 4178C 8006638C 8C640000 */ lw $a0, ($v1) /* 41790 80066390 1083001D */ beq $a0, $v1, .L80066408 /* 41794 80066394 00409021 */ addu $s2, $v0, $zero -/* 41798 80066398 0C019674 */ jal func_800659D0 +/* 41798 80066398 0C019674 */ jal osGetCount /* 4179C 8006639C 00808821 */ addu $s1, $a0, $zero /* 417A0 800663A0 3C03800A */ lui $v1, %hi(D_8009A60C) /* 417A4 800663A4 8C63A60C */ lw $v1, %lo(D_8009A60C)($v1) diff --git a/ver/jp/asm/nonmatchings/41850/func_800664A4.s b/ver/jp/asm/nonmatchings/41850/func_800664A4.s index 3e2c6cf212..766de8ea14 100644 --- a/ver/jp/asm/nonmatchings/41850/func_800664A4.s +++ b/ver/jp/asm/nonmatchings/41850/func_800664A4.s @@ -22,7 +22,7 @@ glabel func_800664A4 /* 418E4 800664E4 08019974 */ j .L800665D0 /* 418E8 800664E8 AC20A60C */ sw $zero, %lo(D_8009A60C)($at) .L800664EC: -/* 418EC 800664EC 0C019674 */ jal func_800659D0 +/* 418EC 800664EC 0C019674 */ jal osGetCount /* 418F0 800664F0 00000000 */ nop /* 418F4 800664F4 3C03800A */ lui $v1, %hi(D_8009A60C) /* 418F8 800664F8 8C63A60C */ lw $v1, %lo(D_8009A60C)($v1) diff --git a/ver/jp/asm/nonmatchings/41850/func_800665E0.s b/ver/jp/asm/nonmatchings/41850/func_800665E0.s index 2d207a7f31..f225473def 100644 --- a/ver/jp/asm/nonmatchings/41850/func_800665E0.s +++ b/ver/jp/asm/nonmatchings/41850/func_800665E0.s @@ -20,7 +20,7 @@ glabel func_800665E0 .L80066618: /* 41A18 80066618 0C01ACD0 */ jal func_8006B340 /* 41A1C 8006661C 00000000 */ nop -/* 41A20 80066620 0C019674 */ jal func_800659D0 +/* 41A20 80066620 0C019674 */ jal osGetCount /* 41A24 80066624 00408021 */ addu $s0, $v0, $zero /* 41A28 80066628 3C01800A */ lui $at, %hi(D_8009A60C) /* 41A2C 8006662C AC22A60C */ sw $v0, %lo(D_8009A60C)($at) diff --git a/ver/jp/asm/nonmatchings/41E40/func_80066BE0.s b/ver/jp/asm/nonmatchings/41E40/func_80066BE0.s index 0f8e81c1cf..7ca249fec7 100644 --- a/ver/jp/asm/nonmatchings/41E40/func_80066BE0.s +++ b/ver/jp/asm/nonmatchings/41E40/func_80066BE0.s @@ -67,7 +67,7 @@ glabel func_80066BE0 /* 420C4 80066CC4 3C01800A */ lui $at, %hi(D_8009A5C4) /* 420C8 80066CC8 1220000A */ beqz $s1, .L80066CF4 /* 420CC 80066CCC AC22A5C4 */ sw $v0, %lo(D_8009A5C4)($at) -/* 420D0 80066CD0 0C019674 */ jal func_800659D0 +/* 420D0 80066CD0 0C019674 */ jal osGetCount /* 420D4 80066CD4 00008821 */ addu $s1, $zero, $zero /* 420D8 80066CD8 00408021 */ addu $s0, $v0, $zero /* 420DC 80066CDC 02001821 */ addu $v1, $s0, $zero @@ -78,7 +78,7 @@ glabel func_80066BE0 /* 420F0 80066CF0 AC23A5EC */ sw $v1, %lo(D_8009A5EC)($at) .L80066CF4: /* 420F4 80066CF4 3C10800A */ lui $s0, %hi(D_8009A5A8) -/* 420F8 80066CF8 0C019674 */ jal func_800659D0 +/* 420F8 80066CF8 0C019674 */ jal osGetCount /* 420FC 80066CFC 8E10A5A8 */ lw $s0, %lo(D_8009A5A8)($s0) /* 42100 80066D00 3C01800A */ lui $at, %hi(D_8009A5A8) /* 42104 80066D04 AC22A5A8 */ sw $v0, %lo(D_8009A5A8)($at) diff --git a/ver/jp/asm/nonmatchings/421E0/func_80066DE0.s b/ver/jp/asm/nonmatchings/421E0/osViSetMode.s similarity index 98% rename from ver/jp/asm/nonmatchings/421E0/func_80066DE0.s rename to ver/jp/asm/nonmatchings/421E0/osViSetMode.s index 9a5c656628..c0170109f2 100644 --- a/ver/jp/asm/nonmatchings/421E0/func_80066DE0.s +++ b/ver/jp/asm/nonmatchings/421E0/osViSetMode.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80066DE0 +glabel osViSetMode /* 421E0 80066DE0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 421E4 80066DE4 AFB00010 */ sw $s0, 0x10($sp) /* 421E8 80066DE8 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/42230/func_80066E30.s b/ver/jp/asm/nonmatchings/42230/osViSetSpecialFeatures.s similarity index 99% rename from ver/jp/asm/nonmatchings/42230/func_80066E30.s rename to ver/jp/asm/nonmatchings/42230/osViSetSpecialFeatures.s index adee90a5bf..7e00b5d9e8 100644 --- a/ver/jp/asm/nonmatchings/42230/func_80066E30.s +++ b/ver/jp/asm/nonmatchings/42230/osViSetSpecialFeatures.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80066E30 +glabel osViSetSpecialFeatures /* 42230 80066E30 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 42234 80066E34 AFB00010 */ sw $s0, 0x10($sp) /* 42238 80066E38 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/42B0/func_80028ED8.s b/ver/jp/asm/nonmatchings/42B0/func_80028ED8.s index b80b463819..d5760f086c 100644 --- a/ver/jp/asm/nonmatchings/42B0/func_80028ED8.s +++ b/ver/jp/asm/nonmatchings/42B0/func_80028ED8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80028ED8 -/* 42D8 80028ED8 3C028007 */ lui $v0, %hi(D_8007417C) -/* 42DC 80028EDC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 42D8 80028ED8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 42DC 80028EDC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 42E0 80028EE0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42E4 80028EE4 AFB00010 */ sw $s0, 0x10($sp) /* 42E8 80028EE8 0080802D */ daddu $s0, $a0, $zero diff --git a/ver/jp/asm/nonmatchings/42B0/func_80028F4C.s b/ver/jp/asm/nonmatchings/42B0/func_80028F4C.s index 7bd0ba0a8d..bf7eb0e272 100644 --- a/ver/jp/asm/nonmatchings/42B0/func_80028F4C.s +++ b/ver/jp/asm/nonmatchings/42B0/func_80028F4C.s @@ -3,8 +3,8 @@ glabel func_80028F4C /* 434C 80028F4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 4350 80028F50 3C028007 */ lui $v0, %hi(D_8007417C) -/* 4354 80028F54 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 4350 80028F50 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 4354 80028F54 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 4358 80028F58 3C048007 */ lui $a0, %hi(D_80074244) /* 435C 80028F5C 24844244 */ addiu $a0, $a0, %lo(D_80074244) /* 4360 80028F60 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/ver/jp/asm/nonmatchings/42B0/func_800298C0.s b/ver/jp/asm/nonmatchings/42B0/func_800298C0.s index ebf21b4dcd..c998401f0f 100644 --- a/ver/jp/asm/nonmatchings/42B0/func_800298C0.s +++ b/ver/jp/asm/nonmatchings/42B0/func_800298C0.s @@ -3,13 +3,13 @@ glabel func_800298C0 /* 4CC0 800298C0 3C035D58 */ lui $v1, 0x5d58 -/* 4CC4 800298C4 3C048007 */ lui $a0, %hi(D_800743F0) -/* 4CC8 800298C8 248443F0 */ addiu $a0, $a0, %lo(D_800743F0) +/* 4CC4 800298C4 3C048007 */ lui $a0, %hi(gRandSeed) +/* 4CC8 800298C8 248443F0 */ addiu $a0, $a0, %lo(gRandSeed) /* 4CCC 800298CC 8C820000 */ lw $v0, ($a0) /* 4CD0 800298D0 34638B65 */ ori $v1, $v1, 0x8b65 /* 4CD4 800298D4 00430018 */ mult $v0, $v1 -/* 4CD8 800298D8 3C038007 */ lui $v1, %hi(D_8007417C) -/* 4CDC 800298DC 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 4CD8 800298D8 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 4CDC 800298DC 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 4CE0 800298E0 00002812 */ mflo $a1 /* 4CE4 800298E4 24A20001 */ addiu $v0, $a1, 1 /* 4CE8 800298E8 AC820000 */ sw $v0, ($a0) diff --git a/ver/jp/asm/nonmatchings/42B0/func_80029DE0.s b/ver/jp/asm/nonmatchings/42B0/func_80029DE0.s index 76e10d5883..29eb3f6e42 100644 --- a/ver/jp/asm/nonmatchings/42B0/func_80029DE0.s +++ b/ver/jp/asm/nonmatchings/42B0/func_80029DE0.s @@ -3,8 +3,8 @@ glabel func_80029DE0 /* 51E0 80029DE0 44806000 */ mtc1 $zero, $f12 -/* 51E4 80029DE4 3C028007 */ lui $v0, %hi(D_8007417C) -/* 51E8 80029DE8 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 51E4 80029DE4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 51E8 80029DE8 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 51EC 80029DEC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 51F0 80029DF0 AFBF0010 */ sw $ra, 0x10($sp) /* 51F4 80029DF4 8C460128 */ lw $a2, 0x128($v0) diff --git a/ver/jp/asm/nonmatchings/42B0/func_80029E10.s b/ver/jp/asm/nonmatchings/42B0/func_80029E10.s index cc5606c784..a4c7f86fc3 100644 --- a/ver/jp/asm/nonmatchings/42B0/func_80029E10.s +++ b/ver/jp/asm/nonmatchings/42B0/func_80029E10.s @@ -4,8 +4,8 @@ glabel func_80029E10 /* 5210 80029E10 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 5214 80029E14 AFB00010 */ sw $s0, 0x10($sp) -/* 5218 80029E18 3C108007 */ lui $s0, %hi(D_8007417C) -/* 521C 80029E1C 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 5218 80029E18 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 521C 80029E1C 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 5220 80029E20 AFBF0014 */ sw $ra, 0x14($sp) /* 5224 80029E24 8E020000 */ lw $v0, ($s0) /* 5228 80029E28 C4420128 */ lwc1 $f2, 0x128($v0) diff --git a/ver/jp/asm/nonmatchings/44B20/func_80069798.s b/ver/jp/asm/nonmatchings/44B20/func_80069798.s index 5b697da7e8..3183a83bc8 100644 --- a/ver/jp/asm/nonmatchings/44B20/func_80069798.s +++ b/ver/jp/asm/nonmatchings/44B20/func_80069798.s @@ -15,7 +15,7 @@ glabel func_80069798 /* 44BC0 800697C0 AFB40070 */ sw $s4, 0x70($sp) /* 44BC4 800697C4 AFB20068 */ sw $s2, 0x68($sp) /* 44BC8 800697C8 AFB00060 */ sw $s0, 0x60($sp) -/* 44BCC 800697CC 0C019674 */ jal func_800659D0 +/* 44BCC 800697CC 0C019674 */ jal osGetCount /* 44BD0 800697D0 AE620000 */ sw $v0, ($s3) /* 44BD4 800697D4 AE620004 */ sw $v0, 4($s3) /* 44BD8 800697D8 8EA20008 */ lw $v0, 8($s5) diff --git a/ver/jp/asm/nonmatchings/45A30/func_8006A6E8.s b/ver/jp/asm/nonmatchings/45A30/func_8006A6E8.s index ea3e7cd427..dde004f0af 100644 --- a/ver/jp/asm/nonmatchings/45A30/func_8006A6E8.s +++ b/ver/jp/asm/nonmatchings/45A30/func_8006A6E8.s @@ -153,8 +153,8 @@ glabel func_8006A6E8 /* 45D30 8006A930 0C019250 */ jal func_80064940 /* 45D34 8006A934 24050040 */ addiu $a1, $zero, 0x40 .L8006A938: -/* 45D38 8006A938 3C038000 */ lui $v1, %hi(D_80000300) -/* 45D3C 8006A93C 8C630300 */ lw $v1, %lo(D_80000300)($v1) +/* 45D38 8006A938 3C038000 */ lui $v1, %hi(osTvType) +/* 45D3C 8006A93C 8C630300 */ lw $v1, %lo(osTvType)($v1) /* 45D40 8006A940 54600004 */ bnel $v1, $zero, .L8006A954 /* 45D44 8006A944 24020002 */ addiu $v0, $zero, 2 /* 45D48 8006A948 3C0202F5 */ lui $v0, 0x2f5 diff --git a/ver/jp/asm/nonmatchings/47E70/func_8006CA70.s b/ver/jp/asm/nonmatchings/47E70/func_8006CA70.s index 6199b54e0b..ff4bd44ce8 100644 --- a/ver/jp/asm/nonmatchings/47E70/func_8006CA70.s +++ b/ver/jp/asm/nonmatchings/47E70/func_8006CA70.s @@ -10,8 +10,8 @@ glabel func_8006CA70 /* 47E84 8006CA84 AFBF0014 */ sw $ra, 0x14($sp) /* 47E88 8006CA88 0C019250 */ jal func_80064940 /* 47E8C 8006CA8C 24050060 */ addiu $a1, $zero, 0x60 -/* 47E90 8006CA90 3C038000 */ lui $v1, %hi(D_80000300) -/* 47E94 8006CA94 8C630300 */ lw $v1, %lo(D_80000300)($v1) +/* 47E90 8006CA90 3C038000 */ lui $v1, %hi(osTvType) +/* 47E94 8006CA94 8C630300 */ lw $v1, %lo(osTvType)($v1) /* 47E98 8006CA98 3C018009 */ lui $at, %hi(D_80095960) /* 47E9C 8006CA9C AC305960 */ sw $s0, %lo(D_80095960)($at) /* 47EA0 8006CAA0 26100030 */ addiu $s0, $s0, 0x30 @@ -39,8 +39,8 @@ glabel func_8006CA70 /* 47EF4 8006CAF4 0801B2C1 */ j .L8006CB04 /* 47EF8 8006CAF8 244259C0 */ addiu $v0, $v0, %lo(D_800959C0) .L8006CAFC: -/* 47EFC 8006CAFC 3C028009 */ lui $v0, %hi(D_80095800) -/* 47F00 8006CB00 24425800 */ addiu $v0, $v0, %lo(D_80095800) +/* 47EFC 8006CAFC 3C028009 */ lui $v0, %hi(_osViModeNtscLan1) +/* 47F00 8006CB00 24425800 */ addiu $v0, $v0, %lo(_osViModeNtscLan1) .L8006CB04: /* 47F04 8006CB04 3C018009 */ lui $at, %hi(D_80095938) /* 47F08 8006CB08 AC225938 */ sw $v0, %lo(D_80095938)($at) diff --git a/ver/jp/asm/nonmatchings/4AC70/func_80072B10.s b/ver/jp/asm/nonmatchings/4AC70/func_80072B10.s index 628909a239..39bab28b7e 100644 --- a/ver/jp/asm/nonmatchings/4AC70/func_80072B10.s +++ b/ver/jp/asm/nonmatchings/4AC70/func_80072B10.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80072B10 -/* 4DF10 80072B10 3C028007 */ lui $v0, %hi(D_8007417C) -/* 4DF14 80072B14 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 4DF10 80072B10 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 4DF14 80072B14 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 4DF18 80072B18 A04000AA */ sb $zero, 0xaa($v0) /* 4DF1C 80072B1C 24020001 */ addiu $v0, $zero, 1 /* 4DF20 80072B20 3C01800E */ lui $at, %hi(D_800DC048) diff --git a/ver/jp/asm/nonmatchings/4AC70/func_80072DF4.s b/ver/jp/asm/nonmatchings/4AC70/func_80072DF4.s index b698d7ce6a..5dd2f490e1 100644 --- a/ver/jp/asm/nonmatchings/4AC70/func_80072DF4.s +++ b/ver/jp/asm/nonmatchings/4AC70/func_80072DF4.s @@ -3,8 +3,8 @@ glabel func_80072DF4 /* 4E1F4 80072DF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 4E1F8 80072DF8 3C038007 */ lui $v1, %hi(D_8007417C) -/* 4E1FC 80072DFC 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 4E1F8 80072DF8 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 4E1FC 80072DFC 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 4E200 80072E00 AFBF0018 */ sw $ra, 0x18($sp) /* 4E204 80072E04 AFB10014 */ sw $s1, 0x14($sp) /* 4E208 80072E08 AFB00010 */ sw $s0, 0x10($sp) @@ -89,8 +89,8 @@ glabel func_80072DF4 /* 4E344 80072F44 0C01CB43 */ jal func_80072D0C /* 4E348 80072F48 24112702 */ addiu $s1, $zero, 0x2702 /* 4E34C 80072F4C 0000202D */ daddu $a0, $zero, $zero -/* 4E350 80072F50 3C038007 */ lui $v1, %hi(D_8007417C) -/* 4E354 80072F54 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 4E350 80072F50 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 4E354 80072F54 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 4E358 80072F58 24020004 */ addiu $v0, $zero, 4 /* 4E35C 80072F5C A2020012 */ sb $v0, 0x12($s0) /* 4E360 80072F60 906200AA */ lbu $v0, 0xaa($v1) @@ -106,8 +106,8 @@ glabel func_80072DF4 /* 4E388 80072F88 0C01CB43 */ jal func_80072D0C /* 4E38C 80072F8C 24112704 */ addiu $s1, $zero, 0x2704 /* 4E390 80072F90 0000202D */ daddu $a0, $zero, $zero -/* 4E394 80072F94 3C038007 */ lui $v1, %hi(D_8007417C) -/* 4E398 80072F98 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 4E394 80072F94 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 4E398 80072F98 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 4E39C 80072F9C 24020002 */ addiu $v0, $zero, 2 /* 4E3A0 80072FA0 A2020012 */ sb $v0, 0x12($s0) /* 4E3A4 80072FA4 906200AA */ lbu $v0, 0xaa($v1) @@ -119,8 +119,8 @@ glabel func_80072DF4 /* 4E3B8 80072FB8 24112700 */ addiu $s1, $zero, 0x2700 /* 4E3BC 80072FBC 24040002 */ addiu $a0, $zero, 2 .L80072FC0: -/* 4E3C0 80072FC0 3C038007 */ lui $v1, %hi(D_8007417C) -/* 4E3C4 80072FC4 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 4E3C0 80072FC0 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 4E3C4 80072FC4 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 4E3C8 80072FC8 8C620000 */ lw $v0, ($v1) /* 4E3CC 80072FCC A0400074 */ sb $zero, 0x74($v0) /* 4E3D0 80072FD0 8C630000 */ lw $v1, ($v1) @@ -136,8 +136,8 @@ glabel func_80072DF4 /* 4E3F8 80072FF8 00000000 */ nop /* 4E3FC 80072FFC 3C03800B */ lui $v1, %hi(D_800B0EF0) /* 4E400 80073000 24630EF0 */ addiu $v1, $v1, %lo(D_800B0EF0) -/* 4E404 80073004 3C048007 */ lui $a0, %hi(D_8007417C) -/* 4E408 80073008 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* 4E404 80073004 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 4E408 80073008 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* 4E40C 8007300C A0600004 */ sb $zero, 4($v1) /* 4E410 80073010 8C850000 */ lw $a1, ($a0) /* 4E414 80073014 24020001 */ addiu $v0, $zero, 1 @@ -160,8 +160,8 @@ glabel func_80072DF4 /* 4E458 80073058 24020001 */ addiu $v0, $zero, 1 /* 4E45C 8007305C A0620004 */ sb $v0, 4($v1) /* 4E460 80073060 92040001 */ lbu $a0, 1($s0) -/* 4E464 80073064 3C058007 */ lui $a1, %hi(D_8007417C) -/* 4E468 80073068 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* 4E464 80073064 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* 4E468 80073068 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* 4E46C 8007306C 0801CC25 */ j .L80073094 /* 4E470 80073070 24020004 */ addiu $v0, $zero, 4 /* 4E474 80073074 3C03800B */ lui $v1, %hi(D_800B0EF0) @@ -169,8 +169,8 @@ glabel func_80072DF4 /* 4E47C 8007307C 24020001 */ addiu $v0, $zero, 1 /* 4E480 80073080 A0620004 */ sb $v0, 4($v1) /* 4E484 80073084 92040000 */ lbu $a0, ($s0) -/* 4E488 80073088 3C058007 */ lui $a1, %hi(D_8007417C) -/* 4E48C 8007308C 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* 4E488 80073088 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* 4E48C 8007308C 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* 4E490 80073090 24020002 */ addiu $v0, $zero, 2 .L80073094: /* 4E494 80073094 A0620005 */ sb $v0, 5($v1) @@ -183,8 +183,8 @@ glabel func_80072DF4 /* 4E4B0 800730B0 24630EF0 */ addiu $v1, $v1, %lo(D_800B0EF0) /* 4E4B4 800730B4 24020001 */ addiu $v0, $zero, 1 /* 4E4B8 800730B8 A0620004 */ sb $v0, 4($v1) -/* 4E4BC 800730BC 3C048007 */ lui $a0, %hi(D_8007417C) -/* 4E4C0 800730C0 8C84417C */ lw $a0, %lo(D_8007417C)($a0) +/* 4E4BC 800730BC 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 4E4C0 800730C0 8C84417C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 4E4C4 800730C4 24020006 */ addiu $v0, $zero, 6 /* 4E4C8 800730C8 A0620005 */ sb $v0, 5($v1) /* 4E4CC 800730CC 908200AA */ lbu $v0, 0xaa($a0) @@ -194,8 +194,8 @@ glabel func_80072DF4 /* 4E4DC 800730DC 24630EF0 */ addiu $v1, $v1, %lo(D_800B0EF0) /* 4E4E0 800730E0 24020002 */ addiu $v0, $zero, 2 /* 4E4E4 800730E4 A0620004 */ sb $v0, 4($v1) -/* 4E4E8 800730E8 3C048007 */ lui $a0, %hi(D_8007417C) -/* 4E4EC 800730EC 8C84417C */ lw $a0, %lo(D_8007417C)($a0) +/* 4E4E8 800730E8 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 4E4EC 800730EC 8C84417C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 4E4F0 800730F0 24020001 */ addiu $v0, $zero, 1 /* 4E4F4 800730F4 A0620005 */ sb $v0, 5($v1) /* 4E4F8 800730F8 A0600006 */ sb $zero, 6($v1) @@ -215,8 +215,8 @@ glabel func_80072DF4 /* 4E528 80073128 A0400007 */ sb $zero, 7($v0) /* 4E52C 8007312C 0C01CB2B */ jal func_80072CAC /* 4E530 80073130 A0400010 */ sb $zero, 0x10($v0) -/* 4E534 80073134 3C038007 */ lui $v1, %hi(D_8007417C) -/* 4E538 80073138 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 4E534 80073134 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 4E538 80073138 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 4E53C 8007313C 0220202D */ daddu $a0, $s1, $zero /* 4E540 80073140 906200AA */ lbu $v0, 0xaa($v1) /* 4E544 80073144 3C05800A */ lui $a1, %hi(D_8009A630) diff --git a/ver/jp/asm/nonmatchings/5FC0/func_8002ACA4.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ACA4.s index 95e4384816..9a6ee01781 100644 --- a/ver/jp/asm/nonmatchings/5FC0/func_8002ACA4.s +++ b/ver/jp/asm/nonmatchings/5FC0/func_8002ACA4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8002ACA4 -/* 60A4 8002ACA4 3C028007 */ lui $v0, %hi(D_8007417C) -/* 60A8 8002ACA8 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 60A4 8002ACA4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 60A8 8002ACA8 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 60AC 8002ACAC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 60B0 8002ACB0 AFBF0010 */ sw $ra, 0x10($sp) /* 60B4 8002ACB4 80420070 */ lb $v0, 0x70($v0) diff --git a/ver/jp/asm/nonmatchings/5FC0/func_8002ACEC.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ACEC.s index 5ab580e28d..b45f0642ec 100644 --- a/ver/jp/asm/nonmatchings/5FC0/func_8002ACEC.s +++ b/ver/jp/asm/nonmatchings/5FC0/func_8002ACEC.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8002ACEC -/* 60EC 8002ACEC 3C028007 */ lui $v0, %hi(D_8007417C) -/* 60F0 8002ACF0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 60EC 8002ACEC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 60F0 8002ACF0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 60F4 8002ACF4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 60F8 8002ACF8 AFBF0010 */ sw $ra, 0x10($sp) /* 60FC 8002ACFC 80420070 */ lb $v0, 0x70($v0) diff --git a/ver/jp/asm/nonmatchings/5FC0/func_8002AD70.s b/ver/jp/asm/nonmatchings/5FC0/func_8002AD70.s index d9edb06e61..6aba4eebb9 100644 --- a/ver/jp/asm/nonmatchings/5FC0/func_8002AD70.s +++ b/ver/jp/asm/nonmatchings/5FC0/func_8002AD70.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8002AD70 -/* 6170 8002AD70 3C028007 */ lui $v0, %hi(D_8007417C) -/* 6174 8002AD74 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 6170 8002AD70 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 6174 8002AD74 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 6178 8002AD78 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 617C 8002AD7C AFBF0010 */ sw $ra, 0x10($sp) /* 6180 8002AD80 80420070 */ lb $v0, 0x70($v0) diff --git a/ver/jp/asm/nonmatchings/5FC0/func_8002ADB4.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ADB4.s index e12149b229..4528265c50 100644 --- a/ver/jp/asm/nonmatchings/5FC0/func_8002ADB4.s +++ b/ver/jp/asm/nonmatchings/5FC0/func_8002ADB4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8002ADB4 -/* 61B4 8002ADB4 3C028007 */ lui $v0, %hi(D_8007417C) -/* 61B8 8002ADB8 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 61B4 8002ADB4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 61B8 8002ADB8 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 61BC 8002ADBC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 61C0 8002ADC0 AFBF0010 */ sw $ra, 0x10($sp) /* 61C4 8002ADC4 80420070 */ lb $v0, 0x70($v0) diff --git a/ver/jp/asm/nonmatchings/6200/func_8002B290.s b/ver/jp/asm/nonmatchings/6200/func_8002B290.s index 46e10583b2..28dbf962d8 100644 --- a/ver/jp/asm/nonmatchings/6200/func_8002B290.s +++ b/ver/jp/asm/nonmatchings/6200/func_8002B290.s @@ -4,8 +4,8 @@ glabel func_8002B290 /* 6690 8002B290 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 6694 8002B294 AFB20018 */ sw $s2, 0x18($sp) -/* 6698 8002B298 3C128007 */ lui $s2, %hi(D_8007417C) -/* 669C 8002B29C 2652417C */ addiu $s2, $s2, %lo(D_8007417C) +/* 6698 8002B298 3C128007 */ lui $s2, %hi(gGameStatusPtr) +/* 669C 8002B29C 2652417C */ addiu $s2, $s2, %lo(gGameStatusPtr) /* 66A0 8002B2A0 AFBF001C */ sw $ra, 0x1c($sp) /* 66A4 8002B2A4 AFB10014 */ sw $s1, 0x14($sp) /* 66A8 8002B2A8 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/jp/asm/nonmatchings/6200/func_8002B334.s b/ver/jp/asm/nonmatchings/6200/func_8002B334.s index 2b35f2e91b..db12749546 100644 --- a/ver/jp/asm/nonmatchings/6200/func_8002B334.s +++ b/ver/jp/asm/nonmatchings/6200/func_8002B334.s @@ -9,8 +9,8 @@ glabel func_8002B334 /* 6744 8002B344 AFB10014 */ sw $s1, 0x14($sp) /* 6748 8002B348 0C00AC45 */ jal func_8002B114 /* 674C 8002B34C AFB00010 */ sw $s0, 0x10($sp) -/* 6750 8002B350 3C118007 */ lui $s1, %hi(D_8007417C) -/* 6754 8002B354 2631417C */ addiu $s1, $s1, %lo(D_8007417C) +/* 6750 8002B350 3C118007 */ lui $s1, %hi(gGameStatusPtr) +/* 6754 8002B354 2631417C */ addiu $s1, $s1, %lo(gGameStatusPtr) /* 6758 8002B358 8E220000 */ lw $v0, ($s1) /* 675C 8002B35C 0C00AD7C */ jal func_8002B5F0 /* 6760 8002B360 A0520166 */ sb $s2, 0x166($v0) diff --git a/ver/jp/asm/nonmatchings/6200/func_8002B450.s b/ver/jp/asm/nonmatchings/6200/func_8002B450.s index 968701a038..a3283e0cf0 100644 --- a/ver/jp/asm/nonmatchings/6200/func_8002B450.s +++ b/ver/jp/asm/nonmatchings/6200/func_8002B450.s @@ -24,8 +24,8 @@ glabel func_8002B450 /* 6898 8002B498 8C4A0004 */ lw $t2, 4($v0) /* 689C 8002B49C AC690000 */ sw $t1, ($v1) /* 68A0 8002B4A0 AC6A0004 */ sw $t2, 4($v1) -/* 68A4 8002B4A4 3C038007 */ lui $v1, %hi(D_8007417C) -/* 68A8 8002B4A8 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 68A4 8002B4A4 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 68A8 8002B4A8 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 68AC 8002B4AC 94E20468 */ lhu $v0, 0x468($a3) /* 68B0 8002B4B0 A4620086 */ sh $v0, 0x86($v1) /* 68B4 8002B4B4 94E2046A */ lhu $v0, 0x46a($a3) @@ -57,8 +57,8 @@ glabel func_8002B450 /* 6914 8002B514 28C2000C */ slti $v0, $a2, 0xc /* 6918 8002B518 1440FFF4 */ bnez $v0, .L8002B4EC /* 691C 8002B51C 0000282D */ daddu $a1, $zero, $zero -/* 6920 8002B520 3C038007 */ lui $v1, %hi(D_8007417C) -/* 6924 8002B524 2463417C */ addiu $v1, $v1, %lo(D_8007417C) +/* 6920 8002B520 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 6924 8002B524 2463417C */ addiu $v1, $v1, %lo(gGameStatusPtr) /* 6928 8002B528 8C620000 */ lw $v0, ($v1) /* 692C 8002B52C A0400074 */ sb $zero, 0x74($v0) /* 6930 8002B530 8C620000 */ lw $v0, ($v1) diff --git a/ver/jp/asm/nonmatchings/6200/func_8002B5C8.s b/ver/jp/asm/nonmatchings/6200/func_8002B5C8.s index 1892ee19e6..2b1c64821e 100644 --- a/ver/jp/asm/nonmatchings/6200/func_8002B5C8.s +++ b/ver/jp/asm/nonmatchings/6200/func_8002B5C8.s @@ -3,8 +3,8 @@ glabel func_8002B5C8 /* 69C8 8002B5C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 69CC 8002B5CC 3C038007 */ lui $v1, %hi(D_8007417C) -/* 69D0 8002B5D0 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 69CC 8002B5CC 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 69D0 8002B5D0 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 69D4 8002B5D4 2402000A */ addiu $v0, $zero, 0xa /* 69D8 8002B5D8 AFBF0010 */ sw $ra, 0x10($sp) /* 69DC 8002B5DC 0C00AD7C */ jal func_8002B5F0 diff --git a/ver/jp/asm/nonmatchings/6200/func_8002B5F0.s b/ver/jp/asm/nonmatchings/6200/func_8002B5F0.s index a3aefbfd37..e93660a0e8 100644 --- a/ver/jp/asm/nonmatchings/6200/func_8002B5F0.s +++ b/ver/jp/asm/nonmatchings/6200/func_8002B5F0.s @@ -25,8 +25,8 @@ glabel func_8002B5F0 /* 6A3C 8002B63C 24420010 */ addiu $v0, $v0, 0x10 /* 6A40 8002B640 1443FFF6 */ bne $v0, $v1, .L8002B61C /* 6A44 8002B644 24840010 */ addiu $a0, $a0, 0x10 -/* 6A48 8002B648 3C038007 */ lui $v1, %hi(D_8007417C) -/* 6A4C 8002B64C 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 6A48 8002B648 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 6A4C 8002B64C 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 6A50 8002B650 8C480000 */ lw $t0, ($v0) /* 6A54 8002B654 8C490004 */ lw $t1, 4($v0) /* 6A58 8002B658 AC880000 */ sw $t0, ($a0) @@ -62,8 +62,8 @@ glabel func_8002B5F0 /* 6AC8 8002B6C8 28C2000C */ slti $v0, $a2, 0xc /* 6ACC 8002B6CC 1440FFF4 */ bnez $v0, .L8002B6A0 /* 6AD0 8002B6D0 0000282D */ daddu $a1, $zero, $zero -/* 6AD4 8002B6D4 3C108007 */ lui $s0, %hi(D_8007417C) -/* 6AD8 8002B6D8 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 6AD4 8002B6D4 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 6AD8 8002B6D8 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 6ADC 8002B6DC 8E020000 */ lw $v0, ($s0) /* 6AE0 8002B6E0 8E030000 */ lw $v1, ($s0) /* 6AE4 8002B6E4 90420074 */ lbu $v0, 0x74($v0) diff --git a/ver/jp/asm/nonmatchings/6E00/func_8002BA40.s b/ver/jp/asm/nonmatchings/6E00/func_8002BA40.s index c0fef11850..557b427694 100644 --- a/ver/jp/asm/nonmatchings/6E00/func_8002BA40.s +++ b/ver/jp/asm/nonmatchings/6E00/func_8002BA40.s @@ -202,8 +202,8 @@ glabel func_8002BA40 /* 7144 8002BD44 0040F809 */ jalr $v0 /* 7148 8002BD48 00000000 */ nop .L8002BD4C: -/* 714C 8002BD4C 3C108007 */ lui $s0, %hi(D_8007417C) -/* 7150 8002BD50 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 714C 8002BD4C 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 7150 8002BD50 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 7154 8002BD54 8E020000 */ lw $v0, ($s0) /* 7158 8002BD58 90420073 */ lbu $v0, 0x73($v0) /* 715C 8002BD5C 30420001 */ andi $v0, $v0, 1 @@ -228,8 +228,8 @@ glabel func_8002BA40 /* 71A8 8002BDA8 10400032 */ beqz $v0, .L8002BE74 /* 71AC 8002BDAC 00000000 */ nop .L8002BDB0: -/* 71B0 8002BDB0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 71B4 8002BDB4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 71B0 8002BDB0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 71B4 8002BDB4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 71B8 8002BDB8 94430134 */ lhu $v1, 0x134($v0) /* 71BC 8002BDBC 3C02AAAA */ lui $v0, 0xaaaa /* 71C0 8002BDC0 3442AAAB */ ori $v0, $v0, 0xaaab diff --git a/ver/jp/asm/nonmatchings/80A0/func_8002CCA0.s b/ver/jp/asm/nonmatchings/80A0/func_8002CCA0.s index 6bea881fbd..70652705e0 100644 --- a/ver/jp/asm/nonmatchings/80A0/func_8002CCA0.s +++ b/ver/jp/asm/nonmatchings/80A0/func_8002CCA0.s @@ -88,7 +88,7 @@ glabel func_8002CCA0 /* 81D8 8002CDD8 AFB1001C */ sw $s1, 0x1c($sp) /* 81DC 8002CDDC AFB00018 */ sw $s0, 0x18($sp) /* 81E0 8002CDE0 AC400000 */ sw $zero, ($v0) -/* 81E4 8002CDE4 0C017C2C */ jal func_8005F0B0 +/* 81E4 8002CDE4 0C017C2C */ jal nuGfxDisplayOff /* 81E8 8002CDE8 0000902D */ daddu $s2, $zero, $zero /* 81EC 8002CDEC 3C10800A */ lui $s0, %hi(D_8009C4F8) /* 81F0 8002CDF0 2610C4F8 */ addiu $s0, $s0, %lo(D_8009C4F8) diff --git a/ver/jp/asm/nonmatchings/8490/func_8002D3CC.s b/ver/jp/asm/nonmatchings/8490/func_8002D3CC.s index 0e9fe9707c..3d608e8720 100644 --- a/ver/jp/asm/nonmatchings/8490/func_8002D3CC.s +++ b/ver/jp/asm/nonmatchings/8490/func_8002D3CC.s @@ -364,8 +364,8 @@ glabel func_8002D3CC /* 8D30 8002D930 A5280000 */ sh $t0, ($t1) /* 8D34 8002D934 0C019F18 */ jal func_80067C60 /* 8D38 8002D938 E7B40010 */ swc1 $f20, 0x10($sp) -/* 8D3C 8002D93C 3C048007 */ lui $a0, %hi(D_8007417C) -/* 8D40 8002D940 8C84417C */ lw $a0, %lo(D_8007417C)($a0) +/* 8D3C 8002D93C 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 8D40 8002D940 8C84417C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 8D44 8002D944 90820082 */ lbu $v0, 0x82($a0) /* 8D48 8002D948 96C300A8 */ lhu $v1, 0xa8($s6) /* 8D4C 8002D94C 00021600 */ sll $v0, $v0, 0x18 diff --git a/ver/jp/asm/nonmatchings/8490/func_8002DFA4.s b/ver/jp/asm/nonmatchings/8490/func_8002DFA4.s index a433bc9fe4..836791907e 100644 --- a/ver/jp/asm/nonmatchings/8490/func_8002DFA4.s +++ b/ver/jp/asm/nonmatchings/8490/func_8002DFA4.s @@ -61,8 +61,8 @@ glabel func_8002DFA4 /* 9484 8002E084 46800020 */ cvt.s.w $f0, $f0 /* 9488 8002E088 46000000 */ add.s $f0, $f0, $f0 /* 948C 8002E08C 8462000C */ lh $v0, 0xc($v1) -/* 9490 8002E090 3C068007 */ lui $a2, %hi(D_8007417C) -/* 9494 8002E094 8CC6417C */ lw $a2, %lo(D_8007417C)($a2) +/* 9490 8002E090 3C068007 */ lui $a2, %hi(gGameStatusPtr) +/* 9494 8002E094 8CC6417C */ lw $a2, %lo(gGameStatusPtr)($a2) /* 9498 8002E098 44821000 */ mtc1 $v0, $f2 /* 949C 8002E09C 00000000 */ nop /* 94A0 8002E0A0 468010A0 */ cvt.s.w $f2, $f2 diff --git a/ver/jp/asm/nonmatchings/E5D0/func_800331D0.s b/ver/jp/asm/nonmatchings/E5D0/func_800331D0.s index 1d160f2496..11bff053b7 100644 --- a/ver/jp/asm/nonmatchings/E5D0/func_800331D0.s +++ b/ver/jp/asm/nonmatchings/E5D0/func_800331D0.s @@ -7,8 +7,8 @@ glabel func_800331D0 /* E5D8 800331D8 8C620000 */ lw $v0, ($v1) /* E5DC 800331DC 34420008 */ ori $v0, $v0, 8 /* E5E0 800331E0 AC620000 */ sw $v0, ($v1) -/* E5E4 800331E4 3C038007 */ lui $v1, %hi(D_8007417C) -/* E5E8 800331E8 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* E5E4 800331E4 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* E5E8 800331E8 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* E5EC 800331EC 24020003 */ addiu $v0, $zero, 3 /* E5F0 800331F0 03E00008 */ jr $ra /* E5F4 800331F4 A06200AC */ sb $v0, 0xac($v1) diff --git a/ver/jp/asm/nonmatchings/E5D0/func_800331F8.s b/ver/jp/asm/nonmatchings/E5D0/func_800331F8.s index ada2142240..7afb740f88 100644 --- a/ver/jp/asm/nonmatchings/E5D0/func_800331F8.s +++ b/ver/jp/asm/nonmatchings/E5D0/func_800331F8.s @@ -4,8 +4,8 @@ glabel func_800331F8 /* E5F8 800331F8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E5FC 800331FC AFB00010 */ sw $s0, 0x10($sp) -/* E600 80033200 3C108007 */ lui $s0, %hi(D_8007417C) -/* E604 80033204 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* E600 80033200 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* E604 80033204 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* E608 80033208 AFBF0014 */ sw $ra, 0x14($sp) /* E60C 8003320C 8E040000 */ lw $a0, ($s0) /* E610 80033210 808200AC */ lb $v0, 0xac($a0) @@ -118,15 +118,15 @@ glabel func_800331F8 /* E7B4 800333B4 8C429600 */ lw $v0, %lo(D_800D9600)($v0) /* E7B8 800333B8 14400007 */ bnez $v0, .L800333D8 /* E7BC 800333BC 24020001 */ addiu $v0, $zero, 1 -/* E7C0 800333C0 3C038007 */ lui $v1, %hi(D_8007417C) -/* E7C4 800333C4 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* E7C0 800333C0 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* E7C4 800333C4 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* E7C8 800333C8 0C015783 */ jal func_80055E0C /* E7CC 800333CC A06200AB */ sb $v0, 0xab($v1) /* E7D0 800333D0 0800CCFB */ j .L800333EC /* E7D4 800333D4 24040001 */ addiu $a0, $zero, 1 .L800333D8: -/* E7D8 800333D8 3C028007 */ lui $v0, %hi(D_8007417C) -/* E7DC 800333DC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* E7D8 800333D8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E7DC 800333DC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E7E0 800333E0 0C01578C */ jal func_80055E30 /* E7E4 800333E4 A04000AB */ sb $zero, 0xab($v0) /* E7E8 800333E8 24040001 */ addiu $a0, $zero, 1 diff --git a/ver/jp/asm/nonmatchings/E860/func_80033460.s b/ver/jp/asm/nonmatchings/E860/func_80033460.s index cb4f8fc212..a92b51e94d 100644 --- a/ver/jp/asm/nonmatchings/E860/func_80033460.s +++ b/ver/jp/asm/nonmatchings/E860/func_80033460.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_80033460 -/* E860 80033460 3C028007 */ lui $v0, %hi(D_8007417C) -/* E864 80033464 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* E860 80033460 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E864 80033464 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E868 80033468 03E00008 */ jr $ra /* E86C 8003346C A44400B6 */ sh $a0, 0xb6($v0) diff --git a/ver/jp/asm/nonmatchings/E860/func_80033470.s b/ver/jp/asm/nonmatchings/E860/func_80033470.s index 19cdc3cee7..25d4779d24 100644 --- a/ver/jp/asm/nonmatchings/E860/func_80033470.s +++ b/ver/jp/asm/nonmatchings/E860/func_80033470.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80033470 -/* E870 80033470 3C028007 */ lui $v0, %hi(D_8007417C) -/* E874 80033474 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* E870 80033470 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E874 80033474 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E878 80033478 A44400BC */ sh $a0, 0xbc($v0) /* E87C 8003347C A44400BA */ sh $a0, 0xba($v0) /* E880 80033480 03E00008 */ jr $ra diff --git a/ver/jp/asm/nonmatchings/E860/func_80033488.s b/ver/jp/asm/nonmatchings/E860/func_80033488.s index 95b8b3e357..b86e8d0385 100644 --- a/ver/jp/asm/nonmatchings/E860/func_80033488.s +++ b/ver/jp/asm/nonmatchings/E860/func_80033488.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80033488 -/* E888 80033488 3C058007 */ lui $a1, %hi(D_8007417C) -/* E88C 8003348C 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* E888 80033488 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* E88C 8003348C 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* E890 80033490 84A200B6 */ lh $v0, 0xb6($a1) /* E894 80033494 94A300B6 */ lhu $v1, 0xb6($a1) /* E898 80033498 14400003 */ bnez $v0, .L800334A8 diff --git a/ver/jp/asm/nonmatchings/E860/func_800334C0.s b/ver/jp/asm/nonmatchings/E860/func_800334C0.s index c0ebf41631..9a9f69980d 100644 --- a/ver/jp/asm/nonmatchings/E860/func_800334C0.s +++ b/ver/jp/asm/nonmatchings/E860/func_800334C0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_800334C0 -/* E8C0 800334C0 3C058007 */ lui $a1, %hi(D_8007417C) -/* E8C4 800334C4 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* E8C0 800334C0 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* E8C4 800334C4 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* E8C8 800334C8 240600FF */ addiu $a2, $zero, 0xff /* E8CC 800334CC 84A200B6 */ lh $v0, 0xb6($a1) /* E8D0 800334D0 94A300B6 */ lhu $v1, 0xb6($a1) diff --git a/ver/jp/asm/nonmatchings/E860/func_80033504.s b/ver/jp/asm/nonmatchings/E860/func_80033504.s index 000e67e515..ad878136c7 100644 --- a/ver/jp/asm/nonmatchings/E860/func_80033504.s +++ b/ver/jp/asm/nonmatchings/E860/func_80033504.s @@ -4,8 +4,8 @@ glabel func_80033504 /* E904 80033504 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E908 80033508 AFB00010 */ sw $s0, 0x10($sp) -/* E90C 8003350C 3C108007 */ lui $s0, %hi(D_8007417C) -/* E910 80033510 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* E90C 8003350C 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* E910 80033510 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* E914 80033514 AFBF0014 */ sw $ra, 0x14($sp) /* E918 80033518 8E020000 */ lw $v0, ($s0) /* E91C 8003351C 844200B6 */ lh $v0, 0xb6($v0) diff --git a/ver/jp/asm/nonmatchings/E860/func_80033574.s b/ver/jp/asm/nonmatchings/E860/func_80033574.s index 66f2cf07c7..c94409557d 100644 --- a/ver/jp/asm/nonmatchings/E860/func_80033574.s +++ b/ver/jp/asm/nonmatchings/E860/func_80033574.s @@ -46,8 +46,8 @@ glabel func_80033574 /* EA10 80033610 00000000 */ nop /* EA14 80033614 0C00EB9A */ jal func_8003AE68 /* EA18 80033618 00000000 */ nop -/* EA1C 8003361C 3C108007 */ lui $s0, %hi(D_8007417C) -/* EA20 80033620 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* EA1C 8003361C 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* EA20 80033620 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* EA24 80033624 8E030000 */ lw $v1, ($s0) /* EA28 80033628 24020001 */ addiu $v0, $zero, 1 /* EA2C 8003362C 0C016AD4 */ jal func_8005AB50 diff --git a/ver/jp/asm/nonmatchings/E860/func_80033850.s b/ver/jp/asm/nonmatchings/E860/func_80033850.s index 5461345e51..8aeece6121 100644 --- a/ver/jp/asm/nonmatchings/E860/func_80033850.s +++ b/ver/jp/asm/nonmatchings/E860/func_80033850.s @@ -36,8 +36,8 @@ glabel func_80033850 /* ECCC 800338CC 00000000 */ nop /* ECD0 800338D0 0C016A28 */ jal func_8005A8A0 /* ECD4 800338D4 00000000 */ nop -/* ECD8 800338D8 3C108007 */ lui $s0, %hi(D_8007417C) -/* ECDC 800338DC 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* ECD8 800338D8 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* ECDC 800338DC 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* ECE0 800338E0 8E040000 */ lw $a0, ($s0) /* ECE4 800338E4 0040902D */ daddu $s2, $v0, $zero /* ECE8 800338E8 84830086 */ lh $v1, 0x86($a0) diff --git a/ver/jp/asm/nonmatchings/EF00/func_80033B00.s b/ver/jp/asm/nonmatchings/EF00/func_80033B00.s index e183640306..7436a2dfe3 100644 --- a/ver/jp/asm/nonmatchings/EF00/func_80033B00.s +++ b/ver/jp/asm/nonmatchings/EF00/func_80033B00.s @@ -9,8 +9,8 @@ glabel func_80033B00 /* EF10 80033B10 AFB00018 */ sw $s0, 0x18($sp) /* EF14 80033B14 0C00AAF0 */ jal func_8002ABC0 /* EF18 80033B18 F7B40028 */ sdc1 $f20, 0x28($sp) -/* EF1C 80033B1C 3C128007 */ lui $s2, %hi(D_8007417C) -/* EF20 80033B20 2652417C */ addiu $s2, $s2, %lo(D_8007417C) +/* EF1C 80033B1C 3C128007 */ lui $s2, %hi(gGameStatusPtr) +/* EF20 80033B20 2652417C */ addiu $s2, $s2, %lo(gGameStatusPtr) /* EF24 80033B24 8E420000 */ lw $v0, ($s2) /* EF28 80033B28 A04000AC */ sb $zero, 0xac($v0) /* EF2C 80033B2C 8E420000 */ lw $v0, ($s2) diff --git a/ver/jp/asm/nonmatchings/EF00/func_80033D34.s b/ver/jp/asm/nonmatchings/EF00/func_80033D34.s index 7c52bc4349..d491f803b6 100644 --- a/ver/jp/asm/nonmatchings/EF00/func_80033D34.s +++ b/ver/jp/asm/nonmatchings/EF00/func_80033D34.s @@ -4,8 +4,8 @@ glabel func_80033D34 /* F134 80033D34 27BDFFE8 */ addiu $sp, $sp, -0x18 /* F138 80033D38 AFB00010 */ sw $s0, 0x10($sp) -/* F13C 80033D3C 3C108007 */ lui $s0, %hi(D_8007417C) -/* F140 80033D40 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* F13C 80033D3C 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* F140 80033D40 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F144 80033D44 AFBF0014 */ sw $ra, 0x14($sp) /* F148 80033D48 8E030000 */ lw $v1, ($s0) /* F14C 80033D4C 806200AE */ lb $v0, 0xae($v1) @@ -38,8 +38,8 @@ glabel func_80033D34 /* F1B4 80033DB4 24020001 */ addiu $v0, $zero, 1 /* F1B8 80033DB8 A06200AE */ sb $v0, 0xae($v1) .L80033DBC: -/* F1BC 80033DBC 3C028007 */ lui $v0, %hi(D_8007417C) -/* F1C0 80033DC0 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* F1BC 80033DBC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* F1C0 80033DC0 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* F1C4 80033DC4 804300AC */ lb $v1, 0xac($v0) /* F1C8 80033DC8 2C62000C */ sltiu $v0, $v1, 0xc /* F1CC 80033DCC 10400090 */ beqz $v0, .L80034010 @@ -49,8 +49,8 @@ glabel func_80033D34 /* F1DC 80033DDC 8C228270 */ lw $v0, %lo(D_80098270)($at) /* F1E0 80033DE0 00400008 */ jr $v0 /* F1E4 80033DE4 00000000 */ nop -/* F1E8 80033DE8 3C108007 */ lui $s0, %hi(D_8007417C) -/* F1EC 80033DEC 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* F1E8 80033DE8 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* F1EC 80033DEC 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F1F0 80033DF0 8E020000 */ lw $v0, ($s0) /* F1F4 80033DF4 804200AD */ lb $v0, 0xad($v0) /* F1F8 80033DF8 14400046 */ bnez $v0, .L80033F14 @@ -66,8 +66,8 @@ glabel func_80033D34 /* F220 80033E20 2404000A */ addiu $a0, $zero, 0xa /* F224 80033E24 1040007A */ beqz $v0, .L80034010 /* F228 80033E28 00000000 */ nop -/* F22C 80033E2C 3C048007 */ lui $a0, %hi(D_8007417C) -/* F230 80033E30 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* F22C 80033E2C 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* F230 80033E30 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* F234 80033E34 8C830000 */ lw $v1, ($a0) /* F238 80033E38 906200AC */ lbu $v0, 0xac($v1) /* F23C 80033E3C 24420001 */ addiu $v0, $v0, 1 @@ -77,8 +77,8 @@ glabel func_80033D34 /* F24C 80033E4C 24420002 */ addiu $v0, $v0, 2 /* F250 80033E50 0800D004 */ j .L80034010 /* F254 80033E54 A06200AC */ sb $v0, 0xac($v1) -/* F258 80033E58 3C108007 */ lui $s0, %hi(D_8007417C) -/* F25C 80033E5C 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* F258 80033E58 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* F25C 80033E5C 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F260 80033E60 8E030000 */ lw $v1, ($s0) /* F264 80033E64 806200AD */ lb $v0, 0xad($v1) /* F268 80033E68 1440002B */ bnez $v0, .L80033F18 @@ -93,16 +93,16 @@ glabel func_80033D34 /* F28C 80033E8C 2404000A */ addiu $a0, $zero, 0xa /* F290 80033E90 1040005F */ beqz $v0, .L80034010 /* F294 80033E94 00000000 */ nop -/* F298 80033E98 3C038007 */ lui $v1, %hi(D_8007417C) -/* F29C 80033E9C 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* F298 80033E98 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* F29C 80033E9C 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* F2A0 80033EA0 0800CFF1 */ j .L80033FC4 /* F2A4 80033EA4 00000000 */ nop /* F2A8 80033EA8 0C00CD22 */ jal func_80033488 /* F2AC 80033EAC 2404000A */ addiu $a0, $zero, 0xa /* F2B0 80033EB0 10400057 */ beqz $v0, .L80034010 /* F2B4 80033EB4 00000000 */ nop -/* F2B8 80033EB8 3C048007 */ lui $a0, %hi(D_8007417C) -/* F2BC 80033EBC 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* F2B8 80033EB8 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* F2BC 80033EBC 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* F2C0 80033EC0 8C830000 */ lw $v1, ($a0) /* F2C4 80033EC4 906200AC */ lbu $v0, 0xac($v1) /* F2C8 80033EC8 24420001 */ addiu $v0, $v0, 1 @@ -111,8 +111,8 @@ glabel func_80033D34 /* F2D4 80033ED4 2402001E */ addiu $v0, $zero, 0x1e /* F2D8 80033ED8 0800D004 */ j .L80034010 /* F2DC 80033EDC A06200AD */ sb $v0, 0xad($v1) -/* F2E0 80033EE0 3C108007 */ lui $s0, %hi(D_8007417C) -/* F2E4 80033EE4 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* F2E0 80033EE0 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* F2E4 80033EE4 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F2E8 80033EE8 8E030000 */ lw $v1, ($s0) /* F2EC 80033EEC 806200AD */ lb $v0, 0xad($v1) /* F2F0 80033EF0 14400009 */ bnez $v0, .L80033F18 @@ -131,8 +131,8 @@ glabel func_80033D34 /* F31C 80033F1C 2442FFFF */ addiu $v0, $v0, -1 /* F320 80033F20 0800D004 */ j .L80034010 /* F324 80033F24 A06200AD */ sb $v0, 0xad($v1) -/* F328 80033F28 3C048007 */ lui $a0, %hi(D_8007417C) -/* F32C 80033F2C 8C84417C */ lw $a0, %lo(D_8007417C)($a0) +/* F328 80033F28 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* F32C 80033F2C 8C84417C */ lw $a0, %lo(gGameStatusPtr)($a0) /* F330 80033F30 808200AD */ lb $v0, 0xad($a0) /* F334 80033F34 908300AD */ lbu $v1, 0xad($a0) /* F338 80033F38 14400010 */ bnez $v0, .L80033F7C @@ -159,14 +159,14 @@ glabel func_80033D34 /* F388 80033F88 2404000A */ addiu $a0, $zero, 0xa /* F38C 80033F8C 10400020 */ beqz $v0, .L80034010 /* F390 80033F90 2402000F */ addiu $v0, $zero, 0xf -/* F394 80033F94 3C048007 */ lui $a0, %hi(D_8007417C) -/* F398 80033F98 2484417C */ addiu $a0, $a0, %lo(D_8007417C) +/* F394 80033F94 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* F398 80033F98 2484417C */ addiu $a0, $a0, %lo(gGameStatusPtr) /* F39C 80033F9C 8C830000 */ lw $v1, ($a0) /* F3A0 80033FA0 A06200AD */ sb $v0, 0xad($v1) /* F3A4 80033FA4 0800CFF1 */ j .L80033FC4 /* F3A8 80033FA8 8C830000 */ lw $v1, ($a0) -/* F3AC 80033FAC 3C038007 */ lui $v1, %hi(D_8007417C) -/* F3B0 80033FB0 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* F3AC 80033FAC 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* F3B0 80033FB0 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* F3B4 80033FB4 806200AD */ lb $v0, 0xad($v1) /* F3B8 80033FB8 906400AD */ lbu $a0, 0xad($v1) /* F3BC 80033FBC 14400005 */ bnez $v0, .L80033FD4 @@ -186,8 +186,8 @@ glabel func_80033D34 /* F3EC 80033FEC 240400FF */ addiu $a0, $zero, 0xff /* F3F0 80033FF0 0C00CD18 */ jal func_80033460 /* F3F4 80033FF4 AE000000 */ sw $zero, ($s0) -/* F3F8 80033FF8 3C028007 */ lui $v0, %hi(D_8007417C) -/* F3FC 80033FFC 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* F3F8 80033FF8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* F3FC 80033FFC 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* F400 80034000 24040010 */ addiu $a0, $zero, 0x10 /* F404 80034004 A04000A8 */ sb $zero, 0xa8($v0) .L80034008: diff --git a/ver/jp/asm/nonmatchings/EF00/func_80034054.s b/ver/jp/asm/nonmatchings/EF00/func_80034054.s index ab98100324..1c46e96600 100644 --- a/ver/jp/asm/nonmatchings/EF00/func_80034054.s +++ b/ver/jp/asm/nonmatchings/EF00/func_80034054.s @@ -50,8 +50,8 @@ glabel func_80034054 /* F508 80034108 24430028 */ addiu $v1, $v0, 0x28 /* F50C 8003410C AC4A001C */ sw $t2, 0x1c($v0) /* F510 80034110 AC830000 */ sw $v1, ($a0) -/* F514 80034114 3C058007 */ lui $a1, %hi(D_8007417C) -/* F518 80034118 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* F514 80034114 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* F518 80034118 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* F51C 8003411C 24430030 */ addiu $v1, $v0, 0x30 /* F520 80034120 AC4B0020 */ sw $t3, 0x20($v0) /* F524 80034124 AC400024 */ sw $zero, 0x24($v0) diff --git a/ver/jp/asm/nonmatchings/EF00/func_800345FC.s b/ver/jp/asm/nonmatchings/EF00/func_800345FC.s index 0fe53684ce..7e3ad6470c 100644 --- a/ver/jp/asm/nonmatchings/EF00/func_800345FC.s +++ b/ver/jp/asm/nonmatchings/EF00/func_800345FC.s @@ -37,8 +37,8 @@ glabel func_800345FC /* FA78 80034678 3C04800A */ lui $a0, %hi(D_8009A630) /* FA7C 8003467C 2484A630 */ addiu $a0, $a0, %lo(D_8009A630) /* FA80 80034680 A2020000 */ sb $v0, ($s0) -/* FA84 80034684 3C058007 */ lui $a1, %hi(D_8007417C) -/* FA88 80034688 8CA5417C */ lw $a1, %lo(D_8007417C)($a1) +/* FA84 80034684 3C058007 */ lui $a1, %hi(gGameStatusPtr) +/* FA88 80034688 8CA5417C */ lw $a1, %lo(gGameStatusPtr)($a1) /* FA8C 8003468C 8C820000 */ lw $v0, ($a0) /* FA90 80034690 94A30148 */ lhu $v1, 0x148($a1) /* FA94 80034694 34420008 */ ori $v0, $v0, 8 @@ -66,8 +66,8 @@ glabel func_800345FC /* FAE4 800346E4 2402FFFF */ addiu $v0, $zero, -1 /* FAE8 800346E8 0C017BE8 */ jal func_8005EFA0 /* FAEC 800346EC A0C20000 */ sb $v0, ($a2) -/* FAF0 800346F0 3C108007 */ lui $s0, %hi(D_8007417C) -/* FAF4 800346F4 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* FAF0 800346F0 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* FAF4 800346F4 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* FAF8 800346F8 8E030000 */ lw $v1, ($s0) /* FAFC 800346FC 9462015C */ lhu $v0, 0x15c($v1) /* FB00 80034700 0C053A3A */ jal func_8014E8E8 @@ -154,8 +154,8 @@ glabel func_800345FC /* FC3C 8003483C 0800D216 */ j .L80034858 /* FC40 80034840 A2020000 */ sb $v0, ($s0) .L80034844: -/* FC44 80034844 3C028007 */ lui $v0, %hi(D_8007417C) -/* FC48 80034848 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* FC44 80034844 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* FC48 80034848 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* FC4C 8003484C 8C440010 */ lw $a0, 0x10($v0) /* FC50 80034850 0C090EFD */ jal func_80243BF4 /* FC54 80034854 8C450020 */ lw $a1, 0x20($v0) diff --git a/ver/jp/asm/nonmatchings/EF00/func_800348BC.s b/ver/jp/asm/nonmatchings/EF00/func_800348BC.s index e60f1746c4..af8c8507c2 100644 --- a/ver/jp/asm/nonmatchings/EF00/func_800348BC.s +++ b/ver/jp/asm/nonmatchings/EF00/func_800348BC.s @@ -61,8 +61,8 @@ glabel func_800348BC /* FD90 80034990 00431024 */ and $v0, $v0, $v1 /* FD94 80034994 0C016A28 */ jal func_8005A8A0 /* FD98 80034998 AC820000 */ sw $v0, ($a0) -/* FD9C 8003499C 3C108007 */ lui $s0, %hi(D_8007417C) -/* FDA0 800349A0 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* FD9C 8003499C 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* FDA0 800349A0 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* FDA4 800349A4 8E040000 */ lw $a0, ($s0) /* FDA8 800349A8 84830086 */ lh $v1, 0x86($a0) /* FDAC 800349AC 00031900 */ sll $v1, $v1, 4 @@ -158,8 +158,8 @@ glabel func_800348BC /* FF0C 80034B0C 0C052BC8 */ jal func_8014AF20 /* FF10 80034B10 24070014 */ addiu $a3, $zero, 0x14 .L80034B14: -/* FF14 80034B14 3C038007 */ lui $v1, %hi(D_8007417C) -/* FF18 80034B18 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* FF14 80034B14 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* FF18 80034B18 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* FF1C 80034B1C 9462015E */ lhu $v0, 0x15e($v1) /* FF20 80034B20 0C046CCF */ jal func_8011B33C /* FF24 80034B24 A462015C */ sh $v0, 0x15c($v1) diff --git a/ver/jp/asm/nonmatchings/1370/func_80026148.s b/ver/jp/asm/nonmatchings/main/func_80026148.s similarity index 100% rename from ver/jp/asm/nonmatchings/1370/func_80026148.s rename to ver/jp/asm/nonmatchings/main/func_80026148.s diff --git a/ver/jp/asm/nonmatchings/1370/func_80026710.s b/ver/jp/asm/nonmatchings/main/func_80026710.s similarity index 98% rename from ver/jp/asm/nonmatchings/1370/func_80026710.s rename to ver/jp/asm/nonmatchings/main/func_80026710.s index 914140ba19..7a59583a08 100644 --- a/ver/jp/asm/nonmatchings/1370/func_80026710.s +++ b/ver/jp/asm/nonmatchings/main/func_80026710.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80026710 -/* 1B10 80026710 3C038007 */ lui $v1, %hi(D_8007417C) -/* 1B14 80026714 8C63417C */ lw $v1, %lo(D_8007417C)($v1) +/* 1B10 80026710 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 1B14 80026714 8C63417C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 1B18 80026718 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 1B1C 8002671C AFBF0018 */ sw $ra, 0x18($sp) /* 1B20 80026720 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/1370/func_800269C0.s b/ver/jp/asm/nonmatchings/main/func_800269C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/1370/func_800269C0.s rename to ver/jp/asm/nonmatchings/main/func_800269C0.s diff --git a/ver/jp/asm/nonmatchings/1370/func_80026AD4.s b/ver/jp/asm/nonmatchings/main/func_80026AD4.s similarity index 98% rename from ver/jp/asm/nonmatchings/1370/func_80026AD4.s rename to ver/jp/asm/nonmatchings/main/func_80026AD4.s index 7dd8d2611c..6808cc29e5 100644 --- a/ver/jp/asm/nonmatchings/1370/func_80026AD4.s +++ b/ver/jp/asm/nonmatchings/main/func_80026AD4.s @@ -68,8 +68,8 @@ glabel func_80026AD4 /* 1FC4 80026BC4 30420002 */ andi $v0, $v0, 2 /* 1FC8 80026BC8 14400009 */ bnez $v0, .L80026BF0 /* 1FCC 80026BCC 3C100010 */ lui $s0, 0x10 -/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(D_8007417C) -/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(D_8007417C)($v0) +/* 1FD0 80026BD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 1FD4 80026BD4 8C42417C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1FD8 80026BD8 80420078 */ lb $v0, 0x78($v0) /* 1FDC 80026BDC 14400004 */ bnez $v0, .L80026BF0 /* 1FE0 80026BE0 00000000 */ nop diff --git a/ver/jp/asm/nonmatchings/1370/func_80026DA8.s b/ver/jp/asm/nonmatchings/main/func_80026DA8.s similarity index 98% rename from ver/jp/asm/nonmatchings/1370/func_80026DA8.s rename to ver/jp/asm/nonmatchings/main/func_80026DA8.s index bf8be950c8..fc9cca68c0 100644 --- a/ver/jp/asm/nonmatchings/1370/func_80026DA8.s +++ b/ver/jp/asm/nonmatchings/main/func_80026DA8.s @@ -52,8 +52,8 @@ glabel func_80026DA8 /* 2264 80026E64 24C66380 */ addiu $a2, $a2, %lo(D_802E6380) /* 2268 80026E68 0C00A5BF */ jal func_800296FC /* 226C 80026E6C 00000000 */ nop -/* 2270 80026E70 3C108007 */ lui $s0, %hi(D_8007417C) -/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(D_8007417C) +/* 2270 80026E70 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 2274 80026E74 2610417C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 2278 80026E78 8E020000 */ lw $v0, ($s0) /* 227C 80026E7C 3C01800A */ lui $at, %hi(D_8009A630) /* 2280 80026E80 AC20A630 */ sw $zero, %lo(D_8009A630)($at) diff --git a/ver/jp/asm/nonmatchings/1370/func_80027054.s b/ver/jp/asm/nonmatchings/main/func_80027054.s similarity index 100% rename from ver/jp/asm/nonmatchings/1370/func_80027054.s rename to ver/jp/asm/nonmatchings/main/func_80027054.s diff --git a/ver/jp/asm/nonmatchings/1370/func_8002715C.s b/ver/jp/asm/nonmatchings/main/func_8002715C.s similarity index 100% rename from ver/jp/asm/nonmatchings/1370/func_8002715C.s rename to ver/jp/asm/nonmatchings/main/func_8002715C.s diff --git a/ver/jp/asm/nonmatchings/1370/func_80025F70.s b/ver/jp/asm/nonmatchings/main/gfxRetrace_Callback.s similarity index 56% rename from ver/jp/asm/nonmatchings/1370/func_80025F70.s rename to ver/jp/asm/nonmatchings/main/gfxRetrace_Callback.s index e43e836947..1bd338d1e1 100644 --- a/ver/jp/asm/nonmatchings/1370/func_80025F70.s +++ b/ver/jp/asm/nonmatchings/main/gfxRetrace_Callback.s @@ -1,62 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80025F70 -/* 1370 80025F70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1374 80025F74 3C038000 */ lui $v1, %hi(D_80000300) -/* 1378 80025F78 8C630300 */ lw $v1, %lo(D_80000300)($v1) -/* 137C 80025F7C 24020001 */ addiu $v0, $zero, 1 -/* 1380 80025F80 1462000D */ bne $v1, $v0, .L80025FB8 -/* 1384 80025F84 AFBF0010 */ sw $ra, 0x10($sp) -/* 1388 80025F88 0C017C2C */ jal func_8005F0B0 -/* 138C 80025F8C 00000000 */ nop -/* 1390 80025F90 3C048009 */ lui $a0, %hi(D_80095800) -/* 1394 80025F94 24845800 */ addiu $a0, $a0, %lo(D_80095800) -/* 1398 80025F98 0C019B78 */ jal func_80066DE0 -/* 139C 80025F9C 00000000 */ nop -/* 13A0 80025FA0 0C019B8C */ jal func_80066E30 -/* 13A4 80025FA4 2404005A */ addiu $a0, $zero, 0x5a -/* 13A8 80025FA8 0C017C2C */ jal func_8005F0B0 -/* 13AC 80025FAC 00000000 */ nop -/* 13B0 80025FB0 080097F0 */ j .L80025FC0 -/* 13B4 80025FB4 00000000 */ nop -.L80025FB8: -/* 13B8 80025FB8 080097EE */ j .L80025FB8 -/* 13BC 80025FBC 00000000 */ nop -.L80025FC0: -/* 13C0 80025FC0 0C009718 */ jal is_debug_init -/* 13C4 80025FC4 00000000 */ nop -/* 13C8 80025FC8 0C017C84 */ jal func_8005F210 -/* 13CC 80025FCC 00000000 */ nop -/* 13D0 80025FD0 0C017CB0 */ jal func_8005F2C0 -/* 13D4 80025FD4 00000000 */ nop -/* 13D8 80025FD8 3C038007 */ lui $v1, %hi(D_8007417C) -/* 13DC 80025FDC 8C63417C */ lw $v1, %lo(D_8007417C)($v1) -/* 13E0 80025FE0 0C00B280 */ jal func_8002CA00 -/* 13E4 80025FE4 A0620073 */ sb $v0, 0x73($v1) -/* 13E8 80025FE8 0C0AC800 */ jal func_802B2000 -/* 13EC 80025FEC 00000000 */ nop -/* 13F0 80025FF0 0C0AC80F */ jal func_802B203C -/* 13F4 80025FF4 00000000 */ nop -/* 13F8 80025FF8 3C048002 */ lui $a0, %hi(D_80026040) -/* 13FC 80025FFC 24846040 */ addiu $a0, $a0, %lo(D_80026040) -/* 1400 80026000 0C017BC0 */ jal func_8005EF00 -/* 1404 80026004 00000000 */ nop -/* 1408 80026008 3C048002 */ lui $a0, %hi(gfxPreNMI_Callback) -/* 140C 8002600C 248466E8 */ addiu $a0, $a0, %lo(gfxPreNMI_Callback) -/* 1410 80026010 0C017BD0 */ jal func_8005EF40 -/* 1414 80026014 00000000 */ nop -/* 1418 80026018 0C019674 */ jal func_800659D0 -/* 141C 8002601C 00000000 */ nop -/* 1420 80026020 3C048007 */ lui $a0, %hi(D_800743F0) -/* 1424 80026024 248443F0 */ addiu $a0, $a0, %lo(D_800743F0) -/* 1428 80026028 8C830000 */ lw $v1, ($a0) -/* 142C 8002602C 00621821 */ addu $v1, $v1, $v0 -/* 1430 80026030 0C017C38 */ jal func_8005F0E0 -/* 1434 80026034 AC830000 */ sw $v1, ($a0) -.L80026038: -/* 1438 80026038 0800980E */ j .L80026038 -/* 143C 8002603C 00000000 */ nop +glabel gfxRetrace_Callback /* 1440 80026040 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 1444 80026044 AFB10014 */ sw $s1, 0x14($sp) /* 1448 80026048 3C118007 */ lui $s1, %hi(D_80073DE0) diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 2c4e3e1899..7f1d884925 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -34,7 +34,7 @@ segments: subsegments: - [0x1000, hasm, entry_point] - [0x1060, c, is_debug] - - [0x1370, c, jp/1370] # 1370 + - [0x1370, c, main] - [0x1B10, c, jp/1B10] # 1B40 - [0x2570, c, jp/2570] - [0x3BC0, c, jp/3BC0] diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index e69de29bb2..76bc8d28d1 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -0,0 +1 @@ +osTvType = 0x80000300; diff --git a/ver/jp/undefined_syms_auto.txt b/ver/jp/undefined_syms_auto.txt index c3a23ee50d..b92a70c372 100644 --- a/ver/jp/undefined_syms_auto.txt +++ b/ver/jp/undefined_syms_auto.txt @@ -3,11 +3,11 @@ D_8009A590 = 0x8009A590; D_800B6570 = 0x800B6570; D_8005E560 = 0x8005E560; D_80097D10 = 0x80097D10; -D_80000300 = 0x80000300; -D_80095800 = 0x80095800; -D_8007417C = 0x8007417C; +osTvType = 0x80000300; +_osViModeNtscLan1 = 0x80095800; +gGameStatusPtr = 0x8007417C; D_80026040 = 0x80026040; -D_800743F0 = 0x800743F0; +gRandSeed = 0x800743F0; D_80073DE0 = 0x80073DE0; D_8009A660 = 0x8009A660; D_80073DE4 = 0x80073DE4; diff --git a/ver/us/asm/nonmatchings/1370_len_7d0/gfx_task_main.s b/ver/us/asm/nonmatchings/main/gfx_task_main.s similarity index 100% rename from ver/us/asm/nonmatchings/1370_len_7d0/gfx_task_main.s rename to ver/us/asm/nonmatchings/main/gfx_task_main.s diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 85d73a7c8a..c7337ad690 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -43,7 +43,7 @@ segments: subsegments: - [0x1000, hasm, entry_point] - [0x1060, c, is_debug] - - [0x1370, c, 1370_len_7d0] + - [0x1370, c, main] - [0x1B40, c, main_loop] - [0x3BF0, c, input] - [0x42E0, c, rumble] @@ -254,7 +254,7 @@ segments: - [0x4AC90, pm_effect_loads, effect_loads] - [0x4DF30, c, battle/battle] - [0x4E5A0, data, 1000_len_60] - - [0x4F410, .data, 1370_len_7d0] + - [0x4F410, .data, main] - [0x4F420, .data, main_loop] - [0x4F660, .data, rumble] - [0x4F670, .data, 43F0]