From 808c62ee29fecc27b106e5395635a61e9ef56051 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 14:26:03 -0500 Subject: [PATCH 01/39] Making progress with undefined_syms --- .../unknown_066AA0/func_80068158.s | 4 +- .../unknown_066AA0/func_800682AC.s | 4 +- src/unknown_0348C0.c | 11 +- src/unknown_043920.c | 40 +- src/unknown_0C4800.c | 2 + tools/python/check_undefined_syms.py | 37 + undefined_syms.txt | 1486 +---------------- 7 files changed, 70 insertions(+), 1514 deletions(-) create mode 100644 tools/python/check_undefined_syms.py diff --git a/asm/non_matchings/unknown_066AA0/func_80068158.s b/asm/non_matchings/unknown_066AA0/func_80068158.s index 504b091c..04c58b7d 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068158.s +++ b/asm/non_matchings/unknown_066AA0/func_80068158.s @@ -25,14 +25,14 @@ glabel func_80068158 /* 068DAC 800681AC 00053023 */ negu $a2, $a1 .L800681B0: /* 068DB0 800681B0 8CE50000 */ lw $a1, ($a3) -/* 068DB4 800681B4 3C19800E */ lui $t9, %hi(D_800DD094) # $t9, 0x800e +/* 068DB4 800681B4 3C19800E */ lui $t9, %hi(D_800DD064 + 0x30) # $t9, 0x800e /* 068DB8 800681B8 0005C080 */ sll $t8, $a1, 2 /* 068DBC 800681BC 0305C023 */ subu $t8, $t8, $a1 /* 068DC0 800681C0 0018C080 */ sll $t8, $t8, 2 /* 068DC4 800681C4 0305C021 */ addu $t8, $t8, $a1 /* 068DC8 800681C8 0018C080 */ sll $t8, $t8, 2 /* 068DCC 800681CC 0338C821 */ addu $t9, $t9, $t8 -/* 068DD0 800681D0 8F39D094 */ lw $t9, %lo(D_800DD094)($t9) +/* 068DD0 800681D0 8F39D094 */ lw $t9, %lo(D_800DD064 + 0x30)($t9) /* 068DD4 800681D4 3C0A800E */ lui $t2, %hi(D_800DD148) # $t2, 0x800e /* 068DD8 800681D8 332B0001 */ andi $t3, $t9, 1 /* 068DDC 800681DC 1560001A */ bnez $t3, .L80068248 diff --git a/asm/non_matchings/unknown_066AA0/func_800682AC.s b/asm/non_matchings/unknown_066AA0/func_800682AC.s index 40eb5197..e232409a 100644 --- a/asm/non_matchings/unknown_066AA0/func_800682AC.s +++ b/asm/non_matchings/unknown_066AA0/func_800682AC.s @@ -8,14 +8,14 @@ glabel func_800682AC /* 068EC4 800682C4 AFA40020 */ sw $a0, 0x20($sp) /* 068EC8 800682C8 3C0F8012 */ lui $t7, %hi(D_80120CE4) # $t7, 0x8012 /* 068ECC 800682CC 8DEF0CE4 */ lw $t7, %lo(D_80120CE4)($t7) -/* 068ED0 800682D0 3C19800E */ lui $t9, %hi(D_800DD094) # $t9, 0x800e +/* 068ED0 800682D0 3C19800E */ lui $t9, %hi(D_800DD064 + 0x30) # $t9, 0x800e /* 068ED4 800682D4 000FC080 */ sll $t8, $t7, 2 /* 068ED8 800682D8 030FC023 */ subu $t8, $t8, $t7 /* 068EDC 800682DC 0018C080 */ sll $t8, $t8, 2 /* 068EE0 800682E0 030FC021 */ addu $t8, $t8, $t7 /* 068EE4 800682E4 0018C080 */ sll $t8, $t8, 2 /* 068EE8 800682E8 0338C821 */ addu $t9, $t9, $t8 -/* 068EEC 800682EC 8F39D094 */ lw $t9, %lo(D_800DD094)($t9) +/* 068EEC 800682EC 8F39D094 */ lw $t9, %lo(D_800DD064 + 0x30)($t9) /* 068EF0 800682F0 8FA40020 */ lw $a0, 0x20($sp) /* 068EF4 800682F4 332A0001 */ andi $t2, $t9, 1 /* 068EF8 800682F8 00024402 */ srl $t0, $v0, 0x10 diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 198edacc..c1cab8ca 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -64,13 +64,16 @@ s32 D_800DCA7C[3] = { // Not sure about typing s32 D_800DCA88[3] = { // Not sure about typing 0, 0, 0 }; -s8 D_800DCA94[16] = { - 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00 + +s8 D_800DCA94[8] = { + 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00 }; -s8 D_800DCA9C[4] = { + +s8 D_800DCA9C[12] = { + 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + u16 D_800DCAA8[64] = { 0x0000, 0x0301, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, diff --git a/src/unknown_043920.c b/src/unknown_043920.c index f7f6559e..a6853a55 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -45,40 +45,32 @@ s32 D_800DCC34[19] = { 0, 0, 0 }; -s32 D_800DCC80[19] = { +s32 D_800DCC80[13] = { 0, 26, 27, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0, 0 }; // Unused? -s16 D_800DCCB4[6] = { +s16 D_800DCCB4[12] = { + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 +}; + +u16 D_800DCCCC[20] = { 0x010C, 0x010B, 0x0009, 0x010C, - 0x010C, 0x010C + 0x010C, 0x010C, 0x010C, 0x010C, + 0x010C, 0x010C, 0x010C, 0x0005, + 0x010C, 0x010C, 0x010C, 0x010C, + 0x010C, 0x010C, 0x010C, 0x0000 }; -u16 D_800DCCCC[14] = { - 0x010C, 0x010C, 0x010C, 0x010C, - 0x010C, 0x0005, 0x010C, 0x010C, - 0x010C, 0x010C, 0x010C, 0x010C, - 0x010C, 0x0000 -}; - -// Unused? Not sure if this is actually an array or just some random data. -s32 D_800DCCDC[2] = { - 1, 4 -}; - -// Used for some sort of bit mask s32 D_800DCCF4[19] = { - 16, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0x100, 1, 1, 1, 1, - 1, 0, 4 + 1, 4, 16, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0x100, 1, 1, 1, 1, 1, }; -// Used for some sort of bit mask -s32 D_800DCD40[18] = { - 16, 0, 0, 0, 0, 0, 0, 0, +s32 D_800DCD40[20] = { + 0, 4, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x100, 0, 0, 0, 0, 0, 0 }; diff --git a/src/unknown_0C4800.c b/src/unknown_0C4800.c index f0f25f09..4cf1898a 100644 --- a/src/unknown_0C4800.c +++ b/src/unknown_0C4800.c @@ -48,6 +48,8 @@ s8 D_800E3710[48] = { OSDevMgr __osPiDevMgr = { 0, NULL, NULL, NULL, NULL, NULL, NULL }; +s32 pad800E375C = 0; // File boundary? + u8* D_800E3760 = NULL; u8* D_800E3764 = NULL; u8* gzip_inflate_input = NULL; diff --git a/tools/python/check_undefined_syms.py b/tools/python/check_undefined_syms.py new file mode 100644 index 00000000..a4096be4 --- /dev/null +++ b/tools/python/check_undefined_syms.py @@ -0,0 +1,37 @@ +import subprocess +import sys + +syms = None + +def main(): + load_syms() + index = 0 + while index < len(syms): + index = test_index(index) + print('Done!') + +def load_syms(): + global syms + with open('undefined_syms.txt', 'r') as inFile: + syms = inFile.read().split('\n') + +def save_syms(): + with open('undefined_syms.txt', 'w') as outFile: + outFile.write('\n'.join(syms)) + +def test_index(index): + val = syms.pop(index) + save_syms() + command = subprocess.run(['make', 'clean'], capture_output=True) + command = subprocess.run(['make', '-j12'], capture_output=True) + out = str(command.stdout)[-5:] + if out.startswith('OK'): + print(val + ' is NOT needed! Removing!') + return index + else: + print(val + ' is needed! Keeping!') + syms.insert(index, val) + save_syms() + return index + 1 + +main() diff --git a/undefined_syms.txt b/undefined_syms.txt index 0942d052..758764b4 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -3,13 +3,10 @@ D_000E1CB0 = 0x000E1CB0; D_000E1CC0 = 0x000E1CC0; D_000E36C8 = 0x000E36C8; D_000E36D8 = 0x000E36D8; -D_000ECB60 = 0x000ECB60; D_000ECC30 = 0x000ECC30; D_00AC9630 = 0x00AC9630; -D_00FF0004 = 0x00FF0004; D_00FF0018 = 0x00FF0018; D_3B9A0001 = 0x3B9A0001; -D_3FC069AC = 0x3FC069AC; D_46FF9630 = 0x46FF9630; D_57410001 = 0x57410001; D_80000004 = 0x80000004; @@ -23,1822 +20,368 @@ osRomBase = 0x80000308; osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -func_80002A98 = 0x80002A98; -D_80002E38 = 0x80002E38; -D_80003008 = 0x80003008; -_sndpVoiceHandler = 0x800033C8; -D_80019808 = 0x80019808; -D_80024D54 = 0x80024D54; -__CSPVoiceHandler = 0x80062408; -alFxPull = 0x80063C30; -alFxParam = 0x80063F94; -alFxParamHdl = 0x80063FAC; -alAuxBusPull = 0x80065900; -alAuxBusParam = 0x800659D4; + D_80065D40 = 0x80065D40; -D_80065D98 = 0x80065D98; -D_8006C330 = 0x8006C330; -__scMain = 0x800795AC; -D_8008F618 = 0x8008F618; -D_800B6FC4 = 0x800B6FC4; -func_800C7340 = 0x800C7340; -D_800C74A0 = 0x800C74A0; -D_800C9D40 = 0x800C9D40; -alEnvMixerPull = 0x800CA0D0; -alEnvmixerParam = 0x800CAA7C; -alLoadParam = 0x800CB540; -D_800CB714 = 0x800CB714; -alLoadPull = 0x800CBBEC; -alResampleParam = 0x800CC090; -alResamplePull = 0x800CC17C; -alMainBusParam = 0x800CC390; -alMainBusPull = 0x800CC3C0; -alSaveParam = 0x800CC4E0; -alSavePull = 0x800CC514; -viMgrMain = 0x800D1B08; -osPiRawStartDma = 0x800D25A0; -osEPiRawStartDma = 0x800D2680; -__osDevMgrMain = 0x800D2760; -__osExceptionPreamble = 0x800D2CB0; -__osException = 0x800D2CC0; __osCleanupThread = 0x800D35A0; D_800D7600 = 0x800D7600; D_800D84C0 = 0x800D84C0; D_800D8590 = 0x800D8590; D_800D9790 = 0x800D9790; D_800DA970 = 0x800DA970; -gMusicPlayer = 0x800DC630; -gSndFxPlayer = 0x800DC634; -musicRelativeVolume = 0x800DC638; -sfxRelativeVolume = 0x800DC63C; -D_800DC640 = 0x800DC640; -D_800DC644 = 0x800DC644; -D_800DC648 = 0x800DC648; -audioPrevCount = 0x800DC64C; -D_800DC650 = 0x800DC650; -musicVolumeSliderPercentage = 0x800DC654; -D_800DC658 = 0x800DC658; -D_800DC65C = 0x800DC65C; -D_800DC660 = 0x800DC660; -D_800DC66C = 0x800DC66C; -D_800DC670 = 0x800DC670; -D_800DC680 = 0x800DC680; -D_800DC684 = 0x800DC684; -D_800DC688 = 0x800DC688; -D_800DC68C = 0x800DC68C; -D_800DC690 = 0x800DC690; -D_800DC694 = 0x800DC694; -D_800DC698 = 0x800DC698; -D_800DC69C = 0x800DC69C; -D_800DC6A0 = 0x800DC6A0; -D_800DC6B0 = 0x800DC6B0; -D_800DC6B4 = 0x800DC6B4; -D_800DC6B8 = 0x800DC6B8; -gAlSndPlayer = 0x800DC6BC; -sfxVolumeSlider = 0x800DC6C0; -D_800DC6C4 = 0x800DC6C4; -D_800DC6D0 = 0x800DC6D0; -D_800DC6D4 = 0x800DC6D4; -D_800DC6D8 = 0x800DC6D8; -D_800DC6E0 = 0x800DC6E0; -D_800DC6F0 = 0x800DC6F0; -D_800DC6F8 = 0x800DC6F8; -D_800DC700 = 0x800DC700; -D_800DC708 = 0x800DC708; -D_800DC718 = 0x800DC718; -D_800DC71C = 0x800DC71C; -D_800DC720 = 0x800DC720; -D_800DC724 = 0x800DC724; -D_800DC728 = 0x800DC728; -D_800DC72C = 0x800DC72C; -D_800DC730 = 0x800DC730; -D_800DC734 = 0x800DC734; -D_800DC738 = 0x800DC738; -D_800DC73C = 0x800DC73C; -D_800DC740 = 0x800DC740; -D_800DC744 = 0x800DC744; -D_800DC748 = 0x800DC748; -D_800DC74C = 0x800DC74C; -D_800DC754 = 0x800DC754; -D_800DC75C = 0x800DC75C; -D_800DC760 = 0x800DC760; -D_800DC764 = 0x800DC764; -D_800DC768 = 0x800DC768; -D_800DC7A8 = 0x800DC7A8; -D_800DC7B8 = 0x800DC7B8; -D_800DC820 = 0x800DC820; -D_800DC840 = 0x800DC840; -D_800DC848 = 0x800DC848; -D_800DC858 = 0x800DC858; -D_800DC860 = 0x800DC860; -D_800DC874 = 0x800DC874; -D_800DC87C = 0x800DC87C; -D_800DC884 = 0x800DC884; -D_800DC8AC = 0x800DC8AC; -D_800DC918 = 0x800DC918; -D_800DC91C = 0x800DC91C; -D_800DC924 = 0x800DC924; -D_800DC92C = 0x800DC92C; -D_800DC950 = 0x800DC950; -D_800DC954 = 0x800DC954; -D_800DC958 = 0x800DC958; -D_800DC95C = 0x800DC95C; -D_800DC960 = 0x800DC960; -D_800DC964 = 0x800DC964; -D_800DC968 = 0x800DC968; -D_800DC970 = 0x800DC970; -D_800DC978 = 0x800DC978; -D_800DC980 = 0x800DC980; -D_800DC9A8 = 0x800DC9A8; -D_800DC9D0 = 0x800DC9D0; -D_800DCA50 = 0x800DCA50; -D_800DCA58 = 0x800DCA58; -D_800DCA64 = 0x800DCA64; -D_800DCA70 = 0x800DCA70; -D_800DCA7C = 0x800DCA7C; -D_800DCA88 = 0x800DCA88; -D_800DCA94 = 0x800DCA94; -D_800DCA9C = 0x800DCA9C; -D_800DCAA8 = 0x800DCAA8; -D_800DCB28 = 0x800DCB28; -D_800DCB50 = 0x800DCB50; -D_800DCB54 = 0x800DCB54; -D_800DCB98 = 0x800DCB98; -D_800DCB9C = 0x800DCB9C; -D_800DCBE8 = 0x800DCBE8; -D_800DCC34 = 0x800DCC34; -D_800DCC80 = 0x800DCC80; -D_800DCCCC = 0x800DCCCC; -D_800DCCF4 = 0x800DCCF4; -D_800DCD40 = 0x800DCD40; -D_800DCD90 = 0x800DCD90; -D_800DCDA0 = 0x800DCDA0; -D_800DCDA8 = 0x800DCDA8; -D_800DCDB0 = 0x800DCDB0; -D_800DCDD0 = 0x800DCDD0; -D_800DCDD4 = 0x800DCDD4; -D_800DCDE0 = 0x800DCDE0; -D_800DCE00 = 0x800DCE00; -D_800DCE20 = 0x800DCE20; -D_800DCE40 = 0x800DCE40; -D_800DCE60 = 0x800DCE60; -D_800DCE80 = 0x800DCE80; -D_800DCEA0 = 0x800DCEA0; -D_800DCEA4 = 0x800DCEA4; -D_800DCEB0 = 0x800DCEB0; -D_800DCEC0 = 0x800DCEC0; -D_800DCF28 = 0x800DCF28; -D_800DCFB0 = 0x800DCFB0; -D_800DCFD8 = 0x800DCFD8; -D_800DD000 = 0x800DD000; -D_800DD028 = 0x800DD028; -D_800DD050 = 0x800DD050; -D_800DD060 = 0x800DD060; -D_800DD064 = 0x800DD064; -D_800DD094 = 0x800DD094; -D_800DD134 = 0x800DD134; -D_800DD148 = 0x800DD148; -D_800DD288 = 0x800DD288; -D_800DD2A0 = 0x800DD2A0; -D_800DD2B8 = 0x800DD2B8; -D_800DD2CC = 0x800DD2CC; -D_800DD2F8 = 0x800DD2F8; -D_800DD300 = 0x800DD300; -D_800DD304 = 0x800DD304; -D_800DD310 = 0x800DD310; -D_800DD314 = 0x800DD314; -D_800DD318 = 0x800DD318; -D_800DD31C = 0x800DD31C; -D_800DD320 = 0x800DD320; -D_800DD324 = 0x800DD324; -D_800DD328 = 0x800DD328; -D_800DD32C = 0x800DD32C; -D_800DD330 = 0x800DD330; -D_800DD374 = 0x800DD374; -D_800DD37C = 0x800DD37C; -D_800DD380 = 0x800DD380; -D_800DD384 = 0x800DD384; -D_800DD38C = 0x800DD38C; -D_800DD390 = 0x800DD390; -D_800DD394 = 0x800DD394; -D_800DD398 = 0x800DD398; -D_800DD39C = 0x800DD39C; -D_800DD3A0 = 0x800DD3A0; -D_800DD3B0 = 0x800DD3B0; -D_800DD3BC = 0x800DD3BC; -D_800DD3C0 = 0x800DD3C0; -D_800DD3CC = 0x800DD3CC; -D_800DD3D0 = 0x800DD3D0; -D_800DD3DC = 0x800DD3DC; -D_800DD3E0 = 0x800DD3E0; -D_800DD3EC = 0x800DD3EC; -D_800DD3F0 = 0x800DD3F0; -D_800DD3F4 = 0x800DD3F4; -D_800DD404 = 0x800DD404; + D_800DD407 = 0x800DD407; -D_800DD408 = 0x800DD408; -D_800DD41C = 0x800DD41C; -D_800DD424 = 0x800DD424; -D_800DD430 = 0x800DD430; -D_800DD434 = 0x800DD434; -D_800DD438 = 0x800DD438; -D_800DD43C = 0x800DD43C; D_800DDC3E = 0x800DDC3E; -D_800DE440 = 0x800DE440; -D_800DE444 = 0x800DE444; -D_800DE488 = 0x800DE488; -D_800DE48C = 0x800DE48C; -D_800DE490 = 0x800DE490; -D_800DE4B0 = 0x800DE4B0; -D_800DE4B4 = 0x800DE4B4; -D_800DE4B8 = 0x800DE4B8; -D_800DE4BC = 0x800DE4BC; -D_800DE4C0 = 0x800DE4C0; -D_800DE4C4 = 0x800DE4C4; -D_800DE4C8 = 0x800DE4C8; -D_800DE4CC = 0x800DE4CC; -D_800DE4D0 = 0x800DE4D0; -D_800DE4D4 = 0x800DE4D4; -D_800DE4D8 = 0x800DE4D8; -D_800DE4DC = 0x800DE4DC; -D_800DE4E0 = 0x800DE4E0; -D_800DE520 = 0x800DE520; -D_800DE598 = 0x800DE598; -D_800DE5E0 = 0x800DE5E0; -D_800DE628 = 0x800DE628; -D_800DE670 = 0x800DE670; -D_800DE6A8 = 0x800DE6A8; -D_800DE6E8 = 0x800DE6E8; -D_800DE730 = 0x800DE730; -D_800DE738 = 0x800DE738; -D_800DE740 = 0x800DE740; -D_800DE744 = 0x800DE744; -D_800DE748 = 0x800DE748; -D_800DE74C = 0x800DE74C; -D_800DE750 = 0x800DE750; -D_800DE754 = 0x800DE754; -D_800DE758 = 0x800DE758; -D_800DE760 = 0x800DE760; -D_800DE764 = 0x800DE764; -D_800DE770 = 0x800DE770; -D_800DE77C = 0x800DE77C; -D_800DE7BC = 0x800DE7BC; -D_800DE7C0 = 0x800DE7C0; -D_800DE7C4 = 0x800DE7C4; -D_800DE7C8 = 0x800DE7C8; -D_800DE848 = 0x800DE848; -D_800DE868 = 0x800DE868; -D_800DE8E8 = 0x800DE8E8; -D_800DECE8 = 0x800DECE8; -D_800DEDE8 = 0x800DEDE8; -D_800DEEE8 = 0x800DEEE8; -D_800DEF28 = 0x800DEF28; -D_800DF028 = 0x800DF028; -D_800DF0A8 = 0x800DF0A8; -D_800DF1A8 = 0x800DF1A8; -D_800DF3A8 = 0x800DF3A8; -D_800DF3D8 = 0x800DF3D8; -D_800DF410 = 0x800DF410; -D_800DF440 = 0x800DF440; -D_800DF450 = 0x800DF450; -D_800DF454 = 0x800DF454; -D_800DF458 = 0x800DF458; -D_800DF45C = 0x800DF45C; -D_800DF460 = 0x800DF460; -D_800DF468 = 0x800DF468; -D_800DF46C = 0x800DF46C; -D_800DF470 = 0x800DF470; -D_800DF478 = 0x800DF478; -D_800DF47C = 0x800DF47C; -D_800DF480 = 0x800DF480; -D_800DF484 = 0x800DF484; -D_800DF488 = 0x800DF488; -gIsInAdventureTwo = 0x800DF494; -D_800DF498 = 0x800DF498; -D_800DF49C = 0x800DF49C; -D_800DF4A0 = 0x800DF4A0; -D_800DF4A4 = 0x800DF4A4; -D_800DF4A8 = 0x800DF4A8; -D_800DF4AC = 0x800DF4AC; -D_800DF4B0 = 0x800DF4B0; -D_800DF4B4 = 0x800DF4B4; -D_800DF4B8 = 0x800DF4B8; -D_800DF4BC = 0x800DF4BC; -gIsInTwoPlayerAdventure = 0x800DF4C0; -D_800DF4C4 = 0x800DF4C4; -D_800DF4C8 = 0x800DF4C8; -gSaveFileIndex = 0x800DF4CC; -D_800DF4D4 = 0x800DF4D4; -D_800DF4D8 = 0x800DF4D8; -D_800DF4DC = 0x800DF4DC; -D_800DF4E0 = 0x800DF4E0; -D_800DF4E4 = 0x800DF4E4; -D_800DF4E7 = 0x800DF4E7; -D_800DF4EC = 0x800DF4EC; -D_800DF510 = 0x800DF510; D_800DF598 = 0x800DF598; -D_800DF750 = 0x800DF750; -D_800DF754 = 0x800DF754; -D_800DF758 = 0x800DF758; -D_800DF75C = 0x800DF75C; -D_800DF760 = 0x800DF760; D_800DF763 = 0x800DF763; -D_800DF764 = 0x800DF764; -D_800DF76C = 0x800DF76C; -D_800DF774 = 0x800DF774; -D_800DF77C = 0x800DF77C; -D_800DF794 = 0x800DF794; -D_800DF798 = 0x800DF798; -D_800DF79C = 0x800DF79C; -D_800DF7A0 = 0x800DF7A0; -D_800DF7A4 = 0x800DF7A4; -D_800DF7C4 = 0x800DF7C4; D_800DF7C6 = 0x800DF7C6; D_800DF7C8 = 0x800DF7C8; D_800DF7CA = 0x800DF7CA; D_800DF7DA = 0x800DF7DA; -D_800DF7DC = 0x800DF7DC; D_800DF7E4 = 0x800DF7E4; D_800DF7EC = 0x800DF7EC; D_800DF7F4 = 0x800DF7F4; -D_800DF83C = 0x800DF83C; -D_800DF9F4 = 0x800DF9F4; -D_800DF9F8 = 0x800DF9F8; -D_800DFA10 = 0x800DFA10; D_800DFA14 = 0x800DFA14; -D_800DFA2C = 0x800DFA2C; -D_800DFA38 = 0x800DFA38; -D_800DFA3C = 0x800DFA3C; D_800DFA48 = 0x800DFA48; -D_800DFABC = 0x800DFABC; -D_800DFAC0 = 0x800DFAC0; -D_800DFAC4 = 0x800DFAC4; -D_800DFAC8 = 0x800DFAC8; -D_800DFADC = 0x800DFADC; -D_800DFAE0 = 0x800DFAE0; -D_800DFAE4 = 0x800DFAE4; -D_800DFAFC = 0x800DFAFC; -D_800DFB14 = 0x800DFB14; -D_800DFB2C = 0x800DFB2C; -D_800DFB40 = 0x800DFB40; -D_800DFB5C = 0x800DFB5C; -D_800DFB74 = 0x800DFB74; -D_800DFB8C = 0x800DFB8C; -D_800DFBA4 = 0x800DFBA4; -D_800DFBBC = 0x800DFBBC; -D_800DFBDC = 0x800DFBDC; -D_800DFC10 = 0x800DFC10; -D_800DFC20 = 0x800DFC20; -D_800DFC30 = 0x800DFC30; -D_800DFC40 = 0x800DFC40; -D_800DFC50 = 0x800DFC50; -D_800DFC60 = 0x800DFC60; -D_800DFC78 = 0x800DFC78; -D_800DFCAC = 0x800DFCAC; -D_800DFCB4 = 0x800DFCB4; -D_800DFD94 = 0x800DFD94; -gActiveMagicCodes = 0x800DFD98; -gUnlockedMagicCodes = 0x800DFD9C; -D_800DFDA0 = 0x800DFDA0; -D_800DFDB4 = 0x800DFDB4; D_800DFDB5 = 0x800DFDB5; -D_800DFDC8 = 0x800DFDC8; -D_800DFDCC = 0x800DFDCC; -D_800DFDD0 = 0x800DFDD0; -D_800DFE40 = 0x800DFE40; -D_800DFEC0 = 0x800DFEC0; -D_800DFF40 = 0x800DFF40; -D_800DFFD0 = 0x800DFFD0; -D_800DFFD4 = 0x800DFFD4; -D_800DFFD8 = 0x800DFFD8; D_800E0001 = 0x800E0001; D_800E002C = 0x800E002C; D_800E0038 = 0x800E0038; D_800E004C = 0x800E004C; D_800E006C = 0x800E006C; D_800E0138 = 0x800E0138; -D_800E0198 = 0x800E0198; D_800E0235 = 0x800E0235; -D_800E0278 = 0x800E0278; -D_800E0398 = 0x800E0398; -D_800E03A4 = 0x800E03A4; -D_800E03B0 = 0x800E03B0; -D_800E03CC = 0x800E03CC; -D_800E03FC = 0x800E03FC; -D_800E0410 = 0x800E0410; -D_800E0414 = 0x800E0414; -D_800E0418 = 0x800E0418; -D_800E041C = 0x800E041C; -D_800E042C = 0x800E042C; -D_800E043C = 0x800E043C; -D_800E044C = 0x800E044C; -D_800E045C = 0x800E045C; -D_800E0474 = 0x800E0474; -D_800E048C = 0x800E048C; -D_800E04A4 = 0x800E04A4; -D_800E04BC = 0x800E04BC; -D_800E04D4 = 0x800E04D4; -D_800E04E4 = 0x800E04E4; -D_800E04F4 = 0x800E04F4; -D_800E0504 = 0x800E0504; -D_800E0514 = 0x800E0514; -D_800E0524 = 0x800E0524; -D_800E0534 = 0x800E0534; -D_800E0544 = 0x800E0544; -D_800E0554 = 0x800E0554; -D_800E0564 = 0x800E0564; -D_800E0574 = 0x800E0574; -D_800E0584 = 0x800E0584; -D_800E0594 = 0x800E0594; -D_800E05A4 = 0x800E05A4; -D_800E05B4 = 0x800E05B4; -D_800E05C4 = 0x800E05C4; -D_800E05D4 = 0x800E05D4; -D_800E05F4 = 0x800E05F4; -D_800E0614 = 0x800E0614; -D_800E0624 = 0x800E0624; -D_800E0648 = 0x800E0648; -D_800E0660 = 0x800E0660; -D_800E0678 = 0x800E0678; -D_800E0688 = 0x800E0688; -D_800E06B0 = 0x800E06B0; -D_800E06C4 = 0x800E06C4; -D_800E06D4 = 0x800E06D4; -D_800E06E4 = 0x800E06E4; -D_800E0700 = 0x800E0700; -D_800E0710 = 0x800E0710; -D_800E072E = 0x800E072E; -D_800E0730 = 0x800E0730; D_800E0758 = 0x800E0758; -D_800E07C4 = 0x800E07C4; -D_800E07E0 = 0x800E07E0; -D_800E07E8 = 0x800E07E8; -D_800E0830 = 0x800E0830; -D_800E0840 = 0x800E0840; -D_800E0968 = 0x800E0968; -D_800E096C = 0x800E096C; -D_800E0970 = 0x800E0970; -D_800E0974 = 0x800E0974; -D_800E0978 = 0x800E0978; -D_800E097C = 0x800E097C; -D_800E0980 = 0x800E0980; -D_800E0984 = 0x800E0984; -D_800E0988 = 0x800E0988; -D_800E098C = 0x800E098C; -D_800E0990 = 0x800E0990; -D_800E09A0 = 0x800E09A0; -D_800E09B0 = 0x800E09B0; -D_800E09C4 = 0x800E09C4; -D_800E09D8 = 0x800E09D8; -D_800E09EC = 0x800E09EC; -D_800E09F8 = 0x800E09F8; -D_800E0A04 = 0x800E0A04; -D_800E0A10 = 0x800E0A10; -D_800E0A14 = 0x800E0A14; -D_800E0A24 = 0x800E0A24; -D_800E0A40 = 0x800E0A40; -D_800E0A50 = 0x800E0A50; -D_800E0A60 = 0x800E0A60; -D_800E0A70 = 0x800E0A70; D_800E0A80 = 0x800E0A80; D_800E0A90 = 0x800E0A90; -D_800E0AA0 = 0x800E0AA0; -D_800E0AB0 = 0x800E0AB0; -D_800E0AC0 = 0x800E0AC0; -D_800E0AD0 = 0x800E0AD0; -D_800E0AE0 = 0x800E0AE0; -D_800E0AF0 = 0x800E0AF0; -D_800E0B18 = 0x800E0B18; -D_800E0BCC = 0x800E0BCC; -D_800E0BEC = 0x800E0BEC; D_800E0C00 = 0x800E0C00; -D_800E0CEC = 0x800E0CEC; D_800E0D20 = 0x800E0D20; D_800E0D40 = 0x800E0D40; D_800E0D60 = 0x800E0D60; D_800E0DCC = 0x800E0DCC; -D_800E0E4C = 0x800E0E4C; -D_800E0F6C = 0x800E0F6C; -D_800E0F8C = 0x800E0F8C; -D_800E0F90 = 0x800E0F90; -D_800E0F94 = 0x800E0F94; -D_800E0F98 = 0x800E0F98; -D_800E0F9C = 0x800E0F9C; -D_800E0FA0 = 0x800E0FA0; -D_800E0FA4 = 0x800E0FA4; -D_800E0FA8 = 0x800E0FA8; -D_800E0FAC = 0x800E0FAC; -D_800E0FB0 = 0x800E0FB0; -D_800E0FB4 = 0x800E0FB4; -D_800E0FD8 = 0x800E0FD8; -D_800E0FE4 = 0x800E0FE4; -gTrophyRaceWorldId = 0x800E0FE8; -D_800E0FEC = 0x800E0FEC; -D_800E0FF0 = 0x800E0FF0; -D_800E1004 = 0x800E1004; -D_800E1024 = 0x800E1024; -D_800E1040 = 0x800E1040; -D_800E1048 = 0x800E1048; D_800E1088 = 0x800E1088; -D_800E14BC = 0x800E14BC; -D_800E153C = 0x800E153C; -D_800E1564 = 0x800E1564; -D_800E1594 = 0x800E1594; -D_800E15BC = 0x800E15BC; -D_800E15EC = 0x800E15EC; -D_800E1614 = 0x800E1614; -D_800E1644 = 0x800E1644; -D_800E166C = 0x800E166C; -D_800E169C = 0x800E169C; -D_800E16C4 = 0x800E16C4; -D_800E16F4 = 0x800E16F4; -D_800E1708 = 0x800E1708; -D_800E174C = 0x800E174C; -D_800E1754 = 0x800E1754; -D_800E1768 = 0x800E1768; -D_800E1780 = 0x800E1780; -D_800E17D8 = 0x800E17D8; -D_800E17F0 = 0x800E17F0; -D_800E17F4 = 0x800E17F4; -D_800E18F8 = 0x800E18F8; -D_800E1938 = 0x800E1938; -D_800E1A94 = 0x800E1A94; -D_800E1AE4 = 0x800E1AE4; -D_800E1AF8 = 0x800E1AF8; -D_800E1B4C = 0x800E1B4C; -D_800E1B50 = 0x800E1B50; D_800E1B58 = 0x800E1B58; -D_800E1C70 = 0x800E1C70; -D_800E1CD0 = 0x800E1CD0; -D_800E1CF0 = 0x800E1CF0; -D_800E1D2C = 0x800E1D2C; -D_800E1D7C = 0x800E1D7C; -D_800E1DA4 = 0x800E1DA4; D_800E1DA8 = 0x800E1DA8; -D_800E1DAC = 0x800E1DAC; D_800E1DB0 = 0x800E1DB0; -D_800E1DB4 = 0x800E1DB4; -D_800E1DB8 = 0x800E1DB8; -D_800E1DBC = 0x800E1DBC; -D_800E1DC0 = 0x800E1DC0; -D_800E1DC4 = 0x800E1DC4; -D_800E1DC8 = 0x800E1DC8; -D_800E1DE8 = 0x800E1DE8; -D_800E1DF0 = 0x800E1DF0; -D_800E1E08 = 0x800E1E08; -D_800E1E10 = 0x800E1E10; -D_800E1E14 = 0x800E1E14; -D_800E1E18 = 0x800E1E18; -D_800E1E1C = 0x800E1E1C; -D_800E1E20 = 0x800E1E20; -D_800E1E28 = 0x800E1E28; -D_800E1E2C = 0x800E1E2C; -D_800E1E40 = 0x800E1E40; -D_800E1E64 = 0x800E1E64; -D_800E25C4 = 0x800E25C4; -D_800E2684 = 0x800E2684; -D_800E2770 = 0x800E2770; D_800E2772 = 0x800E2772; -D_800E2790 = 0x800E2790; -D_800E2794 = 0x800E2794; -D_800E27A4 = 0x800E27A4; -D_800E27A8 = 0x800E27A8; -D_800E27AC = 0x800E27AC; -D_800E27B8 = 0x800E27B8; -D_800E27BC = 0x800E27BC; -D_800E2834 = 0x800E2834; -D_800E2838 = 0x800E2838; -D_800E2850 = 0x800E2850; -D_800E28D4 = 0x800E28D4; -D_800E28D8 = 0x800E28D8; -D_800E2904 = 0x800E2904; -D_800E2908 = 0x800E2908; -D_800E290C = 0x800E290C; -D_800E2910 = 0x800E2910; -D_800E2914 = 0x800E2914; -D_800E291C = 0x800E291C; -D_800E2920 = 0x800E2920; -D_800E2928 = 0x800E2928; -D_800E2980 = 0x800E2980; -D_800E29A0 = 0x800E29A0; -D_800E29E0 = 0x800E29E0; -D_800E2A30 = 0x800E2A30; -D_800E2A80 = 0x800E2A80; -D_800E2A84 = 0x800E2A84; -D_800E2A88 = 0x800E2A88; -D_800E2A8C = 0x800E2A8C; -D_800E2A90 = 0x800E2A90; -D_800E2A94 = 0x800E2A94; -D_800E2A98 = 0x800E2A98; -D_800E2A9C = 0x800E2A9C; -D_800E2AA0 = 0x800E2AA0; -D_800E2AA4 = 0x800E2AA4; -D_800E2AA8 = 0x800E2AA8; -D_800E2AAC = 0x800E2AAC; -D_800E2B4C = 0x800E2B4C; -D_800E2C2C = 0x800E2C2C; D_800E2C38 = 0x800E2C38; D_800E2C50 = 0x800E2C50; -D_800E2C5C = 0x800E2C5C; -D_800E2C60 = 0x800E2C60; -D_800E2C64 = 0x800E2C64; -D_800E2C68 = 0x800E2C68; -D_800E2C6C = 0x800E2C6C; -D_800E2C70 = 0x800E2C70; -D_800E2C74 = 0x800E2C74; -D_800E2C78 = 0x800E2C78; -D_800E2C7C = 0x800E2C7C; -D_800E2C80 = 0x800E2C80; -D_800E2C84 = 0x800E2C84; -D_800E2C88 = 0x800E2C88; -D_800E2C8C = 0x800E2C8C; -D_800E2C90 = 0x800E2C90; -D_800E2C94 = 0x800E2C94; -D_800E2C98 = 0x800E2C98; -D_800E2CA0 = 0x800E2CA0; -D_800E2CA4 = 0x800E2CA4; -D_800E2CA8 = 0x800E2CA8; -D_800E2CAC = 0x800E2CAC; -D_800E2CB0 = 0x800E2CB0; -D_800E2CB4 = 0x800E2CB4; -D_800E2CB8 = 0x800E2CB8; -D_800E2CBC = 0x800E2CBC; -D_800E2CC0 = 0x800E2CC0; -D_800E2CC4 = 0x800E2CC4; -D_800E2CC8 = 0x800E2CC8; -D_800E2CCC = 0x800E2CCC; -D_800E2CD0 = 0x800E2CD0; -D_800E2CD4 = 0x800E2CD4; -D_800E2CD8 = 0x800E2CD8; -D_800E2CDC = 0x800E2CDC; -D_800E2CE0 = 0x800E2CE0; -D_800E2CE4 = 0x800E2CE4; -D_800E2CE8 = 0x800E2CE8; -D_800E2CEC = 0x800E2CEC; -D_800E2CF0 = 0x800E2CF0; -D_800E2CF4 = 0x800E2CF4; -D_800E2CF8 = 0x800E2CF8; -D_800E2CFC = 0x800E2CFC; -D_800E2D00 = 0x800E2D00; -D_800E2D08 = 0x800E2D08; -D_800E2D58 = 0x800E2D58; -D_800E2D78 = 0x800E2D78; -D_800E2DF8 = 0x800E2DF8; -D_800E2E28 = 0x800E2E28; -D_800E2E2C = 0x800E2E2C; -D_800E2E4C = 0x800E2E4C; -D_800E2E50 = 0x800E2E50; -D_800E2E54 = 0x800E2E54; -D_800E2E58 = 0x800E2E58; -D_800E2E5C = 0x800E2E5C; -D_800E2E60 = 0x800E2E60; -D_800E2E64 = 0x800E2E64; -D_800E2E68 = 0x800E2E68; -D_800E2E74 = 0x800E2E74; -D_800E2E84 = 0x800E2E84; -D_800E2EC4 = 0x800E2EC4; -D_800E2EEC = 0x800E2EEC; -D_800E2EF0 = 0x800E2EF0; -D_800E2EF4 = 0x800E2EF4; -D_800E2FB8 = 0x800E2FB8; -D_800E3020 = 0x800E3020; -D_800E3024 = 0x800E3024; -D_800E3028 = 0x800E3028; -D_800E302C = 0x800E302C; -D_800E3040 = 0x800E3040; -D_800E3044 = 0x800E3044; -D_800E3048 = 0x800E3048; -D_800E304C = 0x800E304C; -D_800E3050 = 0x800E3050; -D_800E3070 = 0x800E3070; -D_800E3078 = 0x800E3078; -D_800E3080 = 0x800E3080; -D_800E3090 = 0x800E3090; -D_800E30D0 = 0x800E30D0; -D_800E30D4 = 0x800E30D4; -D_800E30D8 = 0x800E30D8; -D_800E30DC = 0x800E30DC; -D_800E30E0 = 0x800E30E0; -D_800E30E4 = 0x800E30E4; -D_800E30E8 = 0x800E30E8; -D_800E30FC = 0x800E30FC; -D_800E3110 = 0x800E3110; -D_800E3144 = 0x800E3144; -D_800E3178 = 0x800E3178; -D_800E317C = 0x800E317C; -D_800E3180 = 0x800E3180; -D_800E3184 = 0x800E3184; -D_800E3188 = 0x800E3188; -D_800E318C = 0x800E318C; -D_800E3190 = 0x800E3190; -D_800E3194 = 0x800E3194; -D_800E3198 = 0x800E3198; -D_800E31A0 = 0x800E31A0; -D_800E31A4 = 0x800E31A4; -D_800E31A8 = 0x800E31A8; -D_800E31AC = 0x800E31AC; -D_800E31B0 = 0x800E31B0; -D_800E31B4 = 0x800E31B4; -D_800E31B8 = 0x800E31B8; -D_800E31BC = 0x800E31BC; -D_800E31C0 = 0x800E31C0; -D_800E31C4 = 0x800E31C4; -D_800E31C8 = 0x800E31C8; -D_800E31CC = 0x800E31CC; -D_800E31D0 = 0x800E31D0; -D_800E31D8 = 0x800E31D8; -D_800E3230 = 0x800E3230; -D_800E3268 = 0x800E3268; -D_800E32A0 = 0x800E32A0; -D_800E32AC = 0x800E32AC; -D_800E32B8 = 0x800E32B8; -D_800E32D0 = 0x800E32D0; -D_800E32DC = 0x800E32DC; -D_800E330C = 0x800E330C; -D_800E3318 = 0x800E3318; -D_800E3324 = 0x800E3324; -D_800E3338 = 0x800E3338; -D_800E3344 = 0x800E3344; -D_800E3440 = 0x800E3440; -D_800E349C = 0x800E349C; -D_800E34F8 = 0x800E34F8; -D_800E3554 = 0x800E3554; -D_800E3648 = 0x800E3648; -D_800E3670 = 0x800E3670; -D_800E3674 = 0x800E3674; -D_800E3678 = 0x800E3678; -D_800E367C = 0x800E367C; -D_800E3680 = 0x800E3680; -D_800E3690 = 0x800E3690; -D_800E36E8 = 0x800E36E8; -D_800E36EC = 0x800E36EC; -D_800E3710 = 0x800E3710; -__osPiDevMgr = 0x800E3740; -D_800E3748 = 0x800E3748; -D_800E3760 = 0x800E3760; -D_800E3764 = 0x800E3764; -gzip_inflate_input = 0x800E3768; -gzip_inflate_output = 0x800E376C; -D_800E3770 = 0x800E3770; -D_800E3774 = 0x800E3774; -D_800E3778 = 0x800E3778; -D_800E377C = 0x800E377C; -alGlobals = 0x800E3780; -D_800E3790 = 0x800E3790; eqpower = 0x800E37A0; -D_800E38A0 = 0x800E38A0; -D_800E38A4 = 0x800E38A4; -D_800E38A8 = 0x800E38A8; -D_800E38AC = 0x800E38AC; -D_800E38B0 = 0x800E38B0; -D_800E38C0 = 0x800E38C0; -D_800E38D0 = 0x800E38D0; -__osViDevMgr = 0x800E38E0; -D_800E3900 = 0x800E3900; -D_800E4620 = 0x800E4620; -D_800E4670 = 0x800E4670; -D_800E46C0 = 0x800E46C0; -D_800E4710 = 0x800E4710; -D_800E4760 = 0x800E4760; -D_800E47B0 = 0x800E47B0; -__osPiAccessQueueEnabled = 0x800E4800; D_800E4810 = 0x800E4810; -__osViCurr = 0x800E4870; -__osViNext = 0x800E4874; D_800E4878 = 0x800E4878; -__osThreadTail = 0x800E4880; __RunQueue = 0x800E4888; __osActiveQueue = 0x800E488C; -__osRunningThread = 0x800E4890; -D_800E4894 = 0x800E4894; -D_800E48C0 = 0x800E48C0; -D_800E48E4 = 0x800E48E4; -D_800E4910 = 0x800E4910; -D_800E4920 = 0x800E4920; -D_800E4934 = 0x800E4934; -D_800E49DC = 0x800E49DC; -D_800E49E0 = 0x800E49E0; -D_800E49E4 = 0x800E49E4; -D_800E49E8 = 0x800E49E8; -D_800E49EC = 0x800E49EC; -D_800E4BB0 = 0x800E4BB0; -D_800E4BF0 = 0x800E4BF0; -D_800E4BF8 = 0x800E4BF8; D_800E4BFC = 0x800E4BFC; -D_800E4C00 = 0x800E4C00; -D_800E4C08 = 0x800E4C08; D_800E4C0C = 0x800E4C0C; -D_800E4C10 = 0x800E4C10; D_800E4C14 = 0x800E4C14; -D_800E4C18 = 0x800E4C18; D_800E4C1C = 0x800E4C1C; -D_800E4C20 = 0x800E4C20; D_800E4C24 = 0x800E4C24; -D_800E4C28 = 0x800E4C28; D_800E4C2C = 0x800E4C2C; -D_800E4C30 = 0x800E4C30; D_800E4C34 = 0x800E4C34; -D_800E4C38 = 0x800E4C38; -D_800E4C40 = 0x800E4C40; D_800E4C44 = 0x800E4C44; -D_800E4C48 = 0x800E4C48; D_800E4C4C = 0x800E4C4C; -D_800E4C50 = 0x800E4C50; D_800E4C54 = 0x800E4C54; -D_800E4C58 = 0x800E4C58; D_800E4C5C = 0x800E4C5C; -D_800E4C60 = 0x800E4C60; D_800E4C64 = 0x800E4C64; -D_800E4C68 = 0x800E4C68; D_800E4C6C = 0x800E4C6C; -D_800E4C70 = 0x800E4C70; -D_800E4C74 = 0x800E4C74; -D_800E4C78 = 0x800E4C78; -D_800E4C80 = 0x800E4C80; D_800E4C84 = 0x800E4C84; -D_800E4C88 = 0x800E4C88; D_800E4C8C = 0x800E4C8C; -D_800E4C90 = 0x800E4C90; D_800E4C94 = 0x800E4C94; -D_800E4C98 = 0x800E4C98; -D_800E4CA0 = 0x800E4CA0; D_800E4CA4 = 0x800E4CA4; -D_800E4CA8 = 0x800E4CA8; D_800E4CAC = 0x800E4CAC; -D_800E4CB0 = 0x800E4CB0; -D_800E4CB8 = 0x800E4CB8; D_800E4CBC = 0x800E4CBC; -D_800E4CC0 = 0x800E4CC0; -D_800E4CC4 = 0x800E4CC4; -D_800E4CC8 = 0x800E4CC8; D_800E4CCC = 0x800E4CCC; -D_800E4CD0 = 0x800E4CD0; -D_800E4CD4 = 0x800E4CD4; -D_800E4CD8 = 0x800E4CD8; D_800E4CDC = 0x800E4CDC; -D_800E4CE0 = 0x800E4CE0; -D_800E4CE8 = 0x800E4CE8; D_800E4CEC = 0x800E4CEC; -D_800E4CF0 = 0x800E4CF0; -D_800E4CF4 = 0x800E4CF4; -D_800E4CF8 = 0x800E4CF8; D_800E4CFC = 0x800E4CFC; -D_800E4F10 = 0x800E4F10; -D_800E4F14 = 0x800E4F14; -D_800E4F18 = 0x800E4F18; D_800E4F1C = 0x800E4F1C; -D_800E4F20 = 0x800E4F20; D_800E4F24 = 0x800E4F24; -D_800E50D4 = 0x800E50D4; -D_800E5130 = 0x800E5130; -D_800E5134 = 0x800E5134; -D_800E5138 = 0x800E5138; -D_800E513C = 0x800E513C; -D_800E5140 = 0x800E5140; -D_800E5144 = 0x800E5144; -D_800E5148 = 0x800E5148; -D_800E514C = 0x800E514C; -D_800E5150 = 0x800E5150; -D_800E5154 = 0x800E5154; -D_800E5178 = 0x800E5178; -D_800E517C = 0x800E517C; -D_800E5180 = 0x800E5180; -D_800E5184 = 0x800E5184; -D_800E5188 = 0x800E5188; -D_800E51AC = 0x800E51AC; -D_800E51B0 = 0x800E51B0; -D_800E51B4 = 0x800E51B4; -D_800E5250 = 0x800E5250; -D_800E5420 = 0x800E5420; -D_800E5538 = 0x800E5538; D_800E553C = 0x800E553C; -D_800E5540 = 0x800E5540; D_800E5544 = 0x800E5544; -D_800E5548 = 0x800E5548; D_800E554C = 0x800E554C; -D_800E5550 = 0x800E5550; -D_800E5554 = 0x800E5554; -D_800E5558 = 0x800E5558; -D_800E555C = 0x800E555C; -D_800E5560 = 0x800E5560; -D_800E5564 = 0x800E5564; -D_800E5568 = 0x800E5568; -D_800E556C = 0x800E556C; -D_800E5570 = 0x800E5570; -D_800E5578 = 0x800E5578; D_800E557C = 0x800E557C; -D_800E5580 = 0x800E5580; -D_800E5584 = 0x800E5584; -D_800E5588 = 0x800E5588; -D_800E55B8 = 0x800E55B8; D_800E55BC = 0x800E55BC; -D_800E55C0 = 0x800E55C0; D_800E55C4 = 0x800E55C4; -D_800E55C8 = 0x800E55C8; D_800E55CC = 0x800E55CC; -D_800E55D0 = 0x800E55D0; D_800E55D4 = 0x800E55D4; -D_800E55D8 = 0x800E55D8; D_800E55DC = 0x800E55DC; -D_800E55E0 = 0x800E55E0; D_800E55E4 = 0x800E55E4; -D_800E55E8 = 0x800E55E8; D_800E55EC = 0x800E55EC; -D_800E55F0 = 0x800E55F0; D_800E55F4 = 0x800E55F4; -D_800E55F8 = 0x800E55F8; D_800E55FC = 0x800E55FC; -D_800E5600 = 0x800E5600; D_800E5604 = 0x800E5604; -D_800E5608 = 0x800E5608; D_800E560C = 0x800E560C; -D_800E5610 = 0x800E5610; D_800E5614 = 0x800E5614; -D_800E5618 = 0x800E5618; D_800E561C = 0x800E561C; -D_800E5620 = 0x800E5620; D_800E5624 = 0x800E5624; -D_800E5628 = 0x800E5628; D_800E562C = 0x800E562C; -D_800E5630 = 0x800E5630; D_800E5634 = 0x800E5634; -D_800E5638 = 0x800E5638; -D_800E563C = 0x800E563C; -D_800E5640 = 0x800E5640; -D_800E5644 = 0x800E5644; -D_800E5648 = 0x800E5648; D_800E564C = 0x800E564C; -D_800E5650 = 0x800E5650; -D_800E5658 = 0x800E5658; D_800E565C = 0x800E565C; -D_800E5660 = 0x800E5660; -D_800E5668 = 0x800E5668; D_800E566C = 0x800E566C; -D_800E5670 = 0x800E5670; D_800E5674 = 0x800E5674; -D_800E5678 = 0x800E5678; -D_800E5680 = 0x800E5680; D_800E5684 = 0x800E5684; -D_800E5688 = 0x800E5688; -D_800E5864 = 0x800E5864; -D_800E5A3C = 0x800E5A3C; -D_800E5C0C = 0x800E5C0C; -D_800E5DF0 = 0x800E5DF0; -D_800E5E38 = 0x800E5E38; -D_800E5E60 = 0x800E5E60; D_800E5E64 = 0x800E5E64; -D_800E5E68 = 0x800E5E68; D_800E5E6C = 0x800E5E6C; -D_800E5E70 = 0x800E5E70; D_800E5E74 = 0x800E5E74; -D_800E5E78 = 0x800E5E78; D_800E5E7C = 0x800E5E7C; -D_800E5E80 = 0x800E5E80; D_800E5E84 = 0x800E5E84; -D_800E5E88 = 0x800E5E88; D_800E5E8C = 0x800E5E8C; -D_800E5E90 = 0x800E5E90; D_800E5E94 = 0x800E5E94; -D_800E5E98 = 0x800E5E98; D_800E5E9C = 0x800E5E9C; -D_800E5EA0 = 0x800E5EA0; D_800E5EA4 = 0x800E5EA4; -D_800E5EA8 = 0x800E5EA8; D_800E5EAC = 0x800E5EAC; -D_800E5EB0 = 0x800E5EB0; D_800E5EB4 = 0x800E5EB4; -D_800E5EB8 = 0x800E5EB8; D_800E5EBC = 0x800E5EBC; -D_800E5EC0 = 0x800E5EC0; -D_800E5F40 = 0x800E5F40; D_800E5F44 = 0x800E5F44; -D_800E5F48 = 0x800E5F48; -D_800E5F4C = 0x800E5F4C; -D_800E5F50 = 0x800E5F50; -D_800E5F54 = 0x800E5F54; -D_800E5F58 = 0x800E5F58; -D_800E5F5C = 0x800E5F5C; -D_800E5F60 = 0x800E5F60; -D_800E5F64 = 0x800E5F64; -D_800E5F68 = 0x800E5F68; -D_800E5F6C = 0x800E5F6C; -D_800E5F70 = 0x800E5F70; -D_800E5F80 = 0x800E5F80; -D_800E5FA0 = 0x800E5FA0; -D_800E5FB4 = 0x800E5FB4; -D_800E5FC8 = 0x800E5FC8; -D_800E5FE0 = 0x800E5FE0; D_800E5FE4 = 0x800E5FE4; -D_800E5FE8 = 0x800E5FE8; D_800E5FEC = 0x800E5FEC; -D_800E5FF0 = 0x800E5FF0; D_800E5FF4 = 0x800E5FF4; -D_800E5FF8 = 0x800E5FF8; D_800E5FFC = 0x800E5FFC; -D_800E6000 = 0x800E6000; -D_800E6004 = 0x800E6004; -D_800E6008 = 0x800E6008; -D_800E6010 = 0x800E6010; D_800E6014 = 0x800E6014; -D_800E6018 = 0x800E6018; D_800E601C = 0x800E601C; -D_800E6020 = 0x800E6020; D_800E6024 = 0x800E6024; -D_800E6028 = 0x800E6028; D_800E602C = 0x800E602C; -D_800E6030 = 0x800E6030; D_800E6034 = 0x800E6034; -D_800E6038 = 0x800E6038; D_800E603C = 0x800E603C; -D_800E6040 = 0x800E6040; D_800E6044 = 0x800E6044; -D_800E6048 = 0x800E6048; -D_800E6050 = 0x800E6050; D_800E6054 = 0x800E6054; -D_800E6058 = 0x800E6058; D_800E605C = 0x800E605C; -D_800E6060 = 0x800E6060; D_800E6064 = 0x800E6064; -D_800E6068 = 0x800E6068; D_800E606C = 0x800E606C; -D_800E6070 = 0x800E6070; -D_800E60C4 = 0x800E60C4; -D_800E6140 = 0x800E6140; D_800E6144 = 0x800E6144; -D_800E6148 = 0x800E6148; -D_800E6150 = 0x800E6150; D_800E6154 = 0x800E6154; -D_800E6158 = 0x800E6158; D_800E615C = 0x800E615C; -D_800E6160 = 0x800E6160; D_800E6164 = 0x800E6164; -D_800E6168 = 0x800E6168; D_800E616C = 0x800E616C; -D_800E6170 = 0x800E6170; D_800E6174 = 0x800E6174; -D_800E6178 = 0x800E6178; D_800E617C = 0x800E617C; -D_800E6180 = 0x800E6180; -D_800E6188 = 0x800E6188; D_800E618C = 0x800E618C; -D_800E6190 = 0x800E6190; D_800E6194 = 0x800E6194; -D_800E6198 = 0x800E6198; D_800E619C = 0x800E619C; -D_800E61A0 = 0x800E61A0; -D_800E61A8 = 0x800E61A8; D_800E61AC = 0x800E61AC; -D_800E61B0 = 0x800E61B0; -D_800E61B8 = 0x800E61B8; D_800E61BC = 0x800E61BC; -D_800E61C0 = 0x800E61C0; -D_800E61F0 = 0x800E61F0; D_800E61F4 = 0x800E61F4; -D_800E61F8 = 0x800E61F8; D_800E61FC = 0x800E61FC; -D_800E6200 = 0x800E6200; D_800E6204 = 0x800E6204; -D_800E6208 = 0x800E6208; -D_800E620C = 0x800E620C; -D_800E6210 = 0x800E6210; -D_800E6214 = 0x800E6214; -D_800E6218 = 0x800E6218; -D_800E621C = 0x800E621C; -D_800E6220 = 0x800E6220; -D_800E6224 = 0x800E6224; -D_800E6228 = 0x800E6228; -D_800E623C = 0x800E623C; -D_800E6240 = 0x800E6240; -D_800E6244 = 0x800E6244; -D_800E6248 = 0x800E6248; -D_800E6250 = 0x800E6250; D_800E6254 = 0x800E6254; -D_800E6258 = 0x800E6258; -D_800E626C = 0x800E626C; -D_800E6270 = 0x800E6270; -D_800E6274 = 0x800E6274; -D_800E6278 = 0x800E6278; -D_800E6280 = 0x800E6280; -D_800E62A8 = 0x800E62A8; D_800E62AC = 0x800E62AC; -D_800E62B0 = 0x800E62B0; D_800E62B4 = 0x800E62B4; -D_800E62B8 = 0x800E62B8; D_800E62BC = 0x800E62BC; -D_800E62C0 = 0x800E62C0; D_800E62C4 = 0x800E62C4; -D_800E62C8 = 0x800E62C8; D_800E62CC = 0x800E62CC; -D_800E62D0 = 0x800E62D0; D_800E62D4 = 0x800E62D4; -D_800E62D8 = 0x800E62D8; D_800E62DC = 0x800E62DC; -D_800E62E0 = 0x800E62E0; D_800E62E4 = 0x800E62E4; -D_800E62E8 = 0x800E62E8; D_800E62EC = 0x800E62EC; -D_800E62F0 = 0x800E62F0; D_800E62F4 = 0x800E62F4; -D_800E62F8 = 0x800E62F8; D_800E62FC = 0x800E62FC; -D_800E6300 = 0x800E6300; D_800E6304 = 0x800E6304; -D_800E6308 = 0x800E6308; D_800E630C = 0x800E630C; -D_800E6310 = 0x800E6310; D_800E6314 = 0x800E6314; -D_800E6318 = 0x800E6318; -D_800E6334 = 0x800E6334; -D_800E6350 = 0x800E6350; D_800E6354 = 0x800E6354; -D_800E6358 = 0x800E6358; -D_800E6378 = 0x800E6378; -D_800E637C = 0x800E637C; -D_800E63A0 = 0x800E63A0; D_800E63A4 = 0x800E63A4; -D_800E63A8 = 0x800E63A8; D_800E63AC = 0x800E63AC; -D_800E63B0 = 0x800E63B0; D_800E63B4 = 0x800E63B4; -D_800E63B8 = 0x800E63B8; D_800E63BC = 0x800E63BC; -D_800E63C0 = 0x800E63C0; D_800E63C4 = 0x800E63C4; -D_800E63C8 = 0x800E63C8; D_800E63CC = 0x800E63CC; -D_800E63D0 = 0x800E63D0; D_800E63D4 = 0x800E63D4; -D_800E63D8 = 0x800E63D8; -D_800E63E0 = 0x800E63E0; D_800E63E4 = 0x800E63E4; -D_800E63E8 = 0x800E63E8; D_800E63EC = 0x800E63EC; -D_800E63F0 = 0x800E63F0; -D_800E63F8 = 0x800E63F8; D_800E63FC = 0x800E63FC; -D_800E6400 = 0x800E6400; D_800E6404 = 0x800E6404; -D_800E6408 = 0x800E6408; D_800E640C = 0x800E640C; -D_800E6410 = 0x800E6410; D_800E6414 = 0x800E6414; -D_800E6418 = 0x800E6418; D_800E641C = 0x800E641C; -D_800E6420 = 0x800E6420; D_800E6424 = 0x800E6424; -D_800E6428 = 0x800E6428; D_800E642C = 0x800E642C; -D_800E6430 = 0x800E6430; D_800E6434 = 0x800E6434; -D_800E6438 = 0x800E6438; D_800E643C = 0x800E643C; -D_800E6440 = 0x800E6440; D_800E6444 = 0x800E6444; -D_800E6448 = 0x800E6448; D_800E644C = 0x800E644C; -D_800E6450 = 0x800E6450; -D_800E6458 = 0x800E6458; D_800E645C = 0x800E645C; -D_800E6460 = 0x800E6460; D_800E6464 = 0x800E6464; -D_800E6468 = 0x800E6468; -D_800E646C = 0x800E646C; -D_800E6488 = 0x800E6488; D_800E648C = 0x800E648C; -D_800E6490 = 0x800E6490; D_800E6494 = 0x800E6494; -D_800E6498 = 0x800E6498; D_800E649C = 0x800E649C; -D_800E64A0 = 0x800E64A0; D_800E64A4 = 0x800E64A4; -D_800E64A8 = 0x800E64A8; D_800E64AC = 0x800E64AC; -D_800E64B0 = 0x800E64B0; D_800E64B4 = 0x800E64B4; -D_800E64B8 = 0x800E64B8; D_800E64BC = 0x800E64BC; -D_800E64C0 = 0x800E64C0; D_800E64C4 = 0x800E64C4; -D_800E64C8 = 0x800E64C8; D_800E64CC = 0x800E64CC; -D_800E64D0 = 0x800E64D0; D_800E64D4 = 0x800E64D4; -D_800E64D8 = 0x800E64D8; -D_800E64E0 = 0x800E64E0; D_800E64E4 = 0x800E64E4; -D_800E64E8 = 0x800E64E8; -D_800E64EC = 0x800E64EC; -D_800E64F0 = 0x800E64F0; -D_800E64F4 = 0x800E64F4; -D_800E64F8 = 0x800E64F8; D_800E64FC = 0x800E64FC; -D_800E6500 = 0x800E6500; D_800E6504 = 0x800E6504; -D_800E6508 = 0x800E6508; -D_800E6510 = 0x800E6510; D_800E6514 = 0x800E6514; -D_800E6518 = 0x800E6518; D_800E651C = 0x800E651C; -D_800E6520 = 0x800E6520; D_800E6524 = 0x800E6524; -D_800E6528 = 0x800E6528; -D_800E6530 = 0x800E6530; D_800E6534 = 0x800E6534; -D_800E6538 = 0x800E6538; D_800E653C = 0x800E653C; -D_800E6540 = 0x800E6540; D_800E6544 = 0x800E6544; -D_800E6548 = 0x800E6548; D_800E654C = 0x800E654C; -D_800E6550 = 0x800E6550; D_800E6554 = 0x800E6554; -D_800E6558 = 0x800E6558; D_800E655C = 0x800E655C; -D_800E6560 = 0x800E6560; D_800E6564 = 0x800E6564; -D_800E6568 = 0x800E6568; -D_800E6570 = 0x800E6570; D_800E6574 = 0x800E6574; -D_800E6578 = 0x800E6578; D_800E657C = 0x800E657C; -D_800E6580 = 0x800E6580; -D_800E6584 = 0x800E6584; -D_800E6588 = 0x800E6588; -D_800E658C = 0x800E658C; -D_800E6590 = 0x800E6590; D_800E6594 = 0x800E6594; -D_800E6598 = 0x800E6598; D_800E659C = 0x800E659C; -D_800E65A0 = 0x800E65A0; -D_800E65A4 = 0x800E65A4; -D_800E65A8 = 0x800E65A8; -D_800E65AC = 0x800E65AC; -D_800E65B0 = 0x800E65B0; -D_800E65E8 = 0x800E65E8; -D_800E65EC = 0x800E65EC; -D_800E65F0 = 0x800E65F0; -D_800E65F4 = 0x800E65F4; -D_800E65F8 = 0x800E65F8; D_800E65FC = 0x800E65FC; -D_800E6600 = 0x800E6600; D_800E6604 = 0x800E6604; -D_800E6608 = 0x800E6608; D_800E660C = 0x800E660C; -D_800E6610 = 0x800E6610; D_800E6614 = 0x800E6614; -D_800E6618 = 0x800E6618; D_800E661C = 0x800E661C; -D_800E6620 = 0x800E6620; D_800E6624 = 0x800E6624; -D_800E6628 = 0x800E6628; D_800E662C = 0x800E662C; -D_800E6630 = 0x800E6630; D_800E6634 = 0x800E6634; -D_800E6638 = 0x800E6638; D_800E663C = 0x800E663C; -D_800E6640 = 0x800E6640; D_800E6644 = 0x800E6644; -D_800E6648 = 0x800E6648; D_800E664C = 0x800E664C; -D_800E6650 = 0x800E6650; D_800E6654 = 0x800E6654; -D_800E6658 = 0x800E6658; D_800E665C = 0x800E665C; -D_800E6660 = 0x800E6660; -D_800E6668 = 0x800E6668; D_800E666C = 0x800E666C; -D_800E6670 = 0x800E6670; D_800E6674 = 0x800E6674; -D_800E6678 = 0x800E6678; D_800E667C = 0x800E667C; -D_800E6680 = 0x800E6680; D_800E6684 = 0x800E6684; -D_800E6688 = 0x800E6688; D_800E668C = 0x800E668C; -D_800E6690 = 0x800E6690; D_800E6694 = 0x800E6694; -D_800E6698 = 0x800E6698; D_800E669C = 0x800E669C; -D_800E66A0 = 0x800E66A0; D_800E66A4 = 0x800E66A4; -D_800E66A8 = 0x800E66A8; D_800E66AC = 0x800E66AC; -D_800E66B0 = 0x800E66B0; D_800E66B4 = 0x800E66B4; -D_800E66B8 = 0x800E66B8; D_800E66BC = 0x800E66BC; -D_800E66C0 = 0x800E66C0; -D_800E66C8 = 0x800E66C8; D_800E66CC = 0x800E66CC; -D_800E66D0 = 0x800E66D0; -D_800E66F0 = 0x800E66F0; D_800E66F4 = 0x800E66F4; -D_800E66F8 = 0x800E66F8; D_800E66FC = 0x800E66FC; -D_800E6700 = 0x800E6700; D_800E6704 = 0x800E6704; -D_800E6708 = 0x800E6708; D_800E670C = 0x800E670C; -D_800E6710 = 0x800E6710; D_800E6714 = 0x800E6714; -D_800E6718 = 0x800E6718; D_800E671C = 0x800E671C; -D_800E6720 = 0x800E6720; -D_800E6728 = 0x800E6728; D_800E672C = 0x800E672C; -D_800E6730 = 0x800E6730; D_800E6734 = 0x800E6734; -D_800E6738 = 0x800E6738; D_800E673C = 0x800E673C; -D_800E6740 = 0x800E6740; D_800E6744 = 0x800E6744; -D_800E6748 = 0x800E6748; D_800E674C = 0x800E674C; -D_800E6750 = 0x800E6750; D_800E6754 = 0x800E6754; -D_800E6758 = 0x800E6758; -D_800E6760 = 0x800E6760; D_800E6764 = 0x800E6764; -D_800E6768 = 0x800E6768; -D_800E676C = 0x800E676C; -D_800E6770 = 0x800E6770; -D_800E6778 = 0x800E6778; -D_800E6780 = 0x800E6780; -D_800E6784 = 0x800E6784; -D_800E6788 = 0x800E6788; D_800E678C = 0x800E678C; -D_800E6790 = 0x800E6790; D_800E6794 = 0x800E6794; -D_800E6798 = 0x800E6798; D_800E679C = 0x800E679C; -D_800E67A0 = 0x800E67A0; -D_800E67A4 = 0x800E67A4; -D_800E67C0 = 0x800E67C0; D_800E67C4 = 0x800E67C4; -D_800E67C8 = 0x800E67C8; D_800E67CC = 0x800E67CC; -D_800E67D0 = 0x800E67D0; D_800E67D4 = 0x800E67D4; -D_800E67D8 = 0x800E67D8; D_800E67DC = 0x800E67DC; -D_800E67E0 = 0x800E67E0; D_800E67E4 = 0x800E67E4; -D_800E67E8 = 0x800E67E8; D_800E67EC = 0x800E67EC; -D_800E67F0 = 0x800E67F0; D_800E67F4 = 0x800E67F4; -D_800E67F8 = 0x800E67F8; D_800E67FC = 0x800E67FC; -D_800E6800 = 0x800E6800; -D_800E6808 = 0x800E6808; D_800E680C = 0x800E680C; -D_800E6810 = 0x800E6810; D_800E6814 = 0x800E6814; -D_800E6818 = 0x800E6818; D_800E681C = 0x800E681C; -D_800E6820 = 0x800E6820; D_800E6824 = 0x800E6824; -D_800E6828 = 0x800E6828; D_800E682C = 0x800E682C; -D_800E6830 = 0x800E6830; D_800E6834 = 0x800E6834; -D_800E6838 = 0x800E6838; D_800E683C = 0x800E683C; -D_800E6840 = 0x800E6840; D_800E6844 = 0x800E6844; -D_800E6848 = 0x800E6848; D_800E684C = 0x800E684C; -D_800E6850 = 0x800E6850; -D_800E6854 = 0x800E6854; -D_800E6894 = 0x800E6894; -D_800E68C4 = 0x800E68C4; -D_800E68C8 = 0x800E68C8; -D_800E68CC = 0x800E68CC; -D_800E68D0 = 0x800E68D0; -D_800E68F0 = 0x800E68F0; D_800E68F4 = 0x800E68F4; -D_800E68F8 = 0x800E68F8; D_800E68FC = 0x800E68FC; -D_800E6900 = 0x800E6900; D_800E6904 = 0x800E6904; -D_800E6908 = 0x800E6908; D_800E690C = 0x800E690C; -D_800E6910 = 0x800E6910; D_800E6914 = 0x800E6914; -D_800E6918 = 0x800E6918; D_800E691C = 0x800E691C; -D_800E6920 = 0x800E6920; D_800E6924 = 0x800E6924; -D_800E6928 = 0x800E6928; D_800E692C = 0x800E692C; -D_800E6930 = 0x800E6930; D_800E6934 = 0x800E6934; -D_800E6938 = 0x800E6938; D_800E693C = 0x800E693C; -D_800E6940 = 0x800E6940; D_800E6944 = 0x800E6944; -D_800E6948 = 0x800E6948; -D_800E694C = 0x800E694C; -D_800E6950 = 0x800E6950; D_800E6954 = 0x800E6954; -D_800E6958 = 0x800E6958; -D_800E6960 = 0x800E6960; D_800E6964 = 0x800E6964; -D_800E6968 = 0x800E6968; -D_800E69A0 = 0x800E69A0; D_800E69A4 = 0x800E69A4; -D_800E69A8 = 0x800E69A8; -D_800E69AC = 0x800E69AC; -D_800E69B0 = 0x800E69B0; -D_800E69B8 = 0x800E69B8; D_800E69BC = 0x800E69BC; -D_800E69C0 = 0x800E69C0; D_800E69C4 = 0x800E69C4; -D_800E69C8 = 0x800E69C8; D_800E69CC = 0x800E69CC; -D_800E69D0 = 0x800E69D0; D_800E69D4 = 0x800E69D4; -D_800E69D8 = 0x800E69D8; D_800E69DC = 0x800E69DC; -D_800E69E0 = 0x800E69E0; D_800E69E4 = 0x800E69E4; -D_800E69E8 = 0x800E69E8; -D_800E69F0 = 0x800E69F0; D_800E69F4 = 0x800E69F4; -D_800E69F8 = 0x800E69F8; D_800E69FC = 0x800E69FC; -D_800E6A00 = 0x800E6A00; -D_800E6A10 = 0x800E6A10; D_800E6A14 = 0x800E6A14; -D_800E6A18 = 0x800E6A18; D_800E6A1C = 0x800E6A1C; -D_800E6A20 = 0x800E6A20; D_800E6A24 = 0x800E6A24; -D_800E6A28 = 0x800E6A28; D_800E6A2C = 0x800E6A2C; -D_800E6A30 = 0x800E6A30; D_800E6A34 = 0x800E6A34; -D_800E6A38 = 0x800E6A38; D_800E6A3C = 0x800E6A3C; -D_800E6A40 = 0x800E6A40; D_800E6A44 = 0x800E6A44; -D_800E6A48 = 0x800E6A48; D_800E6A4C = 0x800E6A4C; -D_800E6A50 = 0x800E6A50; D_800E6A54 = 0x800E6A54; -D_800E6A58 = 0x800E6A58; D_800E6A5C = 0x800E6A5C; -D_800E6A60 = 0x800E6A60; D_800E6A64 = 0x800E6A64; -D_800E6A68 = 0x800E6A68; D_800E6A6C = 0x800E6A6C; -D_800E6A70 = 0x800E6A70; -D_800E6A88 = 0x800E6A88; D_800E6A8C = 0x800E6A8C; -D_800E6A90 = 0x800E6A90; D_800E6A94 = 0x800E6A94; -D_800E6A98 = 0x800E6A98; D_800E6A9C = 0x800E6A9C; -D_800E6AA0 = 0x800E6AA0; D_800E6AA4 = 0x800E6AA4; -D_800E6AA8 = 0x800E6AA8; D_800E6AAC = 0x800E6AAC; -D_800E6AB0 = 0x800E6AB0; D_800E6AB4 = 0x800E6AB4; -D_800E6AB8 = 0x800E6AB8; D_800E6ABC = 0x800E6ABC; -D_800E6AC0 = 0x800E6AC0; D_800E6AC4 = 0x800E6AC4; -D_800E6AC8 = 0x800E6AC8; D_800E6ACC = 0x800E6ACC; -D_800E6AD0 = 0x800E6AD0; -D_800E6AE8 = 0x800E6AE8; D_800E6AEC = 0x800E6AEC; -D_800E6AF0 = 0x800E6AF0; D_800E6AF4 = 0x800E6AF4; -D_800E6B00 = 0x800E6B00; D_800E6B04 = 0x800E6B04; -D_800E6B08 = 0x800E6B08; D_800E6B0C = 0x800E6B0C; -D_800E6B10 = 0x800E6B10; D_800E6B14 = 0x800E6B14; -D_800E6C30 = 0x800E6C30; -D_800E6C90 = 0x800E6C90; -D_800E6CE0 = 0x800E6CE0; -D_800E6E70 = 0x800E6E70; -D_800E6E90 = 0x800E6E90; -D_800E6E94 = 0x800E6E94; -D_800E6EA0 = 0x800E6EA0; -D_800E6EB8 = 0x800E6EB8; -D_800E6EBC = 0x800E6EBC; -D_800E6EC0 = 0x800E6EC0; D_800E6EC4 = 0x800E6EC4; -D_800E6ED0 = 0x800E6ED0; -D_800E7078 = 0x800E7078; -D_800E707C = 0x800E707C; -D_800E7084 = 0x800E7084; -D_800E7088 = 0x800E7088; -D_800E708C = 0x800E708C; -D_800E7094 = 0x800E7094; -D_800E7098 = 0x800E7098; -D_800E709C = 0x800E709C; -D_800E70A0 = 0x800E70A0; -D_800E70A4 = 0x800E70A4; -D_800E7134 = 0x800E7134; -D_800E7154 = 0x800E7154; -D_800E7188 = 0x800E7188; -D_800E71B8 = 0x800E71B8; -D_800E71D8 = 0x800E71D8; -D_800E7528 = 0x800E7528; -D_800E7530 = 0x800E7530; -D_800E753C = 0x800E753C; -D_800E7548 = 0x800E7548; -D_800E7554 = 0x800E7554; -D_800E7560 = 0x800E7560; -D_800E756C = 0x800E756C; -D_800E7578 = 0x800E7578; -D_800E7584 = 0x800E7584; -D_800E7630 = 0x800E7630; -D_800E7640 = 0x800E7640; -D_800E7650 = 0x800E7650; -D_800E7660 = 0x800E7660; -D_800E7670 = 0x800E7670; -D_800E7680 = 0x800E7680; -D_800E7690 = 0x800E7690; -D_800E76A0 = 0x800E76A0; -D_800E773C = 0x800E773C; D_800E774C = 0x800E774C; -D_800E7768 = 0x800E7768; D_800E7778 = 0x800E7778; -D_800E777C = 0x800E777C; D_800E778C = 0x800E778C; -D_800E7790 = 0x800E7790; D_800E77A0 = 0x800E77A0; -D_800E77A4 = 0x800E77A4; D_800E77B4 = 0x800E77B4; -D_800E77B8 = 0x800E77B8; D_800E77C8 = 0x800E77C8; -D_800E77CC = 0x800E77CC; D_800E77DC = 0x800E77DC; -D_800E77E0 = 0x800E77E0; D_800E77E4 = 0x800E77E4; -D_800E77E8 = 0x800E77E8; D_800E77EC = 0x800E77EC; -D_800E77F0 = 0x800E77F0; D_800E77F4 = 0x800E77F4; -D_800E796C = 0x800E796C; -D_800E7970 = 0x800E7970; -D_800E7AFC = 0x800E7AFC; -D_800E7B00 = 0x800E7B00; -D_800E7B04 = 0x800E7B04; -D_800E7B08 = 0x800E7B08; -D_800E7B0C = 0x800E7B0C; -D_800E7C90 = 0x800E7C90; -D_800E8208 = 0x800E8208; -D_800E820C = 0x800E820C; -D_800E8210 = 0x800E8210; -D_800E8214 = 0x800E8214; -D_800E8218 = 0x800E8218; -D_800E8230 = 0x800E8230; -D_800E8234 = 0x800E8234; -D_800E8238 = 0x800E8238; -D_800E823C = 0x800E823C; -D_800E8240 = 0x800E8240; -D_800E8244 = 0x800E8244; -D_800E8248 = 0x800E8248; -D_800E824C = 0x800E824C; -D_800E8284 = 0x800E8284; -D_800E82F8 = 0x800E82F8; -D_800E836C = 0x800E836C; -D_800E838C = 0x800E838C; -D_800E8390 = 0x800E8390; -D_800E8398 = 0x800E8398; D_800E839C = 0x800E839C; -D_800E83A0 = 0x800E83A0; D_800E83A4 = 0x800E83A4; -D_800E83A8 = 0x800E83A8; D_800E83AC = 0x800E83AC; -D_800E83B0 = 0x800E83B0; -D_800E83B4 = 0x800E83B4; -D_800E83B8 = 0x800E83B8; -D_800E83E0 = 0x800E83E0; -D_800E8400 = 0x800E8400; -D_800E8414 = 0x800E8414; -D_800E8418 = 0x800E8418; -D_800E8440 = 0x800E8440; -D_800E8464 = 0x800E8464; - -D_800E8488 = 0x800E8488; -D_800E84B0 = 0x800E84B0; -D_800E84D0 = 0x800E84D0; D_800E84D4 = 0x800E84D4; -D_800E84D8 = 0x800E84D8; -D_800E84E0 = 0x800E84E0; D_800E84E4 = 0x800E84E4; -D_800E84E8 = 0x800E84E8; D_800E84EC = 0x800E84EC; -D_800E84F0 = 0x800E84F0; -D_800E84F4 = 0x800E84F4; -D_800E8508 = 0x800E8508; -D_800E8520 = 0x800E8520; -D_800E8524 = 0x800E8524; -D_800E8548 = 0x800E8548; -D_800E856C = 0x800E856C; -D_800E8570 = 0x800E8570; -D_800E8574 = 0x800E8574; -D_800E8588 = 0x800E8588; -D_800E85A0 = 0x800E85A0; -D_800E85E0 = 0x800E85E0; -D_800E860C = 0x800E860C; -D_800E8640 = 0x800E8640; -D_800E8648 = 0x800E8648; -D_800E8650 = 0x800E8650; -D_800E8658 = 0x800E8658; -D_800E8664 = 0x800E8664; -D_800E8668 = 0x800E8668; -D_800E8670 = 0x800E8670; -D_800E867C = 0x800E867C; -D_800E8680 = 0x800E8680; -D_800E8688 = 0x800E8688; -D_800E8690 = 0x800E8690; -D_800E8694 = 0x800E8694; -D_800E86A8 = 0x800E86A8; D_800E86AC = 0x800E86AC; -D_800E86B8 = 0x800E86B8; -D_800E86BC = 0x800E86BC; -D_800E86C0 = 0x800E86C0; -D_800E86E8 = 0x800E86E8; D_800E86EC = 0x800E86EC; -D_800E86F0 = 0x800E86F0; D_800E86F4 = 0x800E86F4; -D_800E86F8 = 0x800E86F8; -D_800E8718 = 0x800E8718; -D_800E8720 = 0x800E8720; D_800E8724 = 0x800E8724; -D_800E8728 = 0x800E8728; D_800E872C = 0x800E872C; -D_800E8730 = 0x800E8730; D_800E8734 = 0x800E8734; -D_800E8738 = 0x800E8738; D_800E873C = 0x800E873C; -D_800E8740 = 0x800E8740; -D_800E8744 = 0x800E8744; -D_800E8758 = 0x800E8758; D_800E875C = 0x800E875C; -D_800E8760 = 0x800E8760; D_800E8764 = 0x800E8764; -D_800E8768 = 0x800E8768; -D_800E8780 = 0x800E8780; D_800E8784 = 0x800E8784; -D_800E8788 = 0x800E8788; D_800E878C = 0x800E878C; -D_800E8790 = 0x800E8790; D_800E8794 = 0x800E8794; -D_800E8798 = 0x800E8798; D_800E879C = 0x800E879C; -D_800E87A0 = 0x800E87A0; D_800E87A4 = 0x800E87A4; -D_800E87A8 = 0x800E87A8; -D_800E87B8 = 0x800E87B8; D_800E87BC = 0x800E87BC; -D_800E87C0 = 0x800E87C0; D_800E87C4 = 0x800E87C4; -D_800E87C8 = 0x800E87C8; D_800E87CC = 0x800E87CC; -D_800E87D0 = 0x800E87D0; -D_800E87D4 = 0x800E87D4; -D_800E87D8 = 0x800E87D8; -D_800E87E0 = 0x800E87E0; D_800E87E4 = 0x800E87E4; -D_800E8B98 = 0x800E8B98; D_800E8B9C = 0x800E8B9C; -D_800E8BA0 = 0x800E8BA0; D_800E8BA4 = 0x800E8BA4; -D_800E8BA8 = 0x800E8BA8; D_800E8BAC = 0x800E8BAC; -D_800E8BB0 = 0x800E8BB0; D_800E8BB4 = 0x800E8BB4; -D_800E8BB8 = 0x800E8BB8; D_800E8BBC = 0x800E8BBC; -D_800E8BC0 = 0x800E8BC0; D_800E8BC4 = 0x800E8BC4; -D_800E8BC8 = 0x800E8BC8; D_800E8BCC = 0x800E8BCC; -D_800E8BD0 = 0x800E8BD0; D_800E8BD4 = 0x800E8BD4; -D_800E8BD8 = 0x800E8BD8; -D_800E8BDC = 0x800E8BDC; -D_800E8BF0 = 0x800E8BF0; -D_800E8BF4 = 0x800E8BF4; -D_800E8C00 = 0x800E8C00; -D_800E8C28 = 0x800E8C28; -D_800E8C50 = 0x800E8C50; -D_800E8C54 = 0x800E8C54; -D_800E8C5C = 0x800E8C5C; -D_800E8CAC = 0x800E8CAC; -D_800E8CF0 = 0x800E8CF0; -D_800E8D88 = 0x800E8D88; -D_800E8E58 = 0x800E8E58; -D_800E8EDC = 0x800E8EDC; D_800E8EE4 = 0x800E8EE4; -D_800E8EE8 = 0x800E8EE8; D_800E8EF0 = 0x800E8EF0; -D_800E8EF4 = 0x800E8EF4; D_800E8EFC = 0x800E8EFC; -D_800E8F18 = 0x800E8F18; -D_800E8F28 = 0x800E8F28; -D_800E8F44 = 0x800E8F44; -D_800E8F50 = 0x800E8F50; -D_800E8F58 = 0x800E8F58; -D_800E8F5C = 0x800E8F5C; -D_800E8F6C = 0x800E8F6C; -D_800E8F84 = 0x800E8F84; -D_800E8F94 = 0x800E8F94; -D_800E8FA4 = 0x800E8FA4; -D_800E8FB4 = 0x800E8FB4; -D_800E8FC8 = 0x800E8FC8; -D_800E8FD4 = 0x800E8FD4; -D_800E8FDC = 0x800E8FDC; -D_800E8FE0 = 0x800E8FE0; -D_800E9000 = 0x800E9000; -D_800E9020 = 0x800E9020; -D_800E9040 = 0x800E9040; -D_800E9060 = 0x800E9060; -D_800E9080 = 0x800E9080; -D_800E90A0 = 0x800E90A0; -D_800E90C0 = 0x800E90C0; -D_800E90E0 = 0x800E90E0; -D_800E9100 = 0x800E9100; -D_800E9118 = 0x800E9118; -D_800E912C = 0x800E912C; -D_800E9130 = 0x800E9130; -D_800E9138 = 0x800E9138; -D_800E913C = 0x800E913C; -D_800E92A0 = 0x800E92A0; -D_800E92A4 = 0x800E92A4; -D_800E92A8 = 0x800E92A8; -D_800E92AC = 0x800E92AC; -D_800E92B0 = 0x800E92B0; -D_800E92B4 = 0x800E92B4; -D_800E92B8 = 0x800E92B8; -D_800E92BC = 0x800E92BC; -D_800E92C0 = 0x800E92C0; -D_800E92C4 = 0x800E92C4; -D_800E92D0 = 0x800E92D0; -D_800E92EC = 0x800E92EC; -D_800E9308 = 0x800E9308; -D_800E930C = 0x800E930C; -D_800E9310 = 0x800E9310; -D_800E932C = 0x800E932C; -D_800E9330 = 0x800E9330; -D_800E9360 = 0x800E9360; -gzip_border = 0x800E93C0; -gzip_cplens = 0x800E93D4; -gzip_cplext = 0x800E9412; -gzip_cpdist = 0x800E9432; -gzip_cpdext = 0x800E946E; -gzip_mask_bits = 0x800E948C; -D_800E94C0 = 0x800E94C0; -D_800E94C4 = 0x800E94C4; -D_800E94D0 = 0x800E94D0; -D_800E9550 = 0x800E9550; -D_800E9558 = 0x800E9558; -D_800E9560 = 0x800E9560; -D_800E9570 = 0x800E9570; -D_800E9578 = 0x800E9578; -D_800E9598 = 0x800E9598; -D_800E95A0 = 0x800E95A0; -D_800E95A8 = 0x800E95A8; -D_800E95B0 = 0x800E95B0; -D_800E95F8 = 0x800E95F8; D_800E95FC = 0x800E95FC; -D_800E9600 = 0x800E9600; -D_800E9628 = 0x800E9628; -D_800E9640 = 0x800E9640; -D_800E9650 = 0x800E9650; -D_800E9670 = 0x800E9670; -D_800E9690 = 0x800E9690; -D_800E96C0 = 0x800E96C0; -D_800E96C4 = 0x800E96C4; -D_800E96CC = 0x800E96CC; -D_800E96E4 = 0x800E96E4; -D_800E97C0 = 0x800E97C0; -D_800E97E8 = 0x800E97E8; -D_800E97F0 = 0x800E97F0; -D_800E97F8 = 0x800E97F8; -D_800E9800 = 0x800E9800; -D_800E9810 = 0x800E9810; -D_800E9838 = 0x800E9838; -D_800E9840 = 0x800E9840; -D_800E9848 = 0x800E9848; -D_800E9850 = 0x800E9850; -D_800E9860 = 0x800E9860; -D_800E98A8 = 0x800E98A8; -D_800E98AC = 0x800E98AC; -D_800E98B0 = 0x800E98B0; -D_800E98B8 = 0x800E98B8; -D_800E98C0 = 0x800E98C0; -D_800E98D0 = 0x800E98D0; + D_800EA3A0 = 0x800EA3A0; D_800EABA0 = 0x800EABA0; D_800EBF60 = 0x800EBF60; @@ -1885,7 +428,6 @@ D_80116198 = 0x80116198; D_801161B0 = 0x801161B0; ALGlobals_801161D0 = 0x801161D0; D_80116220 = 0x80116220; -D_801183B4 = 0x801183B4; D_80119230 = 0x80119230; D_80119240 = 0x80119240; D_80119254 = 0x80119254; @@ -2319,7 +861,6 @@ D_80121220 = 0x80121220; D_80121224 = 0x80121224; D_80121228 = 0x80121228; D_80121250 = 0x80121250; -D_80121252 = 0x80121252; D_80121260 = 0x80121260; D_801234E8 = 0x801234E8; D_801234EC = 0x801234EC; @@ -2486,30 +1027,14 @@ D_80126448 = 0x80126448; D_8012644C = 0x8012644C; D_80126450 = 0x80126450; D_80126454 = 0x80126454; -D_80126455 = 0x80126455; -D_80126456 = 0x80126456; -D_80126457 = 0x80126457; D_80126458 = 0x80126458; -D_80126459 = 0x80126459; -D_8012645A = 0x8012645A; -D_8012645B = 0x8012645B; D_8012645C = 0x8012645C; D_8012645D = 0x8012645D; -D_8012645E = 0x8012645E; -D_8012645F = 0x8012645F; D_80126460 = 0x80126460; D_80126464 = 0x80126464; D_80126465 = 0x80126465; -D_80126466 = 0x80126466; -D_80126467 = 0x80126467; D_80126468 = 0x80126468; -D_80126469 = 0x80126469; -D_8012646A = 0x8012646A; -D_8012646B = 0x8012646B; D_8012646C = 0x8012646C; -D_8012646D = 0x8012646D; -D_8012646E = 0x8012646E; -D_8012646F = 0x8012646F; D_80126470 = 0x80126470; D_80126474 = 0x80126474; D_80126478 = 0x80126478; @@ -2622,7 +1147,6 @@ D_80126A38 = 0x80126A38; D_80126A3C = 0x80126A3C; D_80126A40 = 0x80126A40; D_80126A60 = 0x80126A60; -D_80126A61 = 0x80126A61; D_80126A64 = 0x80126A64; D_80126A68 = 0x80126A68; D_80126A6C = 0x80126A6C; @@ -2634,7 +1158,6 @@ D_80126A90 = 0x80126A90; D_80126A94 = 0x80126A94; D_80126A98 = 0x80126A98; D_80126AA0 = 0x80126AA0; -D_80126AA4 = 0x80126AA4; D_80126AE0 = 0x80126AE0; D_80126B20 = 0x80126B20; D_80126B60 = 0x80126B60; @@ -2981,7 +1504,6 @@ D_8012D3F0 = 0x8012D3F0; D_8012FFFF = 0x8012FFFF; D_A0000200 = 0xA0000200; D_A0000284 = 0xA0000284; -D_A4000000 = 0xA4000000; SP_IMEM = 0xA4001000; D_A4040004 = 0xA4040004; D_A4040008 = 0xA4040008; @@ -3021,4 +1543,4 @@ D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; D_FF7F0001 = 0xFF7F0001; D_FFFDFFFB = 0xFFFDFFFB; -D_FFFF0028 = 0xFFFF0028; +D_FFFF0028 = 0xFFFF0028; \ No newline at end of file From e4d6fe6257818f8e80f9000cb81097b50e9a122d Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 15:57:42 -0500 Subject: [PATCH 02/39] more progress with undefined_syms --- asm/assets/ucode_data.s | 7 ++ asm/assets/ucode_text.s | 9 +++ asm/entrypoint.s | 4 +- .../unknown_003260/func_80002C00.s | 12 ++-- .../unknown_066AA0/func_8006C60C.s | 4 +- .../unknown_078050/setupOSTasks.s | 64 +++++++++---------- .../unknown_080500/MenuBootInit.s | 26 ++++---- .../unknown_080500/MenuTitleScreenInit.s | 26 ++++---- .../unknown_080500/MenuTitleScreenLoop.s | 4 +- .../unknown_080500/func_80094D28.s | 4 +- .../unknown_080500/func_80095728.s | 4 +- asm/unknown_070110.s | 4 +- lib/asm/exception.s | 2 +- .../{D_800D35A0.s => __osCleanupThread.s} | 2 +- src/unknown_06B2B0.c | 15 ++++- tools/python/generate_assets.py | 28 +++++--- undefined_syms.txt | 25 ++------ 17 files changed, 129 insertions(+), 111 deletions(-) rename lib/asm/exception/{D_800D35A0.s => __osCleanupThread.s} (87%) diff --git a/asm/assets/ucode_data.s b/asm/assets/ucode_data.s index 150b43bf..740cfcaa 100644 --- a/asm/assets/ucode_data.s +++ b/asm/assets/ucode_data.s @@ -1,6 +1,13 @@ # This file was generated by generate_ld.py +.include "globals.inc" +.include "macros.inc" + +glabel rspF3DDKRDataDramStart .incbin "./build/us_1.0/ucode/data_f3ddkr_dram.bin" +glabel rspF3DDKRDataFifoStart .incbin "./build/us_1.0/ucode/data_f3ddkr_fifo.bin" +glabel rspF3DDKRDataXbusStart .incbin "./build/us_1.0/ucode/data_f3ddkr_xbus.bin" +glabel rspUnknownDataStart .incbin "./build/us_1.0/ucode/data_unknown.bin" diff --git a/asm/assets/ucode_text.s b/asm/assets/ucode_text.s index 11ae9d94..4480ce61 100644 --- a/asm/assets/ucode_text.s +++ b/asm/assets/ucode_text.s @@ -1,8 +1,17 @@ # This file was generated by generate_ld.py +.include "globals.inc" +.include "macros.inc" + +glabel rspUnknownStart .incbin "./build/us_1.0/ucode/ucode_unknown.bin" +glabel rspF3DDKRBootStart .incbin "./build/us_1.0/ucode/ucode_boot.bin" +glabel rspF3DDKRDramStart .incbin "./build/us_1.0/ucode/ucode_f3ddkr_dram.bin" +glabel rspF3DDKRFifoStart .incbin "./build/us_1.0/ucode/ucode_f3ddkr_fifo.bin" +glabel rspF3DDKRXbusStart .incbin "./build/us_1.0/ucode/ucode_f3ddkr_xbus.bin" +glabel rspUnknown2Start .incbin "./build/us_1.0/ucode/ucode_unknown_2.bin" diff --git a/asm/entrypoint.s b/asm/entrypoint.s index 907491b8..1adf1b38 100644 --- a/asm/entrypoint.s +++ b/asm/entrypoint.s @@ -19,9 +19,9 @@ glabel entrypoint /* 001018 80000418 AD000004 */ sw $zero, 4($t0) /* 00101C 8000041C 1520FFFC */ bnez $t1, .L80000410 /* 001020 80000420 21080008 */ addi $t0, $t0, 8 -/* 001024 80000424 3C0A8006 */ lui $t2, %hi(D_80065D40) # $t2, 0x8006 +/* 001024 80000424 3C0A8006 */ lui $t2, %hi(func_80065D40) # $t2, 0x8006 /* 001028 80000428 3C1D8012 */ lui $sp, %hi(D_80120AC0) # $sp, 0x8012 -/* 00102C 8000042C 254A5D40 */ addiu $t2, %lo(D_80065D40) # addiu $t2, $t2, 0x5d40 +/* 00102C 8000042C 254A5D40 */ addiu $t2, %lo(func_80065D40) # addiu $t2, $t2, 0x5d40 /* 001030 80000430 01400008 */ jr $t2 /* 001034 80000434 27BD0AC0 */ addiu $sp, %lo(D_80120AC0) # addiu $sp, $sp, 0xac0 /* 001038 80000438 00000000 */ nop diff --git a/asm/non_matchings/unknown_003260/func_80002C00.s b/asm/non_matchings/unknown_003260/func_80002C00.s index eb4e0731..3a1d64c2 100644 --- a/asm/non_matchings/unknown_003260/func_80002C00.s +++ b/asm/non_matchings/unknown_003260/func_80002C00.s @@ -80,22 +80,22 @@ glabel func_80002C00 /* 003930 80002D30 0018C880 */ sll $t9, $t8, 2 /* 003934 80002D34 00F94021 */ addu $t0, $a3, $t9 /* 003938 80002D38 8D090000 */ lw $t1, ($t0) -/* 00393C 80002D3C 3C05800E */ lui $a1, %hi(D_800D84C0) # $a1, 0x800e +/* 00393C 80002D3C 3C05800E */ lui $a1, %hi(rspF3DDKRBootStart) # $a1, 0x800e /* 003940 80002D40 AE090048 */ sw $t1, 0x48($s0) /* 003944 80002D44 8CCA0000 */ lw $t2, ($a2) -/* 003948 80002D48 3C19800E */ lui $t9, %hi(D_800D8590) # $t9, 0x800e +/* 003948 80002D48 3C19800E */ lui $t9, %hi(rspF3DDKRDramStart) # $t9, 0x800e /* 00394C 80002D4C 000A5880 */ sll $t3, $t2, 2 /* 003950 80002D50 00EB6021 */ addu $t4, $a3, $t3 /* 003954 80002D54 8D8D0000 */ lw $t5, ($t4) -/* 003958 80002D58 24A584C0 */ addiu $a1, %lo(D_800D84C0) # addiu $a1, $a1, -0x7b40 +/* 003958 80002D58 24A584C0 */ addiu $a1, %lo(rspF3DDKRBootStart) # addiu $a1, $a1, -0x7b40 /* 00395C 80002D5C 004D7023 */ subu $t6, $v0, $t5 /* 003960 80002D60 000E78C3 */ sra $t7, $t6, 3 -/* 003964 80002D64 27398590 */ addiu $t9, %lo(D_800D8590) # addiu $t9, $t9, -0x7a70 -/* 003968 80002D68 3C09800D */ lui $t1, %hi(D_800D7600) # $t1, 0x800d +/* 003964 80002D64 27398590 */ addiu $t9, %lo(rspF3DDKRDramStart) # addiu $t9, $t9, -0x7a70 +/* 003968 80002D68 3C09800D */ lui $t1, %hi(rspUnknownStart) # $t1, 0x800d /* 00396C 80002D6C 3C0A800F */ lui $t2, %hi(D_800E98D0) # $t2, 0x800f /* 003970 80002D70 000FC0C0 */ sll $t8, $t7, 3 /* 003974 80002D74 03254023 */ subu $t0, $t9, $a1 -/* 003978 80002D78 25297600 */ addiu $t1, %lo(D_800D7600) # addiu $t1, $t1, 0x7600 +/* 003978 80002D78 25297600 */ addiu $t1, %lo(rspUnknownStart) # addiu $t1, $t1, 0x7600 /* 00397C 80002D7C 254A98D0 */ addiu $t2, %lo(D_800E98D0) # addiu $t2, $t2, -0x6730 /* 003980 80002D80 240B0800 */ li $t3, 2048 /* 003984 80002D84 240C0001 */ li $t4, 1 diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index b64f9a41..b1205f7f 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -202,8 +202,8 @@ glabel func_8006C60C /* 06D504 8006C904 0C02DDF5 */ jal func_800B77D4 /* 06D508 8006C908 00000000 */ nop .L8006C90C: -/* 06D50C 8006C90C 3C04800E */ lui $a0, %hi(D_800DD407) # $a0, 0x800e -/* 06D510 8006C910 9084D407 */ lbu $a0, %lo(D_800DD407)($a0) +/* 06D50C 8006C90C 3C04800E */ lui $a0, %hi(D_800DD404+3) # $a0, 0x800e +/* 06D510 8006C910 9084D407 */ lbu $a0, %lo(D_800DD404+3)($a0) /* 06D514 8006C914 0C000340 */ jal func_80000D00 /* 06D518 8006C918 00000000 */ nop /* 06D51C 8006C91C 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_078050/setupOSTasks.s b/asm/non_matchings/unknown_078050/setupOSTasks.s index 016fa8ce..cc747c6d 100644 --- a/asm/non_matchings/unknown_078050/setupOSTasks.s +++ b/asm/non_matchings/unknown_078050/setupOSTasks.s @@ -21,17 +21,17 @@ glabel setupOSTasks /* 07809C 8007749C AC600000 */ sw $zero, ($v1) .L800774A0: /* 0780A0 800774A0 00A45823 */ subu $t3, $a1, $a0 -/* 0780A4 800774A4 3C03800E */ lui $v1, %hi(D_800D84C0) # $v1, 0x800e +/* 0780A4 800774A4 3C03800E */ lui $v1, %hi(rspF3DDKRBootStart) # $v1, 0x800e /* 0780A8 800774A8 3C0A8012 */ lui $t2, %hi(D_80125ED8) # $t2, 0x8012 /* 0780AC 800774AC 000B60C3 */ sra $t4, $t3, 3 /* 0780B0 800774B0 240D0001 */ li $t5, 1 -/* 0780B4 800774B4 3C0F800E */ lui $t7, %hi(D_800D8590) # $t7, 0x800e -/* 0780B8 800774B8 246384C0 */ addiu $v1, %lo(D_800D84C0) # addiu $v1, $v1, -0x7b40 +/* 0780B4 800774B4 3C0F800E */ lui $t7, %hi(rspF3DDKRDramStart) # $t7, 0x800e +/* 0780B8 800774B8 246384C0 */ addiu $v1, %lo(rspF3DDKRBootStart) # addiu $v1, $v1, -0x7b40 /* 0780BC 800774BC 254A5ED8 */ addiu $t2, %lo(D_80125ED8) # addiu $t2, $t2, 0x5ed8 /* 0780C0 800774C0 ACEC0044 */ sw $t4, 0x44($a3) /* 0780C4 800774C4 ACED0010 */ sw $t5, 0x10($a3) /* 0780C8 800774C8 240E0002 */ li $t6, 2 -/* 0780CC 800774CC 25EF8590 */ addiu $t7, %lo(D_800D8590) # addiu $t7, $t7, -0x7a70 +/* 0780CC 800774CC 25EF8590 */ addiu $t7, %lo(rspF3DDKRDramStart) # addiu $t7, $t7, -0x7a70 /* 0780D0 800774D0 3C02FF00 */ lui $v0, (0xFF0000FF >> 16) # lui $v0, 0xff00 /* 0780D4 800774D4 24090023 */ li $t1, 35 /* 0780D8 800774D8 ACEA0050 */ sw $t2, 0x50($a3) @@ -41,15 +41,15 @@ glabel setupOSTasks /* 0780E8 800774E8 3C0D8012 */ lui $t5, %hi(D_80125EA0) # $t5, 0x8012 /* 0780EC 800774EC 344200FF */ ori $v0, (0xFF0000FF & 0xFFFF) # ori $v0, $v0, 0xff /* 0780F0 800774F0 ACE90008 */ sw $t1, 8($a3) -/* 0780F4 800774F4 3C19800E */ lui $t9, %hi(D_800DA970) # $t9, 0x800e -/* 0780F8 800774F8 3C08800F */ lui $t0, %hi(D_800EABA0) # $t0, 0x800f +/* 0780F4 800774F4 3C19800E */ lui $t9, %hi(rspF3DDKRXbusStart) # $t9, 0x800e +/* 0780F8 800774F8 3C08800F */ lui $t0, %hi(rspF3DDKRDataXbusStart) # $t0, 0x800f /* 0780FC 800774FC 3C0A8012 */ lui $t2, %hi(D_801242A0) # $t2, 0x8012 /* 078100 80077500 258C46A0 */ addiu $t4, %lo(D_801246A0) # addiu $t4, $t4, 0x46a0 /* 078104 80077504 25AD5EA0 */ addiu $t5, %lo(D_80125EA0) # addiu $t5, $t5, 0x5ea0 /* 078108 80077508 3C0E8012 */ lui $t6, %hi(D_801271B0) # $t6, 0x8012 /* 07810C 8007750C ACF8001C */ sw $t8, 0x1c($a3) -/* 078110 80077510 2739A970 */ addiu $t9, %lo(D_800DA970) # addiu $t9, $t9, -0x5690 -/* 078114 80077514 2508ABA0 */ addiu $t0, %lo(D_800EABA0) # addiu $t0, $t0, -0x5460 +/* 078110 80077510 2739A970 */ addiu $t9, %lo(rspF3DDKRXbusStart) # addiu $t9, $t9, -0x5690 +/* 078114 80077514 2508ABA0 */ addiu $t0, %lo(rspF3DDKRDataXbusStart) # addiu $t0, $t0, -0x5460 /* 078118 80077518 24090800 */ li $t1, 2048 /* 07811C 8007751C 254A42A0 */ addiu $t2, %lo(D_801242A0) # addiu $t2, $t2, 0x42a0 /* 078120 80077520 240B0400 */ li $t3, 1024 @@ -108,11 +108,11 @@ glabel setupOSTasks /* 0781F0 800775F0 AC780000 */ sw $t8, ($v1) /* 0781F4 800775F4 AC600000 */ sw $zero, ($v1) .L800775F8: -/* 0781F8 800775F8 3C02800E */ lui $v0, %hi(D_800D84C0) # $v0, 0x800e -/* 0781FC 800775FC 3C0D800E */ lui $t5, %hi(D_800D8590) # $t5, 0x800e -/* 078200 80077600 244284C0 */ addiu $v0, %lo(D_800D84C0) # addiu $v0, $v0, -0x7b40 +/* 0781F8 800775F8 3C02800E */ lui $v0, %hi(rspF3DDKRBootStart) # $v0, 0x800e +/* 0781FC 800775FC 3C0D800E */ lui $t5, %hi(rspF3DDKRDramStart) # $t5, 0x800e +/* 078200 80077600 244284C0 */ addiu $v0, %lo(rspF3DDKRBootStart) # addiu $v0, $v0, -0x7b40 /* 078204 80077604 00A44023 */ subu $t0, $a1, $a0 -/* 078208 80077608 25AD8590 */ addiu $t5, %lo(D_800D8590) # addiu $t5, $t5, -0x7a70 +/* 078208 80077608 25AD8590 */ addiu $t5, %lo(rspF3DDKRDramStart) # addiu $t5, $t5, -0x7a70 /* 07820C 8007760C 000848C3 */ sra $t1, $t0, 3 /* 078210 80077610 01A27023 */ subu $t6, $t5, $v0 /* 078214 80077614 000950C0 */ sll $t2, $t1, 3 @@ -120,17 +120,17 @@ glabel setupOSTasks /* 07821C 8007761C 240B0001 */ li $t3, 1 /* 078220 80077620 240C0002 */ li $t4, 2 /* 078224 80077624 ACEE001C */ sw $t6, 0x1c($a3) -/* 078228 80077628 3C0F800E */ lui $t7, %hi(D_800DA970) # $t7, 0x800e +/* 078228 80077628 3C0F800E */ lui $t7, %hi(rspF3DDKRXbusStart) # $t7, 0x800e /* 07822C 8007762C ACEB0010 */ sw $t3, 0x10($a3) /* 078230 80077630 ACEC0014 */ sw $t4, 0x14($a3) -/* 078234 80077634 25EFA970 */ addiu $t7, %lo(D_800DA970) # addiu $t7, $t7, -0x5690 -/* 078238 80077638 3C18800F */ lui $t8, %hi(D_800EABA0) # $t8, 0x800f +/* 078234 80077634 25EFA970 */ addiu $t7, %lo(rspF3DDKRXbusStart) # addiu $t7, $t7, -0x5690 +/* 078238 80077638 3C18800F */ lui $t8, %hi(rspF3DDKRDataXbusStart) # $t8, 0x800f /* 07823C 8007763C 3C088012 */ lui $t0, %hi(D_801242A0) # $t0, 0x8012 /* 078240 80077640 3C0A8012 */ lui $t2, %hi(D_801271B0) # $t2, 0x8012 /* 078244 80077644 3C0D8012 */ lui $t5, %hi(D_80125ED8) # $t5, 0x8012 /* 078248 80077648 3C0E800E */ lui $t6, %hi(D_800DE490) # $t6, 0x800e /* 07824C 8007764C ACEF0020 */ sw $t7, 0x20($a3) -/* 078250 80077650 2718ABA0 */ addiu $t8, %lo(D_800EABA0) # addiu $t8, $t8, -0x5460 +/* 078250 80077650 2718ABA0 */ addiu $t8, %lo(rspF3DDKRDataXbusStart) # addiu $t8, $t8, -0x5460 /* 078254 80077654 24190800 */ li $t9, 2048 /* 078258 80077658 250842A0 */ addiu $t0, %lo(D_801242A0) # addiu $t0, $t0, 0x42a0 /* 07825C 8007765C 24090400 */ li $t1, 1024 @@ -209,20 +209,20 @@ glabel setupOSTasks /* 078374 80077774 AC780000 */ sw $t8, ($v1) /* 078378 80077778 AC600000 */ sw $zero, ($v1) .L8007777C: -/* 07837C 8007777C 3C02800E */ lui $v0, %hi(D_800D84C0) # $v0, 0x800e +/* 07837C 8007777C 3C02800E */ lui $v0, %hi(rspF3DDKRBootStart) # $v0, 0x800e /* 078380 80077780 00A44023 */ subu $t0, $a1, $a0 -/* 078384 80077784 3C0D800E */ lui $t5, %hi(D_800D8590) # $t5, 0x800e -/* 078388 80077788 244284C0 */ addiu $v0, %lo(D_800D84C0) # addiu $v0, $v0, -0x7b40 +/* 078384 80077784 3C0D800E */ lui $t5, %hi(rspF3DDKRDramStart) # $t5, 0x800e +/* 078388 80077788 244284C0 */ addiu $v0, %lo(rspF3DDKRBootStart) # addiu $v0, $v0, -0x7b40 /* 07838C 8007778C 000848C3 */ sra $t1, $t0, 3 -/* 078390 80077790 25AD8590 */ addiu $t5, %lo(D_800D8590) # addiu $t5, $t5, -0x7a70 -/* 078394 80077794 3C0F800E */ lui $t7, %hi(D_800D9790) # $t7, 0x800e -/* 078398 80077798 3C18800F */ lui $t8, %hi(D_800EA3A0) # $t8, 0x800f +/* 078390 80077790 25AD8590 */ addiu $t5, %lo(rspF3DDKRDramStart) # addiu $t5, $t5, -0x7a70 +/* 078394 80077794 3C0F800E */ lui $t7, %hi(rspF3DDKRFifoStart) # $t7, 0x800e +/* 078398 80077798 3C18800F */ lui $t8, %hi(rspF3DDKRDataFifoStart) # $t8, 0x800f /* 07839C 8007779C 000950C0 */ sll $t2, $t1, 3 /* 0783A0 800777A0 240B0001 */ li $t3, 1 /* 0783A4 800777A4 240C0002 */ li $t4, 2 /* 0783A8 800777A8 01A27023 */ subu $t6, $t5, $v0 -/* 0783AC 800777AC 25EF9790 */ addiu $t7, %lo(D_800D9790) # addiu $t7, $t7, -0x6870 -/* 0783B0 800777B0 2718A3A0 */ addiu $t8, %lo(D_800EA3A0) # addiu $t8, $t8, -0x5c60 +/* 0783AC 800777AC 25EF9790 */ addiu $t7, %lo(rspF3DDKRFifoStart) # addiu $t7, $t7, -0x6870 +/* 0783B0 800777B0 2718A3A0 */ addiu $t8, %lo(rspF3DDKRDataFifoStart) # addiu $t8, $t8, -0x5c60 /* 0783B4 800777B4 ACEA0044 */ sw $t2, 0x44($a3) /* 0783B8 800777B8 ACEB0010 */ sw $t3, 0x10($a3) /* 0783BC 800777BC ACEC0014 */ sw $t4, 0x14($a3) @@ -314,20 +314,20 @@ glabel setupOSTasks /* 078508 80077908 AC780000 */ sw $t8, ($v1) /* 07850C 8007790C AC600000 */ sw $zero, ($v1) .L80077910: -/* 078510 80077910 3C02800E */ lui $v0, %hi(D_800D84C0) # $v0, 0x800e +/* 078510 80077910 3C02800E */ lui $v0, %hi(rspF3DDKRBootStart) # $v0, 0x800e /* 078514 80077914 00A44023 */ subu $t0, $a1, $a0 -/* 078518 80077918 3C0D800E */ lui $t5, %hi(D_800D8590) # $t5, 0x800e -/* 07851C 8007791C 244284C0 */ addiu $v0, %lo(D_800D84C0) # addiu $v0, $v0, -0x7b40 +/* 078518 80077918 3C0D800E */ lui $t5, %hi(rspF3DDKRDramStart) # $t5, 0x800e +/* 07851C 8007791C 244284C0 */ addiu $v0, %lo(rspF3DDKRBootStart) # addiu $v0, $v0, -0x7b40 /* 078520 80077920 000848C3 */ sra $t1, $t0, 3 -/* 078524 80077924 25AD8590 */ addiu $t5, %lo(D_800D8590) # addiu $t5, $t5, -0x7a70 -/* 078528 80077928 3C0F800E */ lui $t7, %hi(D_800D9790) # $t7, 0x800e -/* 07852C 8007792C 3C18800F */ lui $t8, %hi(D_800EA3A0) # $t8, 0x800f +/* 078524 80077924 25AD8590 */ addiu $t5, %lo(rspF3DDKRDramStart) # addiu $t5, $t5, -0x7a70 +/* 078528 80077928 3C0F800E */ lui $t7, %hi(rspF3DDKRFifoStart) # $t7, 0x800e +/* 07852C 8007792C 3C18800F */ lui $t8, %hi(rspF3DDKRDataFifoStart) # $t8, 0x800f /* 078530 80077930 000950C0 */ sll $t2, $t1, 3 /* 078534 80077934 240B0001 */ li $t3, 1 /* 078538 80077938 240C0002 */ li $t4, 2 /* 07853C 8007793C 01A27023 */ subu $t6, $t5, $v0 -/* 078540 80077940 25EF9790 */ addiu $t7, %lo(D_800D9790) # addiu $t7, $t7, -0x6870 -/* 078544 80077944 2718A3A0 */ addiu $t8, %lo(D_800EA3A0) # addiu $t8, $t8, -0x5c60 +/* 078540 80077940 25EF9790 */ addiu $t7, %lo(rspF3DDKRFifoStart) # addiu $t7, $t7, -0x6870 +/* 078544 80077944 2718A3A0 */ addiu $t8, %lo(rspF3DDKRDataFifoStart) # addiu $t8, $t8, -0x5c60 /* 078548 80077948 ACEA0044 */ sw $t2, 0x44($a3) /* 07854C 8007794C ACEB0010 */ sw $t3, 0x10($a3) /* 078550 80077950 ACEC0014 */ sw $t4, 0x14($a3) diff --git a/asm/non_matchings/unknown_080500/MenuBootInit.s b/asm/non_matchings/unknown_080500/MenuBootInit.s index a73a3427..294caf4b 100644 --- a/asm/non_matchings/unknown_080500/MenuBootInit.s +++ b/asm/non_matchings/unknown_080500/MenuBootInit.s @@ -15,31 +15,31 @@ glabel menu_boot_init /* 089128 80088528 85CEF7C4 */ lh $t6, %lo(D_800DF7C4)($t6) /* 08912C 8008852C 3C048012 */ lui $a0, %hi(D_80126550) # $a0, 0x8012 /* 089130 80088530 24846550 */ addiu $a0, %lo(D_80126550) # addiu $a0, $a0, 0x6550 -/* 089134 80088534 3C08800E */ lui $t0, %hi(D_800DF7C6) # $t0, 0x800e +/* 089134 80088534 3C08800E */ lui $t0, %hi(D_800DF7C4+2) # $t0, 0x800e /* 089138 80088538 000E7880 */ sll $t7, $t6, 2 -/* 08913C 8008853C 8508F7C6 */ lh $t0, %lo(D_800DF7C6)($t0) +/* 08913C 8008853C 8508F7C6 */ lh $t0, %lo(D_800DF7C4+2)($t0) /* 089140 80088540 008FC021 */ addu $t8, $a0, $t7 /* 089144 80088544 8F190000 */ lw $t9, ($t8) /* 089148 80088548 3C01800E */ lui $at, %hi(D_800DF7DC) # $at, 0x800e -/* 08914C 8008854C 3C0C800E */ lui $t4, %hi(D_800DF7C8) # $t4, 0x800e +/* 08914C 8008854C 3C0C800E */ lui $t4, %hi(D_800DF7C4+4) # $t4, 0x800e /* 089150 80088550 00084880 */ sll $t1, $t0, 2 -/* 089154 80088554 858CF7C8 */ lh $t4, %lo(D_800DF7C8)($t4) +/* 089154 80088554 858CF7C8 */ lh $t4, %lo(D_800DF7C4+4)($t4) /* 089158 80088558 00895021 */ addu $t2, $a0, $t1 /* 08915C 8008855C AC39F7DC */ sw $t9, %lo(D_800DF7DC)($at) /* 089160 80088560 8D4B0000 */ lw $t3, ($t2) -/* 089164 80088564 3C01800E */ lui $at, %hi(D_800DF7EC) # $at, 0x800e +/* 089164 80088564 3C01800E */ lui $at, %hi(D_800DF7DC+16) # $at, 0x800e /* 089168 80088568 000C6880 */ sll $t5, $t4, 2 /* 08916C 8008856C 008D7021 */ addu $t6, $a0, $t5 -/* 089170 80088570 AC2BF7E4 */ sw $t3, %lo(D_800DF7E4)($at) +/* 089170 80088570 AC2BF7E4 */ sw $t3, %lo(D_800DF7DC+8)($at) /* 089174 80088574 8DCF0000 */ lw $t7, ($t6) # The extra lui is here. -/* 089178 80088578 3C03800E */ lui $v1, %hi(D_800DF7F4) # $v1, 0x800e -/* 08917C 8008857C 3C02800E */ lui $v0, %hi(D_800DF7CA) # $v0, 0x800e -/* 089180 80088580 3C05800E */ lui $a1, %hi(D_800DF7DA) # $a1, 0x800e -/* 089184 80088584 24A5F7DA */ addiu $a1, %lo(D_800DF7DA) # addiu $a1, $a1, -0x826 -/* 089188 80088588 2442F7CA */ addiu $v0, %lo(D_800DF7CA) # addiu $v0, $v0, -0x836 -/* 08918C 8008858C 2463F7F4 */ addiu $v1, %lo(D_800DF7F4) # addiu $v1, $v1, -0x80c -/* 089190 80088590 AC2FF7EC */ sw $t7, %lo(D_800DF7EC)($at) +/* 089178 80088578 3C03800E */ lui $v1, %hi(D_800DF7DC+24) # $v1, 0x800e +/* 08917C 8008857C 3C02800E */ lui $v0, %hi(D_800DF7C4+6) # $v0, 0x800e +/* 089180 80088580 3C05800E */ lui $a1, %hi(D_800DF7C4+22) # $a1, 0x800e +/* 089184 80088584 24A5F7DA */ addiu $a1, %lo(D_800DF7C4+22) # addiu $a1, $a1, -0x826 +/* 089188 80088588 2442F7CA */ addiu $v0, %lo(D_800DF7C4+6) # addiu $v0, $v0, -0x836 +/* 08918C 8008858C 2463F7F4 */ addiu $v1, %lo(D_800DF7DC+24) # addiu $v1, $v1, -0x80c +/* 089190 80088590 AC2FF7EC */ sw $t7, %lo(D_800DF7DC+16)($at) .L80088594: /* 089194 80088594 84580000 */ lh $t8, ($v0) /* 089198 80088598 844A0002 */ lh $t2, 2($v0) diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s b/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s index adef7ec6..bfa7235e 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s @@ -49,30 +49,30 @@ glabel MenuTitleScreenInit /* 0841F0 800835F0 8508F7C4 */ lh $t0, %lo(D_800DF7C4)($t0) /* 0841F4 800835F4 3C048012 */ lui $a0, %hi(D_80126550) # $a0, 0x8012 /* 0841F8 800835F8 24846550 */ addiu $a0, %lo(D_80126550) # addiu $a0, $a0, 0x6550 -/* 0841FC 800835FC 3C0C800E */ lui $t4, %hi(D_800DF7C6) # $t4, 0x800e +/* 0841FC 800835FC 3C0C800E */ lui $t4, %hi(D_800DF7C4+2) # $t4, 0x800e /* 084200 80083600 00084880 */ sll $t1, $t0, 2 -/* 084204 80083604 858CF7C6 */ lh $t4, %lo(D_800DF7C6)($t4) +/* 084204 80083604 858CF7C6 */ lh $t4, %lo(D_800DF7C4+2)($t4) /* 084208 80083608 00895021 */ addu $t2, $a0, $t1 /* 08420C 8008360C 8D4B0000 */ lw $t3, ($t2) /* 084210 80083610 3C01800E */ lui $at, %hi(D_800DF7DC) # $at, 0x800e -/* 084214 80083614 3C18800E */ lui $t8, %hi(D_800DF7C8) # $t8, 0x800e +/* 084214 80083614 3C18800E */ lui $t8, %hi(D_800DF7C4+4) # $t8, 0x800e /* 084218 80083618 000C6880 */ sll $t5, $t4, 2 -/* 08421C 8008361C 8718F7C8 */ lh $t8, %lo(D_800DF7C8)($t8) +/* 08421C 8008361C 8718F7C8 */ lh $t8, %lo(D_800DF7C4+4)($t8) /* 084220 80083620 008D7021 */ addu $t6, $a0, $t5 /* 084224 80083624 AC2BF7DC */ sw $t3, %lo(D_800DF7DC)($at) /* 084228 80083628 8DCF0000 */ lw $t7, ($t6) -/* 08422C 8008362C 3C01800E */ lui $at, %hi(D_800DF7EC) # $at, 0x800e +/* 08422C 8008362C 3C01800E */ lui $at, %hi(D_800DF7DC+16) # $at, 0x800e /* 084230 80083630 0018C880 */ sll $t9, $t8, 2 /* 084234 80083634 00994021 */ addu $t0, $a0, $t9 -/* 084238 80083638 AC2FF7E4 */ sw $t7, %lo(D_800DF7E4)($at) +/* 084238 80083638 AC2FF7E4 */ sw $t7, %lo(D_800DF7DC+8)($at) /* 08423C 8008363C 8D090000 */ lw $t1, ($t0) -/* 084240 80083640 3C03800E */ lui $v1, %hi(D_800DF7F4) # $v1, 0x800e -/* 084244 80083644 3C02800E */ lui $v0, %hi(D_800DF7CA) # $v0, 0x800e -/* 084248 80083648 3C05800E */ lui $a1, %hi(D_800DF7DA) # $a1, 0x800e -/* 08424C 8008364C 24A5F7DA */ addiu $a1, %lo(D_800DF7DA) # addiu $a1, $a1, -0x826 -/* 084250 80083650 2442F7CA */ addiu $v0, %lo(D_800DF7CA) # addiu $v0, $v0, -0x836 -/* 084254 80083654 2463F7F4 */ addiu $v1, %lo(D_800DF7F4) # addiu $v1, $v1, -0x80c -/* 084258 80083658 AC29F7EC */ sw $t1, %lo(D_800DF7EC)($at) +/* 084240 80083640 3C03800E */ lui $v1, %hi(D_800DF7DC+24) # $v1, 0x800e +/* 084244 80083644 3C02800E */ lui $v0, %hi(D_800DF7C4+6) # $v0, 0x800e +/* 084248 80083648 3C05800E */ lui $a1, %hi(D_800DF7C4+22) # $a1, 0x800e +/* 08424C 8008364C 24A5F7DA */ addiu $a1, %lo(D_800DF7C4+22) # addiu $a1, $a1, -0x826 +/* 084250 80083650 2442F7CA */ addiu $v0, %lo(D_800DF7C4+6) # addiu $v0, $v0, -0x836 +/* 084254 80083654 2463F7F4 */ addiu $v1, %lo(D_800DF7DC+24) # addiu $v1, $v1, -0x80c +/* 084258 80083658 AC29F7EC */ sw $t1, %lo(D_800DF7DC+16)($at) .L8008365C: /* 08425C 8008365C 844A0000 */ lh $t2, ($v0) /* 084260 80083660 844E0002 */ lh $t6, 2($v0) diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s index 233209cf..055414ee 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s @@ -328,7 +328,7 @@ glabel MenuTitleScreenLoop /* 084A94 80083E94 4606003C */ c.lt.s $f0, $f6 /* 084A98 80083E98 3C0F800E */ lui $t7, %hi(D_800DF760) # $t7, 0x800e /* 084A9C 80083E9C 45000016 */ bc1f .L80083EF8 -/* 084AA0 80083EA0 3C04800E */ lui $a0, %hi(D_800DF763) # $a0, 0x800e +/* 084AA0 80083EA0 3C04800E */ lui $a0, %hi(D_800DF760+3) # $a0, 0x800e /* 084AA4 80083EA4 8DEFF760 */ lw $t7, %lo(D_800DF760)($t7) /* 084AA8 80083EA8 44815000 */ mtc1 $at, $f10 /* 084AAC 80083EAC 448F2000 */ mtc1 $t7, $f4 @@ -351,7 +351,7 @@ glabel MenuTitleScreenLoop /* 084AF0 80083EF0 10000006 */ b .L80083F0C /* 084AF4 80083EF4 2463686C */ addiu $v1, %lo(D_8012686C) # addiu $v1, $v1, 0x686c .L80083EF8: -/* 084AF8 80083EF8 9084F763 */ lbu $a0, %lo(D_800DF763)($a0) +/* 084AF8 80083EF8 9084F763 */ lbu $a0, %lo(D_800DF760+3)($a0) /* 084AFC 80083EFC 0C000664 */ jal musicSetRelativeVolume /* 084B00 80083F00 00000000 */ nop /* 084B04 80083F04 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 85f893c9..6c4aa5c1 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -174,9 +174,9 @@ glabel L80094DD0 /* 095B84 80094F84 3C014000 */ li $at, 0x40000000 # 2.000000 /* 095B88 80094F88 46803220 */ cvt.s.w $f8, $f6 /* 095B8C 80094F8C 44813000 */ mtc1 $at, $f6 -/* 095B90 80094F90 3C01800E */ lui $at, %hi(D_800DF598) # $at, 0x800e +/* 095B90 80094F90 3C01800E */ lui $at, %hi(D_800DF510+0x88) # $at, 0x800e /* 095B94 80094F94 E5880090 */ swc1 $f8, 0x90($t4) -/* 095B98 80094F98 C42AF598 */ lwc1 $f10, %lo(D_800DF598)($at) +/* 095B98 80094F98 C42AF598 */ lwc1 $f10, %lo(D_800DF510+0x88)($at) /* 095B9C 80094F9C 46043201 */ sub.s $f8, $f6, $f4 /* 095BA0 80094FA0 8C4D0000 */ lw $t5, ($v0) /* 095BA4 80094FA4 46085402 */ mul.s $f16, $f10, $f8 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index cf192211..312c9350 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -214,10 +214,10 @@ glabel L80095964 /* 096620 80095A20 E584008C */ swc1 $f4, 0x8c($t4) /* 096624 80095A24 8C4D0000 */ lw $t5, ($v0) /* 096628 80095A28 44813000 */ mtc1 $at, $f6 -/* 09662C 80095A2C 3C01800E */ lui $at, %hi(D_800DF598) # $at, 0x800e +/* 09662C 80095A2C 3C01800E */ lui $at, %hi(D_800DF510+0x88) # $at, 0x800e /* 096630 80095A30 E5A60090 */ swc1 $f6, 0x90($t5) /* 096634 80095A34 8C4E0000 */ lw $t6, ($v0) -/* 096638 80095A38 C428F598 */ lwc1 $f8, %lo(D_800DF598)($at) +/* 096638 80095A38 C428F598 */ lwc1 $f8, %lo(D_800DF510+0x88)($at) /* 09663C 80095A3C 00000000 */ nop /* 096640 80095A40 E5C80088 */ swc1 $f8, 0x88($t6) /* 096644 80095A44 8FAF002C */ lw $t7, 0x2c($sp) diff --git a/asm/unknown_070110.s b/asm/unknown_070110.s index 77e33d0f..845310e2 100644 --- a/asm/unknown_070110.s +++ b/asm/unknown_070110.s @@ -54,8 +54,8 @@ glabel D_800DD438 .word 0x5141564D glabel D_800DD43C -.half 0x0000, 0x0032, 0x0065, 0x0097, 0x00C9, 0x00FB, 0x012E, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028D, 0x02C0, 0x02F2, 0x0324, 0x0356, 0x0389, 0x03BB, 0x03ED, 0x041F, 0x0452, 0x0484, 0x04B6, 0x04E8, 0x051B, 0x054D, 0x057F, 0x05B1, 0x05E3, 0x0616, 0x0648, 0x067A, 0x06AC, 0x06DE, 0x0711, 0x0743, 0x0775, 0x07A7, 0x07D9, 0x080C, 0x083E, 0x0870, 0x08A2, 0x08D4, 0x0906, 0x0938, 0x096B, 0x099D, 0x09CF, 0x0A01, 0x0A33, 0x0A65, 0x0A97, 0x0AC9, 0x0AFB, 0x0B2D, 0x0B60, 0x0B92, 0x0BC4, 0x0BF6, 0x0C28, 0x0C5A, 0x0C8C, 0x0CBE, 0x0CF0, 0x0D22, 0x0D54, 0x0D86, 0x0DB8, 0x0DEA, 0x0E1C, 0x0E4E, 0x0E80, 0x0EB2, 0x0EE4, 0x0F15, 0x0F47, 0x0F79, 0x0FAB, 0x0FDD, 0x100F, 0x1041, 0x1073, 0x10A4, 0x10D6, 0x1108, 0x113A, 0x116C, 0x119E, 0x11CF, 0x1201, 0x1233, 0x1265, 0x1296, 0x12C8, 0x12FA, 0x132B, 0x135D, 0x138F, 0x13C1, 0x13F2, 0x1424, 0x1455, 0x1487, 0x14B9, 0x14EA, 0x151C, 0x154D, 0x157F, 0x15B1, 0x15E2, 0x1614, 0x1645, 0x1677, 0x16A8, 0x16DA, 0x170B, 0x173C, 0x176E, 0x179F, 0x17D1, 0x1802, 0x1833, 0x1865, 0x1896, 0x18C7, 0x18F9, 0x192A, 0x195B, 0x198D, 0x19BE, 0x19EF, 0x1A20, 0x1A51, 0x1A83, 0x1AB4, 0x1AE5, 0x1B16, 0x1B47, 0x1B78, 0x1BA9, 0x1BDA, 0x1C0C, 0x1C3D, 0x1C6E, 0x1C9F, 0x1CD0, 0x1D01, 0x1D31, 0x1D62, 0x1D93, 0x1DC4, 0x1DF5, 0x1E26, 0x1E57, 0x1E88, 0x1EB8, 0x1EE9, 0x1F1A, 0x1F4B, 0x1F7B, 0x1FAC, 0x1FDD, 0x200E, 0x203E, 0x206F, 0x209F, 0x20D0, 0x2101, 0x2131, 0x2162, 0x2192, 0x21C3, 0x21F3, 0x2224, 0x2254, 0x2284, 0x22B5, 0x22E5, 0x2316, 0x2346, 0x2376, 0x23A7, 0x23D7, 0x2407, 0x2437, 0x2467, 0x2498, 0x24C8, 0x24F8, 0x2528, 0x2558, 0x2588, 0x25B8, 0x25E8, 0x2618, 0x2648, 0x2678, 0x26A8, 0x26D8, 0x2708, 0x2738, 0x2768, 0x2797, 0x27C7, 0x27F7, 0x2827, 0x2856, 0x2886, 0x28B6, 0x28E5, 0x2915, 0x2945, 0x2974, 0x29A4, 0x29D3, 0x2A03, 0x2A32, 0x2A62, 0x2A91, 0x2AC1, 0x2AF0, 0x2B1F, 0x2B4F, 0x2B7E, 0x2BAD, 0x2BDC, 0x2C0C, 0x2C3B, 0x2C6A, 0x2C99, 0x2CC8, 0x2CF7, 0x2D26, 0x2D55, 0x2D84, 0x2DB3, 0x2DE2, 0x2E11, 0x2E40, 0x2E6F, 0x2E9E, 0x2ECC, 0x2EFB, 0x2F2A, 0x2F59, 0x2F87, 0x2FB6, 0x2FE5, 0x3013, 0x3042, 0x3070, 0x309F, 0x30CD, 0x30FC, 0x312A, 0x3159, 0x3187, 0x31B5, 0x31E4, 0x3212, 0x3240, 0x326E, 0x329D, 0x32CB, 0x32F9, 0x3327, 0x3355, 0x3383, 0x33B1, 0x33DF, 0x340D, 0x343B, 0x3469, 0x3497, 0x34C4, 0x34F2, 0x3520, 0x354E, 0x357B, 0x35A9, 0x35D7, 0x3604, 0x3632, 0x365F, 0x368D, 0x36BA, 0x36E8, 0x3715, 0x3742, 0x3770, 0x379D, 0x37CA, 0x37F7, 0x3825, 0x3852, 0x387F, 0x38AC, 0x38D9, 0x3906, 0x3933, 0x3960, 0x398D, 0x39BA, 0x39E7, 0x3A13, 0x3A40, 0x3A6D, 0x3A9A, 0x3AC6, 0x3AF3, 0x3B20, 0x3B4C, 0x3B79, 0x3BA5, 0x3BD2, 0x3BFE, 0x3C2A, 0x3C57, 0x3C83, 0x3CAF, 0x3CDC, 0x3D08, 0x3D34, 0x3D60, 0x3D8C, 0x3DB8, 0x3DE4, 0x3E10, 0x3E3C, 0x3E68, 0x3E94, 0x3EC0, 0x3EEC, 0x3F17, 0x3F43, 0x3F6F, 0x3F9A, 0x3FC6, 0x3FF1, 0x401D, 0x4048, 0x4074, 0x409F, 0x40CB, 0x40F6, 0x4121, 0x414D, 0x4178, 0x41A3, 0x41CE, 0x41F9, 0x4224, 0x424F, 0x427A, 0x42A5, 0x42D0, 0x42FB, 0x4326, 0x4351, 0x437B, 0x43A6, 0x43D1, 0x43FB, 0x4426, 0x4450, 0x447B, 0x44A5, 0x44D0, 0x44FA, 0x4524, 0x454F, 0x4579, 0x45A3, 0x45CD, 0x45F7, 0x4621, 0x464B, 0x4675, 0x469F, 0x46C9, 0x46F3, 0x471D, 0x4747, 0x4770, 0x479A, 0x47C4, 0x47ED, 0x4817, 0x4840, 0x486A, 0x4893, 0x48BD, 0x48E6, 0x490F, 0x4939, 0x4962, 0x498B, 0x49B4, 0x49DD, 0x4A06, 0x4A2F, 0x4A58, 0x4A81, 0x4AAA, 0x4AD3, 0x4AFB, 0x4B24, 0x4B4D, 0x4B75, 0x4B9E, 0x4BC7, 0x4BEF, 0x4C17, 0x4C40, 0x4C68, 0x4C91, 0x4CB9, 0x4CE1, 0x4D09, 0x4D31, 0x4D59, 0x4D81, 0x4DA9, 0x4DD1, 0x4DF9, 0x4E21, 0x4E49, 0x4E71, 0x4E98, 0x4EC0, 0x4EE8, 0x4F0F, 0x4F37, 0x4F5E, 0x4F85, 0x4FAD, 0x4FD4, 0x4FFB, 0x5023, 0x504A, 0x5071, 0x5098, 0x50BF, 0x50E6, 0x510D, 0x5134, 0x515B, 0x5181, 0x51A8, 0x51CF, 0x51F5, 0x521C, 0x5243, 0x5269, 0x5290, 0x52B6, 0x52DC, 0x5303, 0x5329, 0x534F, 0x5375, 0x539B, 0x53C1, 0x53E7, 0x540D, 0x5433, 0x5459, 0x547F, 0x54A4, 0x54CA, 0x54F0, 0x5515, 0x553B, 0x5560, 0x5586, 0x55AB, 0x55D0, 0x55F6, 0x561B, 0x5640, 0x5665, 0x568A, 0x56AF, 0x56D4, 0x56F9, 0x571E, 0x5743, 0x5767, 0x578C, 0x57B1, 0x57D5, 0x57FA, 0x581E, 0x5843, 0x5867, 0x588C, 0x58B0, 0x58D4, 0x58F8, 0x591C, 0x5940, 0x5964, 0x5988, 0x59AC, 0x59D0, 0x59F4, 0x5A18, 0x5A3B, 0x5A5F, 0x5A82, 0x5AA6, 0x5AC9, 0x5AED, 0x5B10, 0x5B34, 0x5B57, 0x5B7A, 0x5B9D, 0x5BC0, 0x5BE3, 0x5C06, 0x5C29, 0x5C4C, 0x5C6F, 0x5C91, 0x5CB4, 0x5CD7, 0x5CF9, 0x5D1C, 0x5D3E, 0x5D61, 0x5D83, 0x5DA5, 0x5DC8, 0x5DEA, 0x5E0C, 0x5E2E, 0x5E50, 0x5E72, 0x5E94, 0x5EB6, 0x5ED7, 0x5EF9, 0x5F1B, 0x5F3C, 0x5F5E, 0x5F80, 0x5FA1, 0x5FC2, 0x5FE4, 0x6005, 0x6026, 0x6047, 0x6068, 0x6089, 0x60AA, 0x60CB, 0x60EC, 0x610D, 0x612E, 0x614E, 0x616F, 0x6190, 0x61B0, 0x61D1, 0x61F1, 0x6211, 0x6232, 0x6252, 0x6272, 0x6292, 0x62B2, 0x62D2, 0x62F2, 0x6312, 0x6332, 0x6351, 0x6371, 0x6391, 0x63B0, 0x63D0, 0x63EF, 0x640F, 0x642E, 0x644D, 0x646C, 0x648B, 0x64AB, 0x64CA, 0x64E9, 0x6507, 0x6526, 0x6545, 0x6564, 0x6582, 0x65A1, 0x65C0, 0x65DE, 0x65FC, 0x661B, 0x6639, 0x6657, 0x6675, 0x6693, 0x66B2, 0x66D0, 0x66ED, 0x670B, 0x6729, 0x6747, 0x6764, 0x6782, 0x67A0, 0x67BD, 0x67DA, 0x67F8, 0x6815, 0x6832, 0x6850, 0x686D, 0x688A, 0x68A7, 0x68C4, 0x68E0, 0x68FD, 0x691A, 0x6937, 0x6953, 0x6970, 0x698C, 0x69A9, 0x69C5, 0x69E1, 0x69FD, 0x6A1A, 0x6A36, 0x6A52, 0x6A6E, 0x6A89, 0x6AA5, 0x6AC1, 0x6ADD, 0x6AF8, 0x6B14, 0x6B30, 0x6B4B, 0x6B66, 0x6B82, 0x6B9D, 0x6BB8, 0x6BD3, 0x6BEE, 0x6C09, 0x6C24, 0x6C3F, 0x6C5A, 0x6C75, 0x6C8F, 0x6CAA, 0x6CC4, 0x6CDF, 0x6CF9, 0x6D14, 0x6D2E, 0x6D48, 0x6D62, 0x6D7C, 0x6D96, 0x6DB0, 0x6DCA, 0x6DE4, 0x6DFE, 0x6E17, 0x6E31, 0x6E4A, 0x6E64, 0x6E7D, 0x6E97, 0x6EB0, 0x6EC9, 0x6EE2, 0x6EFB, 0x6F14, 0x6F2D, 0x6F46, 0x6F5F, 0x6F78, 0x6F90, 0x6FA9, 0x6FC2, 0x6FDA, 0x6FF2, 0x700B, 0x7023, 0x703B, 0x7053, 0x706B, 0x7083, 0x709B, 0x70B3, 0x70CB, 0x70E3, 0x70FA, 0x7112, 0x712A, 0x7141, 0x7158, 0x7170, 0x7187, 0x719E, 0x71B5, 0x71CC, 0x71E3, 0x71FA, 0x7211, 0x7228, 0x723F, 0x7255, 0x726C, 0x7282, 0x7299, 0x72AF, 0x72C5, 0x72DC, 0x72F2, 0x7308, 0x731E, 0x7334, 0x734A, 0x735F, 0x7375, 0x738B, 0x73A0, 0x73B6, 0x73CB, 0x73E1, 0x73F6, 0x740B, 0x7421, 0x7436, 0x744B, 0x7460, 0x7475, 0x7489, 0x749E, 0x74B3, 0x74C7, 0x74DC, 0x74F0, 0x7505, 0x7519, 0x752D, 0x7542, 0x7556, 0x756A, 0x757E, 0x7592, 0x75A6, 0x75B9, 0x75CD, 0x75E1, 0x75F4, 0x7608, 0x761B, 0x762E, 0x7642, 0x7655, 0x7668, 0x767B, 0x768E, 0x76A1, 0x76B4, 0x76C7, 0x76D9, 0x76EC, 0x76FE, 0x7711, 0x7723, 0x7736, 0x7748, 0x775A, 0x776C, 0x777E, 0x7790, 0x77A2, 0x77B4, 0x77C6, 0x77D8, 0x77E9, 0x77FB, 0x780C, 0x781E, 0x782F, 0x7840, 0x7851, 0x7863, 0x7874, 0x7885, 0x7895, 0x78A6, 0x78B7, 0x78C8, 0x78D8, 0x78E9, 0x78F9, 0x790A, 0x791A, 0x792A, 0x793A, 0x794A, 0x795B, 0x796A, 0x797A, 0x798A, 0x799A, 0x79AA, 0x79B9, 0x79C9, 0x79D8, 0x79E7, 0x79F7, 0x7A06, 0x7A15, 0x7A24, 0x7A33, 0x7A42, 0x7A51, 0x7A60, 0x7A6E, 0x7A7D, 0x7A8C, 0x7A9A, 0x7AA8, 0x7AB7, 0x7AC5, 0x7AD3, 0x7AE1, 0x7AEF, 0x7AFD, 0x7B0B, 0x7B19, 0x7B27, 0x7B34, 0x7B42, 0x7B50, 0x7B5D, 0x7B6A, 0x7B78, 0x7B85, 0x7B92, 0x7B9F, 0x7BAC, 0x7BB9, 0x7BC6, 0x7BD3, 0x7BDF, 0x7BEC, 0x7BF9, 0x7C05, 0x7C11, 0x7C1E, 0x7C2A, 0x7C36, 0x7C42, 0x7C4E, 0x7C5A, 0x7C66, 0x7C72, 0x7C7E, 0x7C89, 0x7C95, 0x7CA0, 0x7CAC, 0x7CB7, 0x7CC2, 0x7CCE, 0x7CD9, 0x7CE4, 0x7CEF, 0x7CFA, 0x7D05, 0x7D0F, 0x7D1A, 0x7D25, 0x7D2F, 0x7D3A, 0x7D44, 0x7D4E, 0x7D58, 0x7D63, 0x7D6D, 0x7D77, 0x7D81, 0x7D8A, 0x7D94, 0x7D9E, 0x7DA7, 0x7DB1, 0x7DBA, 0x7DC4, 0x7DCD, 0x7DD6, 0x7DE0, 0x7DE9, 0x7DF2, 0x7DFB, 0x7E03, 0x7E0C, 0x7E15, 0x7E1E, 0x7E26, 0x7E2F, 0x7E37, 0x7E3F, 0x7E48, 0x7E50, 0x7E58, 0x7E60, 0x7E68, 0x7E70, 0x7E78, 0x7E7F, 0x7E87, 0x7E8E, 0x7E96, 0x7E9D, 0x7EA5, 0x7EAC, 0x7EB3, 0x7EBA, 0x7EC1, 0x7EC8, 0x7ECF, 0x7ED6, 0x7EDD, 0x7EE3, 0x7EEA, 0x7EF0, 0x7EF7, 0x7EFD, 0x7F03, 0x7F0A, 0x7F10, 0x7F16, 0x7F1C, 0x7F22, 0x7F27, 0x7F2D, 0x7F33, 0x7F38, 0x7F3E, 0x7F43, 0x7F49, 0x7F4E, 0x7F53, 0x7F58, 0x7F5D, 0x7F62, 0x7F67, 0x7F6C, 0x7F71, 0x7F75, 0x7F7A, 0x7F7E, 0x7F83, 0x7F87, 0x7F8B, 0x7F90, 0x7F94, 0x7F98, 0x7F9C, 0x7FA0, 0x7FA3, 0x7FA7, 0x7FAB, 0x7FAE, 0x7FB2, 0x7FB5, 0x7FB9, 0x7FBC, 0x7FBF, 0x7FC2, 0x7FC5, 0x7FC8, 0x7FCB, 0x7FCE, 0x7FD1, 0x7FD3, 0x7FD6, 0x7FD9, 0x7FDB, 0x7FDD, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF4, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFF, 0x7FFF, 0x7FFF, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000 +.half 0x0000, 0x0032, 0x0065, 0x0097, 0x00C9, 0x00FB, 0x012E, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028D, 0x02C0, 0x02F2, 0x0324, 0x0356, 0x0389, 0x03BB, 0x03ED, 0x041F, 0x0452, 0x0484, 0x04B6, 0x04E8, 0x051B, 0x054D, 0x057F, 0x05B1, 0x05E3, 0x0616, 0x0648, 0x067A, 0x06AC, 0x06DE, 0x0711, 0x0743, 0x0775, 0x07A7, 0x07D9, 0x080C, 0x083E, 0x0870, 0x08A2, 0x08D4, 0x0906, 0x0938, 0x096B, 0x099D, 0x09CF, 0x0A01, 0x0A33, 0x0A65, 0x0A97, 0x0AC9, 0x0AFB, 0x0B2D, 0x0B60, 0x0B92, 0x0BC4, 0x0BF6, 0x0C28, 0x0C5A, 0x0C8C, 0x0CBE, 0x0CF0, 0x0D22, 0x0D54, 0x0D86, 0x0DB8, 0x0DEA, 0x0E1C, 0x0E4E, 0x0E80, 0x0EB2, 0x0EE4, 0x0F15, 0x0F47, 0x0F79, 0x0FAB, 0x0FDD, 0x100F, 0x1041, 0x1073, 0x10A4, 0x10D6, 0x1108, 0x113A, 0x116C, 0x119E, 0x11CF, 0x1201, 0x1233, 0x1265, 0x1296, 0x12C8, 0x12FA, 0x132B, 0x135D, 0x138F, 0x13C1, 0x13F2, 0x1424, 0x1455, 0x1487, 0x14B9, 0x14EA, 0x151C, 0x154D, 0x157F, 0x15B1, 0x15E2, 0x1614, 0x1645, 0x1677, 0x16A8, 0x16DA, 0x170B, 0x173C, 0x176E, 0x179F, 0x17D1, 0x1802, 0x1833, 0x1865, 0x1896, 0x18C7, 0x18F9, 0x192A, 0x195B, 0x198D, 0x19BE, 0x19EF, 0x1A20, 0x1A51, 0x1A83, 0x1AB4, 0x1AE5, 0x1B16, 0x1B47, 0x1B78, 0x1BA9, 0x1BDA, 0x1C0C, 0x1C3D, 0x1C6E, 0x1C9F, 0x1CD0, 0x1D01, 0x1D31, 0x1D62, 0x1D93, 0x1DC4, 0x1DF5, 0x1E26, 0x1E57, 0x1E88, 0x1EB8, 0x1EE9, 0x1F1A, 0x1F4B, 0x1F7B, 0x1FAC, 0x1FDD, 0x200E, 0x203E, 0x206F, 0x209F, 0x20D0, 0x2101, 0x2131, 0x2162, 0x2192, 0x21C3, 0x21F3, 0x2224, 0x2254, 0x2284, 0x22B5, 0x22E5, 0x2316, 0x2346, 0x2376, 0x23A7, 0x23D7, 0x2407, 0x2437, 0x2467, 0x2498, 0x24C8, 0x24F8, 0x2528, 0x2558, 0x2588, 0x25B8, 0x25E8, 0x2618, 0x2648, 0x2678, 0x26A8, 0x26D8, 0x2708, 0x2738, 0x2768, 0x2797, 0x27C7, 0x27F7, 0x2827, 0x2856, 0x2886, 0x28B6, 0x28E5, 0x2915, 0x2945, 0x2974, 0x29A4, 0x29D3, 0x2A03, 0x2A32, 0x2A62, 0x2A91, 0x2AC1, 0x2AF0, 0x2B1F, 0x2B4F, 0x2B7E, 0x2BAD, 0x2BDC, 0x2C0C, 0x2C3B, 0x2C6A, 0x2C99, 0x2CC8, 0x2CF7, 0x2D26, 0x2D55, 0x2D84, 0x2DB3, 0x2DE2, 0x2E11, 0x2E40, 0x2E6F, 0x2E9E, 0x2ECC, 0x2EFB, 0x2F2A, 0x2F59, 0x2F87, 0x2FB6, 0x2FE5, 0x3013, 0x3042, 0x3070, 0x309F, 0x30CD, 0x30FC, 0x312A, 0x3159, 0x3187, 0x31B5, 0x31E4, 0x3212, 0x3240, 0x326E, 0x329D, 0x32CB, 0x32F9, 0x3327, 0x3355, 0x3383, 0x33B1, 0x33DF, 0x340D, 0x343B, 0x3469, 0x3497, 0x34C4, 0x34F2, 0x3520, 0x354E, 0x357B, 0x35A9, 0x35D7, 0x3604, 0x3632, 0x365F, 0x368D, 0x36BA, 0x36E8, 0x3715, 0x3742, 0x3770, 0x379D, 0x37CA, 0x37F7, 0x3825, 0x3852, 0x387F, 0x38AC, 0x38D9, 0x3906, 0x3933, 0x3960, 0x398D, 0x39BA, 0x39E7, 0x3A13, 0x3A40, 0x3A6D, 0x3A9A, 0x3AC6, 0x3AF3, 0x3B20, 0x3B4C, 0x3B79, 0x3BA5, 0x3BD2, 0x3BFE, 0x3C2A, 0x3C57, 0x3C83, 0x3CAF, 0x3CDC, 0x3D08, 0x3D34, 0x3D60, 0x3D8C, 0x3DB8, 0x3DE4, 0x3E10, 0x3E3C, 0x3E68, 0x3E94, 0x3EC0, 0x3EEC, 0x3F17, 0x3F43, 0x3F6F, 0x3F9A, 0x3FC6, 0x3FF1, 0x401D, 0x4048, 0x4074, 0x409F, 0x40CB, 0x40F6, 0x4121, 0x414D, 0x4178, 0x41A3, 0x41CE, 0x41F9, 0x4224, 0x424F, 0x427A, 0x42A5, 0x42D0, 0x42FB, 0x4326, 0x4351, 0x437B, 0x43A6, 0x43D1, 0x43FB, 0x4426, 0x4450, 0x447B, 0x44A5, 0x44D0, 0x44FA, 0x4524, 0x454F, 0x4579, 0x45A3, 0x45CD, 0x45F7, 0x4621, 0x464B, 0x4675, 0x469F, 0x46C9, 0x46F3, 0x471D, 0x4747, 0x4770, 0x479A, 0x47C4, 0x47ED, 0x4817, 0x4840, 0x486A, 0x4893, 0x48BD, 0x48E6, 0x490F, 0x4939, 0x4962, 0x498B, 0x49B4, 0x49DD, 0x4A06, 0x4A2F, 0x4A58, 0x4A81, 0x4AAA, 0x4AD3, 0x4AFB, 0x4B24, 0x4B4D, 0x4B75, 0x4B9E, 0x4BC7, 0x4BEF, 0x4C17, 0x4C40, 0x4C68, 0x4C91, 0x4CB9, 0x4CE1, 0x4D09, 0x4D31, 0x4D59, 0x4D81, 0x4DA9, 0x4DD1, 0x4DF9, 0x4E21, 0x4E49, 0x4E71, 0x4E98, 0x4EC0, 0x4EE8, 0x4F0F, 0x4F37, 0x4F5E, 0x4F85, 0x4FAD, 0x4FD4, 0x4FFB, 0x5023, 0x504A, 0x5071, 0x5098, 0x50BF, 0x50E6, 0x510D, 0x5134, 0x515B, 0x5181, 0x51A8, 0x51CF, 0x51F5, 0x521C, 0x5243, 0x5269, 0x5290, 0x52B6, 0x52DC, 0x5303, 0x5329, 0x534F, 0x5375, 0x539B, 0x53C1, 0x53E7, 0x540D, 0x5433, 0x5459, 0x547F, 0x54A4, 0x54CA, 0x54F0, 0x5515, 0x553B, 0x5560, 0x5586, 0x55AB, 0x55D0, 0x55F6, 0x561B, 0x5640, 0x5665, 0x568A, 0x56AF, 0x56D4, 0x56F9, 0x571E, 0x5743, 0x5767, 0x578C, 0x57B1, 0x57D5, 0x57FA, 0x581E, 0x5843, 0x5867, 0x588C, 0x58B0, 0x58D4, 0x58F8, 0x591C, 0x5940, 0x5964, 0x5988, 0x59AC, 0x59D0, 0x59F4, 0x5A18, 0x5A3B, 0x5A5F, 0x5A82, 0x5AA6, 0x5AC9, 0x5AED, 0x5B10, 0x5B34, 0x5B57, 0x5B7A, 0x5B9D, 0x5BC0, 0x5BE3, 0x5C06, 0x5C29, 0x5C4C, 0x5C6F, 0x5C91, 0x5CB4, 0x5CD7, 0x5CF9, 0x5D1C, 0x5D3E, 0x5D61, 0x5D83, 0x5DA5, 0x5DC8, 0x5DEA, 0x5E0C, 0x5E2E, 0x5E50, 0x5E72, 0x5E94, 0x5EB6, 0x5ED7, 0x5EF9, 0x5F1B, 0x5F3C, 0x5F5E, 0x5F80, 0x5FA1, 0x5FC2, 0x5FE4, 0x6005, 0x6026, 0x6047, 0x6068, 0x6089, 0x60AA, 0x60CB, 0x60EC, 0x610D, 0x612E, 0x614E, 0x616F, 0x6190, 0x61B0, 0x61D1, 0x61F1, 0x6211, 0x6232, 0x6252, 0x6272, 0x6292, 0x62B2, 0x62D2, 0x62F2, 0x6312, 0x6332, 0x6351, 0x6371, 0x6391, 0x63B0, 0x63D0, 0x63EF, 0x640F, 0x642E, 0x644D, 0x646C, 0x648B, 0x64AB, 0x64CA, 0x64E9, 0x6507, 0x6526, 0x6545, 0x6564, 0x6582, 0x65A1, 0x65C0, 0x65DE, 0x65FC, 0x661B, 0x6639, 0x6657, 0x6675, 0x6693, 0x66B2, 0x66D0, 0x66ED, 0x670B, 0x6729, 0x6747, 0x6764, 0x6782, 0x67A0, 0x67BD, 0x67DA, 0x67F8, 0x6815, 0x6832, 0x6850, 0x686D, 0x688A, 0x68A7, 0x68C4, 0x68E0, 0x68FD, 0x691A, 0x6937, 0x6953, 0x6970, 0x698C, 0x69A9, 0x69C5, 0x69E1, 0x69FD, 0x6A1A, 0x6A36, 0x6A52, 0x6A6E, 0x6A89, 0x6AA5, 0x6AC1, 0x6ADD, 0x6AF8, 0x6B14, 0x6B30, 0x6B4B, 0x6B66, 0x6B82, 0x6B9D, 0x6BB8, 0x6BD3, 0x6BEE, 0x6C09, 0x6C24, 0x6C3F, 0x6C5A, 0x6C75, 0x6C8F, 0x6CAA, 0x6CC4, 0x6CDF, 0x6CF9, 0x6D14, 0x6D2E, 0x6D48, 0x6D62, 0x6D7C, 0x6D96, 0x6DB0, 0x6DCA, 0x6DE4, 0x6DFE, 0x6E17, 0x6E31, 0x6E4A, 0x6E64, 0x6E7D, 0x6E97, 0x6EB0, 0x6EC9, 0x6EE2, 0x6EFB, 0x6F14, 0x6F2D, 0x6F46, 0x6F5F, 0x6F78, 0x6F90, 0x6FA9, 0x6FC2, 0x6FDA, 0x6FF2, 0x700B, 0x7023, 0x703B, 0x7053, 0x706B, 0x7083, 0x709B, 0x70B3, 0x70CB, 0x70E3, 0x70FA, 0x7112, 0x712A, 0x7141, 0x7158, 0x7170, 0x7187, 0x719E, 0x71B5, 0x71CC, 0x71E3, 0x71FA, 0x7211, 0x7228, 0x723F, 0x7255, 0x726C, 0x7282, 0x7299, 0x72AF, 0x72C5, 0x72DC, 0x72F2, 0x7308, 0x731E, 0x7334, 0x734A, 0x735F, 0x7375, 0x738B, 0x73A0, 0x73B6, 0x73CB, 0x73E1, 0x73F6, 0x740B, 0x7421, 0x7436, 0x744B, 0x7460, 0x7475, 0x7489, 0x749E, 0x74B3, 0x74C7, 0x74DC, 0x74F0, 0x7505, 0x7519, 0x752D, 0x7542, 0x7556, 0x756A, 0x757E, 0x7592, 0x75A6, 0x75B9, 0x75CD, 0x75E1, 0x75F4, 0x7608, 0x761B, 0x762E, 0x7642, 0x7655, 0x7668, 0x767B, 0x768E, 0x76A1, 0x76B4, 0x76C7, 0x76D9, 0x76EC, 0x76FE, 0x7711, 0x7723, 0x7736, 0x7748, 0x775A, 0x776C, 0x777E, 0x7790, 0x77A2, 0x77B4, 0x77C6, 0x77D8, 0x77E9, 0x77FB, 0x780C, 0x781E, 0x782F, 0x7840, 0x7851, 0x7863, 0x7874, 0x7885, 0x7895, 0x78A6, 0x78B7, 0x78C8, 0x78D8, 0x78E9, 0x78F9, 0x790A, 0x791A, 0x792A, 0x793A, 0x794A, 0x795B, 0x796A, 0x797A, 0x798A, 0x799A, 0x79AA, 0x79B9, 0x79C9, 0x79D8, 0x79E7, 0x79F7, 0x7A06, 0x7A15, 0x7A24, 0x7A33, 0x7A42, 0x7A51, 0x7A60, 0x7A6E, 0x7A7D, 0x7A8C, 0x7A9A, 0x7AA8, 0x7AB7, 0x7AC5, 0x7AD3, 0x7AE1, 0x7AEF, 0x7AFD, 0x7B0B, 0x7B19, 0x7B27, 0x7B34, 0x7B42, 0x7B50, 0x7B5D, 0x7B6A, 0x7B78, 0x7B85, 0x7B92, 0x7B9F, 0x7BAC, 0x7BB9, 0x7BC6, 0x7BD3, 0x7BDF, 0x7BEC, 0x7BF9, 0x7C05, 0x7C11, 0x7C1E, 0x7C2A, 0x7C36, 0x7C42, 0x7C4E, 0x7C5A, 0x7C66, 0x7C72, 0x7C7E, 0x7C89, 0x7C95, 0x7CA0, 0x7CAC, 0x7CB7, 0x7CC2, 0x7CCE, 0x7CD9, 0x7CE4, 0x7CEF, 0x7CFA, 0x7D05, 0x7D0F, 0x7D1A, 0x7D25, 0x7D2F, 0x7D3A, 0x7D44, 0x7D4E, 0x7D58, 0x7D63, 0x7D6D, 0x7D77, 0x7D81, 0x7D8A, 0x7D94, 0x7D9E, 0x7DA7, 0x7DB1, 0x7DBA, 0x7DC4, 0x7DCD, 0x7DD6, 0x7DE0, 0x7DE9, 0x7DF2, 0x7DFB, 0x7E03, 0x7E0C, 0x7E15, 0x7E1E, 0x7E26, 0x7E2F, 0x7E37, 0x7E3F, 0x7E48, 0x7E50, 0x7E58, 0x7E60, 0x7E68, 0x7E70, 0x7E78, 0x7E7F, 0x7E87, 0x7E8E, 0x7E96, 0x7E9D, 0x7EA5, 0x7EAC, 0x7EB3, 0x7EBA, 0x7EC1, 0x7EC8, 0x7ECF, 0x7ED6, 0x7EDD, 0x7EE3, 0x7EEA, 0x7EF0, 0x7EF7, 0x7EFD, 0x7F03, 0x7F0A, 0x7F10, 0x7F16, 0x7F1C, 0x7F22, 0x7F27, 0x7F2D, 0x7F33, 0x7F38, 0x7F3E, 0x7F43, 0x7F49, 0x7F4E, 0x7F53, 0x7F58, 0x7F5D, 0x7F62, 0x7F67, 0x7F6C, 0x7F71, 0x7F75, 0x7F7A, 0x7F7E, 0x7F83, 0x7F87, 0x7F8B, 0x7F90, 0x7F94, 0x7F98, 0x7F9C, 0x7FA0, 0x7FA3, 0x7FA7, 0x7FAB, 0x7FAE, 0x7FB2, 0x7FB5, 0x7FB9, 0x7FBC, 0x7FBF, 0x7FC2, 0x7FC5, 0x7FC8, 0x7FCB, 0x7FCE, 0x7FD1, 0x7FD3, 0x7FD6, 0x7FD9, 0x7FDB, 0x7FDD, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF4, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFF, 0x7FFF, 0x7FFF, 0x8000, 0x8000, 0x8000, 0x8000 glabel D_800DDC3E -.half 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 +.half 0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 diff --git a/lib/asm/exception.s b/lib/asm/exception.s index 44eb877d..7d673408 100644 --- a/lib/asm/exception.s +++ b/lib/asm/exception.s @@ -15,4 +15,4 @@ .include "lib/asm/exception/__osEnqueueThread.s" .include "lib/asm/exception/__osPopThread.s" .include "lib/asm/exception/__osDispatchThread.s" -.include "lib/asm/exception/D_800D35A0.s" +.include "lib/asm/exception/__osCleanupThread.s" diff --git a/lib/asm/exception/D_800D35A0.s b/lib/asm/exception/__osCleanupThread.s similarity index 87% rename from lib/asm/exception/D_800D35A0.s rename to lib/asm/exception/__osCleanupThread.s index d8efce4c..686faede 100644 --- a/lib/asm/exception/D_800D35A0.s +++ b/lib/asm/exception/__osCleanupThread.s @@ -1,4 +1,4 @@ -glabel D_800D35A0 +glabel __osCleanupThread /* 0D41A0 800D35A0 0C035980 */ jal osDestroyThread /* 0D41A4 800D35A4 00002025 */ move $a0, $zero /* 0D41A8 800D35A8 00000000 */ nop diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index a6001659..3d385a20 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -83,8 +83,19 @@ s16 D_800DD3F4[8] = { 255, -1, 20, -1 }; s32 D_800DD404 = 12; -s32 D_800DD408 = 0x00FFFFFF; -s32 D_800DD40C = 0x001EFFFF; // Unused? + +typedef struct unknown800DD408 { + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u16 unk4; + u16 unk6; +} unknown800DD408; + +unknown800DD408 D_800DD408 = { + 0, 255, 255, 255, 30, 0xFFFF +}; // Unused? char *D_800DD410[3] = { diff --git a/tools/python/generate_assets.py b/tools/python/generate_assets.py index bd85b7a2..b5776522 100644 --- a/tools/python/generate_assets.py +++ b/tools/python/generate_assets.py @@ -108,19 +108,27 @@ class GenerateAssets: # TODO: Will probably need to refactor this later. def generate_ucode_files(self): assetsUCodeText = '# This file was generated by generate_ld.py\n\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_unknown.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_boot.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_f3ddkr_dram.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_f3ddkr_fifo.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_f3ddkr_xbus.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_unknown_2.bin"\n' + assetsUCodeText += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsUCodeText += self.generate_ucode_file('rspUnknownStart', 'ucode/ucode_unknown.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRBootStart', 'ucode/ucode_boot.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRDramStart', 'ucode/ucode_f3ddkr_dram.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRFifoStart', 'ucode/ucode_f3ddkr_fifo.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRXbusStart', 'ucode/ucode_f3ddkr_xbus.bin') + assetsUCodeText += self.generate_ucode_file('rspUnknown2Start', 'ucode/ucode_unknown_2.bin') with open(self.UCODE_TEXT_FILENAME, "w") as assetsFile: assetsFile.write(assetsUCodeText) assetsUCodeData = '# This file was generated by generate_ld.py\n\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_f3ddkr_dram.bin"\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_f3ddkr_fifo.bin"\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_f3ddkr_xbus.bin"\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_unknown.bin"\n' + assetsUCodeData += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataDramStart', 'ucode/data_f3ddkr_dram.bin') + assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataFifoStart', 'ucode/data_f3ddkr_fifo.bin') + assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataXbusStart', 'ucode/data_f3ddkr_xbus.bin') + assetsUCodeData += self.generate_ucode_file('rspUnknownDataStart', 'ucode/data_unknown.bin') + with open(self.UCODE_DATA_FILENAME, "w") as assetsFile: assetsFile.write(assetsUCodeData) + + def generate_ucode_file(self, label, path): + return 'glabel ' + label + '\n.incbin "' + self.BUILD_DIR + '/' + path + '"\n' + + diff --git a/undefined_syms.txt b/undefined_syms.txt index 758764b4..ada2c3ae 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -9,6 +9,7 @@ D_00FF0018 = 0x00FF0018; D_3B9A0001 = 0x3B9A0001; D_46FF9630 = 0x46FF9630; D_57410001 = 0x57410001; + D_80000004 = 0x80000004; D_80000008 = 0x80000008; D_8000000C = 0x8000000C; @@ -21,25 +22,6 @@ osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -D_80065D40 = 0x80065D40; -__osCleanupThread = 0x800D35A0; -D_800D7600 = 0x800D7600; -D_800D84C0 = 0x800D84C0; -D_800D8590 = 0x800D8590; -D_800D9790 = 0x800D9790; -D_800DA970 = 0x800DA970; - -D_800DD407 = 0x800DD407; -D_800DDC3E = 0x800DDC3E; -D_800DF598 = 0x800DF598; -D_800DF763 = 0x800DF763; -D_800DF7C6 = 0x800DF7C6; -D_800DF7C8 = 0x800DF7C8; -D_800DF7CA = 0x800DF7CA; -D_800DF7DA = 0x800DF7DA; -D_800DF7E4 = 0x800DF7E4; -D_800DF7EC = 0x800DF7EC; -D_800DF7F4 = 0x800DF7F4; D_800DFA14 = 0x800DFA14; D_800DFA48 = 0x800DFA48; D_800DFDB5 = 0x800DFDB5; @@ -382,8 +364,6 @@ D_800E8EF0 = 0x800E8EF0; D_800E8EFC = 0x800E8EFC; D_800E95FC = 0x800E95FC; -D_800EA3A0 = 0x800EA3A0; -D_800EABA0 = 0x800EABA0; D_800EBF60 = 0x800EBF60; gALHeap = 0x80115CE8; ALSeqFile_80115CF8 = 0x80115CF8; @@ -1502,6 +1482,7 @@ D_8012D230 = 0x8012D230; D_8012D240 = 0x8012D240; D_8012D3F0 = 0x8012D3F0; D_8012FFFF = 0x8012FFFF; + D_A0000200 = 0xA0000200; D_A0000284 = 0xA0000284; SP_IMEM = 0xA4001000; @@ -1539,8 +1520,10 @@ D_A4800004 = 0xA4800004; D_A4800010 = 0xA4800010; D_A4800018 = 0xA4800018; D_A5000508 = 0xA5000508; + D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; + D_FF7F0001 = 0xFF7F0001; D_FFFDFFFB = 0xFFFDFFFB; D_FFFF0028 = 0xFFFF0028; \ No newline at end of file From 6f67d5b53d843ae222b6e458212d977926bf1edf Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 16:58:05 -0500 Subject: [PATCH 03/39] Even more progress with undefined_syms --- .../unknown_032760/func_80039330.s | 4 ++-- .../unknown_080500/MenuOptionsLoop.s | 8 +++---- .../unknown_080500/func_8007F900.s | 20 ++++++++-------- .../unknown_080500/func_80084854.s | 8 +++---- .../unknown_080500/func_8008C168.s | 20 ++++++++-------- .../unknown_080500/func_80094A5C.s | 24 +++++++++---------- .../unknown_080500/func_80094D28.s | 4 ++-- .../unknown_080500/func_80098EBC.s | 4 ++-- src/unknown_080500.c | 22 ++++++++--------- tools/python/undefined_sym_fix.py | 18 ++++++++++++++ undefined_syms.txt | 19 +-------------- 11 files changed, 76 insertions(+), 75 deletions(-) create mode 100644 tools/python/undefined_sym_fix.py diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index a44839ef..9e814259 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -721,7 +721,7 @@ glabel L80039BB8 /* 03A940 80039D40 818D01D6 */ lb $t5, 0x1d6($t4) /* 03A944 80039D44 2408000F */ li $t0, 15 /* 03A948 80039D48 11A20011 */ beq $t5, $v0, .L80039D90 -/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(D_800E0235) # $a0, 0x800e +/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(D_800E0198+157) # $a0, 0x800e /* 03A950 80039D50 344E0080 */ ori $t6, $v0, 0x80 /* 03A954 80039D54 44804000 */ mtc1 $zero, $f8 /* 03A958 80039D58 A06E0000 */ sb $t6, ($v1) @@ -732,7 +732,7 @@ glabel L80039BB8 /* 03A96C 80039D6C 24050001 */ li $a1, 1 /* 03A970 80039D70 830401D6 */ lb $a0, 0x1d6($t8) /* 03A974 80039D74 00000000 */ nop -/* 03A978 80039D78 24840235 */ addiu $a0, %lo(D_800E0235) # addiu $a0, $a0, 0x235 +/* 03A978 80039D78 24840235 */ addiu $a0, %lo(D_800E0198+157) # addiu $a0, $a0, 0x235 /* 03A97C 80039D7C 3099FFFF */ andi $t9, $a0, 0xffff /* 03A980 80039D80 0C00EB0F */ jal func_8003AC3C /* 03A984 80039D84 03202025 */ move $a0, $t9 diff --git a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s index 4128349a..a71c4304 100644 --- a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s @@ -163,10 +163,10 @@ glabel MenuOptionsLoop /* 0851B4 800845B4 00002025 */ move $a0, $zero /* 0851B8 800845B8 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e /* 0851BC 800845BC 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) -/* 0851C0 800845C0 3C01800E */ lui $at, %hi(D_800DFA14) # $at, 0x800e +/* 0851C0 800845C0 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e /* 0851C4 800845C4 8D6A02DC */ lw $t2, 0x2dc($t3) /* 0851C8 800845C8 1000000E */ b .L80084604 -/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(D_800DFA14)($at) +/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(D_800DFA10+4)($at) .L800845D0: /* 0851D0 800845D0 0C000741 */ jal func_80001D04 /* 0851D4 800845D4 00002825 */ move $a1, $zero @@ -177,10 +177,10 @@ glabel MenuOptionsLoop /* 0851E8 800845E8 24040001 */ li $a0, 1 /* 0851EC 800845EC 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e /* 0851F0 800845F0 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) -/* 0851F4 800845F4 3C01800E */ lui $at, %hi(D_800DFA14) # $at, 0x800e +/* 0851F4 800845F4 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e /* 0851F8 800845F8 8D8D02D8 */ lw $t5, 0x2d8($t4) /* 0851FC 800845FC 00000000 */ nop -/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA14)($at) +/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA10+4)($at) .L80084604: /* 085204 80084604 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e /* 085208 80084608 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8007F900.s b/asm/non_matchings/unknown_080500/func_8007F900.s index 81e424e6..8d6f187b 100644 --- a/asm/non_matchings/unknown_080500/func_8007F900.s +++ b/asm/non_matchings/unknown_080500/func_8007F900.s @@ -395,25 +395,25 @@ glabel func_8007F900 /* 080AF0 8007FEF0 24A5FFD8 */ addiu $a1, %lo(D_800DFFD8) # addiu $a1, $a1, -0x28 /* 080AF4 8007FEF4 AC6C0004 */ sw $t4, 4($v1) /* 080AF8 8007FEF8 8C8E0288 */ lw $t6, 0x288($a0) -/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(D_800E002C) # $at, 0x800e +/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(D_800DFFD8+84) # $at, 0x800e /* 080B00 8007FF00 AC6E0008 */ sw $t6, 8($v1) /* 080B04 8007FF04 8C8D0260 */ lw $t5, 0x260($a0) /* 080B08 8007FF08 2482000C */ addiu $v0, $a0, 0xc /* 080B0C 8007FF0C ACAD0014 */ sw $t5, 0x14($a1) /* 080B10 8007FF10 8C8F0260 */ lw $t7, 0x260($a0) -/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(D_800E0038) # $v1, 0x800e +/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(D_800DFFD8+96) # $v1, 0x800e /* 080B18 8007FF18 ACAF0034 */ sw $t7, 0x34($a1) /* 080B1C 8007FF1C 8C980298 */ lw $t8, 0x298($a0) -/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(D_800E0038) # addiu $v1, $v1, 0x38 -/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(D_800E002C)($at) +/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(D_800DFFD8+96) # addiu $v1, $v1, 0x38 +/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(D_800DFFD8+84)($at) /* 080B28 8007FF28 8C99029C */ lw $t9, 0x29c($a0) -/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(D_800E004C) # $at, 0x800e -/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(D_800E004C)($at) +/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(D_800DFFD8+116) # $at, 0x800e +/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(D_800DFFD8+116)($at) /* 080B34 8007FF34 8C8A02A0 */ lw $t2, 0x2a0($a0) -/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(D_800E0138) # $a0, 0x800e -/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(D_800E006C) # $at, 0x800e -/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(D_800E0138) # addiu $a0, $a0, 0x138 -/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(D_800E006C)($at) +/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(D_800DFFD8+352) # $a0, 0x800e +/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(D_800DFFD8+148) # $at, 0x800e +/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(D_800DFFD8+352) # addiu $a0, $a0, 0x138 +/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(D_800DFFD8+148)($at) .L8007FF48: /* 080B48 8007FF48 8C4B0298 */ lw $t3, 0x298($v0) /* 080B4C 8007FF4C 24630080 */ addiu $v1, $v1, 0x80 diff --git a/asm/non_matchings/unknown_080500/func_80084854.s b/asm/non_matchings/unknown_080500/func_80084854.s index 89f6f5a9..6fa2ee02 100644 --- a/asm/non_matchings/unknown_080500/func_80084854.s +++ b/asm/non_matchings/unknown_080500/func_80084854.s @@ -75,12 +75,12 @@ glabel func_80084854 /* 085568 80084968 01CD9823 */ subu $s3, $t6, $t5 .L8008496C: /* 08556C 8008496C 8DEFFAC8 */ lw $t7, %lo(D_800DFAC8)($t7) -/* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA48) # $at, 0x800e +/* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA3C+12) # $at, 0x800e /* 085574 80084974 000FC080 */ sll $t8, $t7, 2 /* 085578 80084978 0338C821 */ addu $t9, $t9, $t8 /* 08557C 8008497C 8F3969D0 */ lw $t9, %lo(D_801269D0)($t9) /* 085580 80084980 0C019FCB */ jal func_80067F2C -/* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA48)($at) +/* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA3C+12)($at) /* 085588 80084988 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 /* 08558C 8008498C 8D080300 */ lw $t0, %lo(osTvType)($t0) /* 085590 80084990 3C11FFC0 */ lui $s1, (0xFFC040FF >> 16) # lui $s1, 0xffc0 @@ -204,7 +204,7 @@ glabel func_80084854 /* 085760 80084B60 00001825 */ move $v1, $zero /* 085764 80084B64 29810005 */ slti $at, $t4, 5 /* 085768 80084B68 10200005 */ beqz $at, .L80084B80 -/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA48) # $t5, 0x800e +/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA3C+12) # $t5, 0x800e /* 085770 80084B70 3C118012 */ lui $s1, %hi(D_80126C46) # $s1, 0x8012 /* 085774 80084B74 86316C46 */ lh $s1, %lo(D_80126C46)($s1) /* 085778 80084B78 1000000E */ b .L80084BB4 @@ -225,7 +225,7 @@ glabel func_80084854 /* 0857AC 80084BAC 10000001 */ b .L80084BB4 /* 0857B0 80084BB0 24110006 */ li $s1, 6 .L80084BB4: -/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(D_800DFA48)($t5) +/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(D_800DFA3C+12)($t5) /* 0857B8 80084BB8 00037100 */ sll $t6, $v1, 4 /* 0857BC 80084BBC 11A00026 */ beqz $t5, .L80084C58 /* 0857C0 80084BC0 3C0F800E */ lui $t7, %hi(D_800DFA3C) # $t7, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8008C168.s b/asm/non_matchings/unknown_080500/func_8008C168.s index 243201a2..ec55cfb5 100644 --- a/asm/non_matchings/unknown_080500/func_8008C168.s +++ b/asm/non_matchings/unknown_080500/func_8008C168.s @@ -22,10 +22,10 @@ glabel func_8008C168 /* 08CDB8 8008C1B8 0C000445 */ jal func_80001114 /* 08CDBC 8008C1BC 00000000 */ nop /* 08CDC0 8008C1C0 82080000 */ lb $t0, ($s0) -/* 08CDC4 8008C1C4 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CDC4 8008C1C4 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CDC8 8008C1C8 00084840 */ sll $t1, $t0, 1 /* 08CDCC 8008C1CC 00892021 */ addu $a0, $a0, $t1 -/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CDD4 8008C1D4 0C000445 */ jal func_80001114 /* 08CDD8 8008C1D8 00000000 */ nop /* 08CDDC 8008C1DC 3C058012 */ lui $a1, %hi(D_801263C0) # $a1, 0x8012 @@ -57,10 +57,10 @@ glabel func_8008C168 /* 08CE3C 8008C23C 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CE40 8008C240 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CE44 8008C244 806E0000 */ lb $t6, ($v1) -/* 08CE48 8008C248 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CE48 8008C248 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CE4C 8008C24C 000E7840 */ sll $t7, $t6, 1 /* 08CE50 8008C250 008F2021 */ addu $a0, $a0, $t7 -/* 08CE54 8008C254 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CE54 8008C254 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CE58 8008C258 0C00045C */ jal func_80001170 /* 08CE5C 8008C25C 00000000 */ nop .L8008C260: @@ -92,10 +92,10 @@ glabel func_8008C168 /* 08CEC0 8008C2C0 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CEC4 8008C2C4 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CEC8 8008C2C8 806C0000 */ lb $t4, ($v1) -/* 08CECC 8008C2CC 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CECC 8008C2CC 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CED0 8008C2D0 000C6840 */ sll $t5, $t4, 1 /* 08CED4 8008C2D4 008D2021 */ addu $a0, $a0, $t5 -/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CEDC 8008C2DC 90650003 */ lbu $a1, 3($v1) /* 08CEE0 8008C2E0 0C00049A */ jal func_80001268 /* 08CEE4 8008C2E4 00000000 */ nop @@ -122,10 +122,10 @@ glabel func_8008C168 /* 08CF34 8008C334 0C000445 */ jal func_80001114 /* 08CF38 8008C338 00000000 */ nop /* 08CF3C 8008C33C 820A0000 */ lb $t2, ($s0) -/* 08CF40 8008C340 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CF40 8008C340 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CF44 8008C344 000A5840 */ sll $t3, $t2, 1 /* 08CF48 8008C348 008B2021 */ addu $a0, $a0, $t3 -/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CF50 8008C350 0C000445 */ jal func_80001114 /* 08CF54 8008C354 00000000 */ nop /* 08CF58 8008C358 1000000E */ b .L8008C394 @@ -136,10 +136,10 @@ glabel func_8008C168 /* 08CF68 8008C368 0C00049A */ jal func_80001268 /* 08CF6C 8008C36C 306500FF */ andi $a1, $v1, 0xff /* 08CF70 8008C370 820D0000 */ lb $t5, ($s0) -/* 08CF74 8008C374 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CF74 8008C374 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CF78 8008C378 000D7840 */ sll $t7, $t5, 1 /* 08CF7C 8008C37C 008F2021 */ addu $a0, $a0, $t7 -/* 08CF80 8008C380 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CF80 8008C380 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CF84 8008C384 92050003 */ lbu $a1, 3($s0) /* 08CF88 8008C388 0C00049A */ jal func_80001268 /* 08CF8C 8008C38C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80094A5C.s b/asm/non_matchings/unknown_080500/func_80094A5C.s index 2156883e..31f49e00 100644 --- a/asm/non_matchings/unknown_080500/func_80094A5C.s +++ b/asm/non_matchings/unknown_080500/func_80094A5C.s @@ -36,16 +36,16 @@ glabel func_80094A5C /* 0956E0 80094AE0 000B6080 */ sll $t4, $t3, 2 /* 0956E4 80094AE4 00AC6821 */ addu $t5, $a1, $t4 /* 0956E8 80094AE8 8DAE0000 */ lw $t6, ($t5) -/* 0956EC 80094AEC 3C01800E */ lui $at, %hi(D_800E0C00) # $at, 0x800e +/* 0956EC 80094AEC 3C01800E */ lui $at, %hi(D_800E0BEC+20) # $at, 0x800e /* 0956F0 80094AF0 AFA2001C */ sw $v0, 0x1c($sp) /* 0956F4 80094AF4 0C003932 */ jal func_8000E4C8 -/* 0956F8 80094AF8 AC2E0C00 */ sw $t6, %lo(D_800E0C00)($at) +/* 0956F8 80094AF8 AC2E0C00 */ sw $t6, %lo(D_800E0BEC+20)($at) /* 0956FC 80094AFC 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e /* 095700 80094B00 8FA9001C */ lw $t1, 0x1c($sp) /* 095704 80094B04 14400034 */ bnez $v0, .L80094BD8 /* 095708 80094B08 24A50AF0 */ addiu $a1, %lo(D_800E0AF0) # addiu $a1, $a1, 0xaf0 -/* 09570C 80094B0C 3C06800E */ lui $a2, %hi(D_800E0DCC) # $a2, 0x800e -/* 095710 80094B10 24C60DCC */ addiu $a2, %lo(D_800E0DCC) # addiu $a2, $a2, 0xdcc +/* 09570C 80094B0C 3C06800E */ lui $a2, %hi(D_800E0CEC+224) # $a2, 0x800e +/* 095710 80094B10 24C60DCC */ addiu $a2, %lo(D_800E0CEC+224) # addiu $a2, $a2, 0xdcc /* 095714 80094B14 00002025 */ move $a0, $zero /* 095718 80094B18 240700C0 */ li $a3, 192 /* 09571C 80094B1C 00001825 */ move $v1, $zero @@ -73,19 +73,19 @@ glabel func_80094A5C /* 095768 80094B68 0C027B20 */ jal is_in_two_player_adventure /* 09576C 80094B6C 00000000 */ nop /* 095770 80094B70 10400019 */ beqz $v0, .L80094BD8 -/* 095774 80094B74 3C0F800E */ lui $t7, %hi(D_800E0D40) # $t7, 0x800e -/* 095778 80094B78 8DEF0D40 */ lw $t7, %lo(D_800E0D40)($t7) -/* 09577C 80094B7C 3C01800E */ lui $at, %hi(D_800E0D20) # $at, 0x800e -/* 095780 80094B80 3C18800E */ lui $t8, %hi(D_800E0D60) # $t8, 0x800e -/* 095784 80094B84 AC2F0D20 */ sw $t7, %lo(D_800E0D20)($at) -/* 095788 80094B88 8F180D60 */ lw $t8, %lo(D_800E0D60)($t8) +/* 095774 80094B74 3C0F800E */ lui $t7, %hi(D_800E0CEC+84) # $t7, 0x800e +/* 095778 80094B78 8DEF0D40 */ lw $t7, %lo(D_800E0CEC+84)($t7) +/* 09577C 80094B7C 3C01800E */ lui $at, %hi(D_800E0CEC+52) # $at, 0x800e +/* 095780 80094B80 3C18800E */ lui $t8, %hi(D_800E0CEC+116) # $t8, 0x800e +/* 095784 80094B84 AC2F0D20 */ sw $t7, %lo(D_800E0CEC+52)($at) +/* 095788 80094B88 8F180D60 */ lw $t8, %lo(D_800E0CEC+116)($t8) /* 09578C 80094B8C 24040002 */ li $a0, 2 /* 095790 80094B90 3C03800E */ lui $v1, %hi(D_800E0CEC) # $v1, 0x800e /* 095794 80094B94 24630CEC */ addiu $v1, %lo(D_800E0CEC) # addiu $v1, $v1, 0xcec -/* 095798 80094B98 3C01800E */ lui $at, %hi(D_800E0D40) # $at, 0x800e +/* 095798 80094B98 3C01800E */ lui $at, %hi(D_800E0CEC+84) # $at, 0x800e /* 09579C 80094B9C 0004C940 */ sll $t9, $a0, 5 /* 0957A0 80094BA0 00791021 */ addu $v0, $v1, $t9 -/* 0957A4 80094BA4 AC380D40 */ sw $t8, %lo(D_800E0D40)($at) +/* 0957A4 80094BA4 AC380D40 */ sw $t8, %lo(D_800E0CEC+84)($at) /* 0957A8 80094BA8 8C4D0094 */ lw $t5, 0x94($v0) /* 0957AC 80094BAC 8C4B00B4 */ lw $t3, 0xb4($v0) /* 0957B0 80094BB0 8C4C0074 */ lw $t4, 0x74($v0) diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 6c4aa5c1..59a489f6 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -241,8 +241,8 @@ glabel L80094FB0 /* 095C7C 8009507C 10000142 */ b .L80095588 /* 095C80 80095080 A04700CE */ sb $a3, 0xce($v0) glabel L80095084 -/* 095C84 80095084 3C06800E */ lui $a2, %hi(D_800E0DCC) # $a2, 0x800e -/* 095C88 80095088 24C60DCC */ addiu $a2, %lo(D_800E0DCC) # addiu $a2, $a2, 0xdcc +/* 095C84 80095084 3C06800E */ lui $a2, %hi(D_800E0CEC+224) # $a2, 0x800e +/* 095C88 80095088 24C60DCC */ addiu $a2, %lo(D_800E0CEC+224) # addiu $a2, $a2, 0xdcc /* 095C8C 8009508C 00002825 */ move $a1, $zero /* 095C90 80095090 24110008 */ li $s1, 8 .L80095094: diff --git a/asm/non_matchings/unknown_080500/func_80098EBC.s b/asm/non_matchings/unknown_080500/func_80098EBC.s index 868619e5..7b2f7b44 100644 --- a/asm/non_matchings/unknown_080500/func_80098EBC.s +++ b/asm/non_matchings/unknown_080500/func_80098EBC.s @@ -19,7 +19,7 @@ glabel func_80098EBC /* 099AFC 80098EFC 00002025 */ move $a0, $zero /* 099B00 80098F00 19200024 */ blez $t1, .L80098F94 /* 099B04 80098F04 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e -/* 099B08 80098F08 3C05800E */ lui $a1, %hi(D_800E1088) # $a1, 0x800e +/* 099B08 80098F08 3C05800E */ lui $a1, %hi(D_800E1048+64) # $a1, 0x800e /* 099B0C 80098F0C 3C0B8012 */ lui $t3, %hi(D_801263E0) # $t3, 0x8012 /* 099B10 80098F10 3C088012 */ lui $t0, %hi(D_80126420) # $t0, 0x8012 /* 099B14 80098F14 3C078012 */ lui $a3, %hi(D_80126418) # $a3, 0x8012 @@ -27,7 +27,7 @@ glabel func_80098EBC /* 099B1C 80098F1C 24E76418 */ addiu $a3, %lo(D_80126418) # addiu $a3, $a3, 0x6418 /* 099B20 80098F20 25086420 */ addiu $t0, %lo(D_80126420) # addiu $t0, $t0, 0x6420 /* 099B24 80098F24 256B63E0 */ addiu $t3, %lo(D_801263E0) # addiu $t3, $t3, 0x63e0 -/* 099B28 80098F28 24A51088 */ addiu $a1, %lo(D_800E1088) # addiu $a1, $a1, 0x1088 +/* 099B28 80098F28 24A51088 */ addiu $a1, %lo(D_800E1048+64) # addiu $a1, $a1, 0x1088 .L80098F2C: /* 099B2C 80098F2C 29410003 */ slti $at, $t2, 3 /* 099B30 80098F30 10200011 */ beqz $at, .L80098F78 diff --git a/src/unknown_080500.c b/src/unknown_080500.c index 51e3078a..a4dff02b 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -643,15 +643,16 @@ s16 D_800E0710[16] = { 0x16, 0x17, 0x20, 0x00 }; -s16 D_800E0730[18] = { +s16 D_800E0730[19] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000 + 0x0000, 0x0000, 0x0000 }; -s16 D_800E0758[56] = { - 0x0000, 0x0000, 0xFFFF, 0xFFFF, + +s16 D_800E0758[54] = { + 0xFFFF, 0xFFFF, 0x0129, 0x011A, 0x0120, 0x0115, 0x0126, 0x011D, 0x0130, 0x0121, 0x0117, 0x0154, 0x0128, 0x0119, @@ -782,8 +783,8 @@ s16 D_800E0A40[8] = { unk800DFC10 D_800E0A50 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A60 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A70 = { NULL, 0, 0, NULL, 0 }; -unk800DFC10 D_800E0A90 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A80 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0A90 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AA0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AB0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AC0 = { NULL, 0, 0, NULL, 0 }; @@ -1738,7 +1739,6 @@ void func_800841B8(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") #else -extern s32 D_800DFA14; extern s32 D_8012644C; void func_80084734(void); @@ -1801,12 +1801,12 @@ s32 MenuOptionsLoop(s32 arg0) { func_80001D04(0xEB, 0); func_8009EABC(0, 0x2000000); func_800C2AF4(0); - D_800DFA14 = D_800DF4A0->unk2DC; + D_800DFA10[1] = D_800DF4A0->unk2DC; } else { func_80001D04(0xEB, 0); func_8009EA78(0, 0x2000000); func_800C2AF4(1); - D_800DFA14 = D_800DF4A0->unk2D8; + D_800DFA10[1] = D_800DF4A0->unk2D8; } } else { // Move up & down the list @@ -3660,9 +3660,9 @@ void func_80098EBC(s32 arg0) { fade = (test >> 1) + 0x80; } - D_800E1088[i][0].filterRed = fade; - D_800E1088[i][0].filterGreen = fade; - D_800E1088[i][0].filterBlue = fade; + D_800E1048+64[i][0].filterRed = fade; + D_800E1048+64[i][0].filterGreen = fade; + D_800E1048+64[i][0].filterBlue = fade; } if (D_801263E0 == 2 || D_801263E0 == 3) { diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py new file mode 100644 index 00000000..1bac3917 --- /dev/null +++ b/tools/python/undefined_sym_fix.py @@ -0,0 +1,18 @@ +import subprocess +import sys +import argparse + +parser = argparse.ArgumentParser(description="") +parser.add_argument("baseLabel", help="Base label") +parser.add_argument("badLabel", help="Bad label") +args = parser.parse_args() + +baseAddress = int(args.baseLabel[-8:], 16) +badAddress = int(args.badLabel[-8:], 16) + +if baseAddress >= badAddress: + raise Exception('baseLabel should be smaller! base = ' + hex(baseAddress) + ', bad = ' + hex(badAddress)) + +newLabel = args.baseLabel + '+' + str(badAddress-baseAddress) + +subprocess.run(['./rename_sym.sh', args.badLabel, newLabel]) diff --git a/undefined_syms.txt b/undefined_syms.txt index ada2c3ae..c5d6acd5 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -22,25 +22,8 @@ osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -D_800DFA14 = 0x800DFA14; -D_800DFA48 = 0x800DFA48; -D_800DFDB5 = 0x800DFDB5; D_800E0001 = 0x800E0001; -D_800E002C = 0x800E002C; -D_800E0038 = 0x800E0038; -D_800E004C = 0x800E004C; -D_800E006C = 0x800E006C; -D_800E0138 = 0x800E0138; -D_800E0235 = 0x800E0235; -D_800E0758 = 0x800E0758; -D_800E0A80 = 0x800E0A80; -D_800E0A90 = 0x800E0A90; -D_800E0C00 = 0x800E0C00; -D_800E0D20 = 0x800E0D20; -D_800E0D40 = 0x800E0D40; -D_800E0D60 = 0x800E0D60; -D_800E0DCC = 0x800E0DCC; -D_800E1088 = 0x800E1088; + D_800E1B58 = 0x800E1B58; D_800E1DA8 = 0x800E1DA8; D_800E1DB0 = 0x800E1DB0; From 9747e94380f44330435b2c94eed1f1746a07ce34 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 17:24:04 -0500 Subject: [PATCH 04/39] Pushing current progress on undefined_syms --- asm/non_matchings/unknown_080500/MenuCreditsLoop.s | 8 ++++---- asm/non_matchings/unknown_080500/func_8007FFEC.s | 8 ++++---- asm/non_matchings/unknown_09F8F0/func_800A0BD4.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800AD144.s | 8 ++++---- src/unknown_09F8F0.c | 6 +++--- undefined_syms.txt | 8 +------- 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index de982047..aff15d94 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -266,12 +266,12 @@ glabel MenuCreditsLoop /* 09C2EC 8009B6EC 14410005 */ bne $v0, $at, .L8009B704 /* 09C2F0 8009B6F0 2418FF60 */ li $t8, -160 /* 09C2F4 8009B6F4 240F00A0 */ li $t7, 160 -/* 09C2F8 8009B6F8 3C01800E */ lui $at, %hi(D_800E1B58) # $at, 0x800e +/* 09C2F8 8009B6F8 3C01800E */ lui $at, %hi(D_800E1B50+8) # $at, 0x800e /* 09C2FC 8009B6FC 10000003 */ b .L8009B70C -/* 09C300 8009B700 A42F1B58 */ sh $t7, %lo(D_800E1B58)($at) +/* 09C300 8009B700 A42F1B58 */ sh $t7, %lo(D_800E1B50+8)($at) .L8009B704: -/* 09C304 8009B704 3C01800E */ lui $at, %hi(D_800E1B58) # $at, 0x800e -/* 09C308 8009B708 A4381B58 */ sh $t8, %lo(D_800E1B58)($at) +/* 09C304 8009B704 3C01800E */ lui $at, %hi(D_800E1B50+8) # $at, 0x800e +/* 09C308 8009B708 A4381B58 */ sh $t8, %lo(D_800E1B50+8)($at) .L8009B70C: /* 09C30C 8009B70C 0205082A */ slt $at, $s0, $a1 /* 09C310 8009B710 10200042 */ beqz $at, .L8009B81C diff --git a/asm/non_matchings/unknown_080500/func_8007FFEC.s b/asm/non_matchings/unknown_080500/func_8007FFEC.s index 1236f4d8..533cb222 100644 --- a/asm/non_matchings/unknown_080500/func_8007FFEC.s +++ b/asm/non_matchings/unknown_080500/func_8007FFEC.s @@ -39,9 +39,9 @@ glabel func_8007FFEC /* 080C7C 8008007C 3C07800E */ lui $a3, %hi(D_800E1DAC) # $a3, 0x800e /* 080C80 80080080 24E71DAC */ addiu $a3, %lo(D_800E1DAC) # addiu $a3, $a3, 0x1dac /* 080C84 80080084 ACE20000 */ sw $v0, ($a3) -/* 080C88 80080088 3C01800E */ lui $at, %hi(D_800E1DB0) # $at, 0x800e +/* 080C88 80080088 3C01800E */ lui $at, %hi(D_800E1DAC+4) # $at, 0x800e /* 080C8C 8008008C 0043C021 */ addu $t8, $v0, $v1 -/* 080C90 80080090 AC381DB0 */ sw $t8, %lo(D_800E1DB0)($at) +/* 080C90 80080090 AC381DB0 */ sw $t8, %lo(D_800E1DAC+4)($at) /* 080C94 80080094 8CF90004 */ lw $t9, 4($a3) /* 080C98 80080098 3C068012 */ lui $a2, %hi(D_80126C2C) # $a2, 0x8012 /* 080C9C 8008009C 3C018012 */ lui $at, %hi(D_80126C2C) # $at, 0x8012 @@ -51,7 +51,7 @@ glabel func_8007FFEC /* 080CAC 800800AC 8FAC0028 */ lw $t4, 0x28($sp) /* 080CB0 800800B0 8CCF0000 */ lw $t7, ($a2) /* 080CB4 800800B4 3C08800E */ lui $t0, %hi(D_800E1DA4) # $t0, 0x800e -/* 080CB8 800800B8 3C01800E */ lui $at, %hi(D_800E1DA8) # $at, 0x800e +/* 080CB8 800800B8 3C01800E */ lui $at, %hi(D_800E1DA4+4) # $at, 0x800e /* 080CBC 800800BC 01ECC021 */ addu $t8, $t7, $t4 /* 080CC0 800800C0 25081DA4 */ addiu $t0, %lo(D_800E1DA4) # addiu $t0, $t0, 0x1da4 /* 080CC4 800800C4 AC381DA4 */ sw $t8, %lo(D_800E1DA4)($at) @@ -59,7 +59,7 @@ glabel func_8007FFEC /* 080CCC 800800CC 8D190000 */ lw $t9, ($t0) /* 080CD0 800800D0 2409000A */ li $t1, 10 /* 080CD4 800800D4 032D7021 */ addu $t6, $t9, $t5 -/* 080CD8 800800D8 AC2E1DA8 */ sw $t6, %lo(D_800E1DA8)($at) +/* 080CD8 800800D8 AC2E1DA8 */ sw $t6, %lo(D_800E1DA4+4)($at) /* 080CDC 800800DC 00005025 */ move $t2, $zero /* 080CE0 800800E0 00002825 */ move $a1, $zero /* 080CE4 800800E4 1A0000C8 */ blez $s0, .L80080408 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s b/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s index c3720905..8766de8f 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s @@ -97,10 +97,10 @@ glabel func_800A0BD4 /* 0A1930 800A0D30 3C038012 */ lui $v1, %hi(D_80126D70) # $v1, 0x8012 /* 0A1934 800A0D34 24636D70 */ addiu $v1, %lo(D_80126D70) # addiu $v1, $v1, 0x6d70 /* 0A1938 800A0D38 906B0000 */ lbu $t3, ($v1) -/* 0A193C 800A0D3C 3C0C800E */ lui $t4, %hi(D_800E2772) # $t4, 0x800e +/* 0A193C 800A0D3C 3C0C800E */ lui $t4, %hi(D_800E2770+2) # $t4, 0x800e /* 0A1940 800A0D40 11600018 */ beqz $t3, .L800A0DA4 /* 0A1944 800A0D44 8FBF002C */ lw $ra, 0x2c($sp) -/* 0A1948 800A0D48 918C2772 */ lbu $t4, %lo(D_800E2772)($t4) +/* 0A1948 800A0D48 918C2772 */ lbu $t4, %lo(D_800E2770+2)($t4) /* 0A194C 800A0D4C 3C028012 */ lui $v0, %hi(D_80126D37) # $v0, 0x8012 /* 0A1950 800A0D50 15800014 */ bnez $t4, .L800A0DA4 /* 0A1954 800A0D54 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD144.s b/asm/non_matchings/unknown_09F8F0/func_800AD144.s index a5312c28..f6412b9b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD144.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD144.s @@ -34,15 +34,15 @@ glabel func_800AD144 /* 0ADDC4 800AD1C4 00000000 */ nop /* 0ADDC8 800AD1C8 3C19800E */ lui $t9, %hi(D_800E291C) # $t9, 0x800e /* 0ADDCC 800AD1CC 8F39291C */ lw $t9, %lo(D_800E291C)($t9) -/* 0ADDD0 800AD1D0 3C01800E */ lui $at, %hi(D_800E2C38) # $at, 0x800e -/* 0ADDD4 800AD1D4 AC222C38 */ sw $v0, %lo(D_800E2C38)($at) +/* 0ADDD0 800AD1D0 3C01800E */ lui $at, %hi(D_800E2C2C+12) # $at, 0x800e +/* 0ADDD4 800AD1D4 AC222C38 */ sw $v0, %lo(D_800E2C2C+12)($at) /* 0ADDD8 800AD1D8 8F240004 */ lw $a0, 4($t9) /* 0ADDDC 800AD1DC 0C01EB9D */ jal func_8007AE74 /* 0ADDE0 800AD1E0 00000000 */ nop /* 0ADDE4 800AD1E4 3C08800E */ lui $t0, %hi(D_800E291C) # $t0, 0x800e /* 0ADDE8 800AD1E8 8D08291C */ lw $t0, %lo(D_800E291C)($t0) -/* 0ADDEC 800AD1EC 3C01800E */ lui $at, %hi(D_800E2C50) # $at, 0x800e -/* 0ADDF0 800AD1F0 AC222C50 */ sw $v0, %lo(D_800E2C50)($at) +/* 0ADDEC 800AD1EC 3C01800E */ lui $at, %hi(D_800E2C2C+36) # $at, 0x800e +/* 0ADDF0 800AD1F0 AC222C50 */ sw $v0, %lo(D_800E2C2C+36)($at) /* 0ADDF4 800AD1F4 8D04000C */ lw $a0, 0xc($t0) /* 0ADDF8 800AD1F8 0C01F04B */ jal func_8007C12C /* 0ADDFC 800AD1FC 00002825 */ move $a1, $zero diff --git a/src/unknown_09F8F0.c b/src/unknown_09F8F0.c index 416ec7a0..6331d4d9 100644 --- a/src/unknown_09F8F0.c +++ b/src/unknown_09F8F0.c @@ -134,9 +134,9 @@ u16 D_800E2684[118] = { }; // This is probably not right. -s32 D_800E2770[8] = { - 0x00FD0000, 0x00000000, 0x00000000, 0x00000000, - 0x00FF0000, 0x00000000, 0x00000000, 0x00000000 +u8 D_800E2770[32] = { + 0, 0xFD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; s8 D_800E2790 = 1; diff --git a/undefined_syms.txt b/undefined_syms.txt index c5d6acd5..c017ac34 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -23,14 +23,8 @@ osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; - -D_800E1B58 = 0x800E1B58; -D_800E1DA8 = 0x800E1DA8; -D_800E1DB0 = 0x800E1DB0; -D_800E2772 = 0x800E2772; -D_800E2C38 = 0x800E2C38; -D_800E2C50 = 0x800E2C50; eqpower = 0x800E37A0; + D_800E4810 = 0x800E4810; D_800E4878 = 0x800E4878; __RunQueue = 0x800E4888; From 0b4207191802015d9ef5403e2341b95e738b6acb Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 20:07:47 -0500 Subject: [PATCH 05/39] About to do something dumb, so I'm commiting this now. --- .../unknown_0C91A0/func_800C8600.s | 8 +-- .../non_matchings/unknown_0D3160/__osViInit.s | 20 +++---- lib/src/unknown_0D29F0.c | 2 +- lib/src/unknown_0D6C90.c | 2 +- tools/python/undefined_sym_fix.py | 59 +++++++++++++++---- undefined_syms.txt | 4 -- 6 files changed, 65 insertions(+), 30 deletions(-) diff --git a/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s index 0f24a487..6af16037 100644 --- a/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s +++ b/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s @@ -1,6 +1,6 @@ glabel func_800C8600 -/* 0C9200 800C8600 3C0E800E */ lui $t6, %hi(D_800E4878) # $t6, 0x800e -/* 0C9204 800C8604 8DCE4878 */ lw $t6, %lo(D_800E4878)($t6) +/* 0C9200 800C8600 3C0E800E */ lui $t6, %hi(osViClock) # $t6, 0x800e +/* 0C9204 800C8604 8DCE4878 */ lw $t6, %lo(osViClock)($t6) /* 0C9208 800C8608 44844000 */ mtc1 $a0, $f8 /* 0C920C 800C860C 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 0C9210 800C8610 448E2000 */ mtc1 $t6, $f4 @@ -78,8 +78,8 @@ glabel func_800C8600 /* 0C9318 800C8718 240B0001 */ li $t3, 1 /* 0C931C 800C871C 3C0CA450 */ lui $t4, %hi(D_A4500008) # $t4, 0xa450 /* 0C9320 800C8720 AD8B0008 */ sw $t3, %lo(D_A4500008)($t4) -/* 0C9324 800C8724 3C0D800E */ lui $t5, %hi(D_800E4878) # $t5, 0x800e -/* 0C9328 800C8728 8DAD4878 */ lw $t5, %lo(D_800E4878)($t5) +/* 0C9324 800C8724 3C0D800E */ lui $t5, %hi(osViClock) # $t5, 0x800e +/* 0C9328 800C8728 8DAD4878 */ lw $t5, %lo(osViClock)($t5) /* 0C932C 800C872C 01A5001A */ div $zero, $t5, $a1 /* 0C9330 800C8730 00001012 */ mflo $v0 /* 0C9334 800C8734 14A00002 */ bnez $a1, .L800C8740 diff --git a/lib/asm/non_matchings/unknown_0D3160/__osViInit.s b/lib/asm/non_matchings/unknown_0D3160/__osViInit.s index c94f2547..efa5dc4b 100644 --- a/lib/asm/non_matchings/unknown_0D3160/__osViInit.s +++ b/lib/asm/non_matchings/unknown_0D3160/__osViInit.s @@ -1,12 +1,12 @@ glabel __osViInit /* 0D3710 800D2B10 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0D3714 800D2B14 AFBF0014 */ sw $ra, 0x14($sp) -/* 0D3718 800D2B18 3C04800E */ lui $a0, %hi(D_800E4810) # $a0, 0x800e -/* 0D371C 800D2B1C 24844810 */ addiu $a0, %lo(D_800E4810) # addiu $a0, $a0, 0x4810 +/* 0D3718 800D2B18 3C04800E */ lui $a0, %hi(vi) # $a0, 0x800e +/* 0D371C 800D2B1C 24844810 */ addiu $a0, %lo(vi) # addiu $a0, $a0, 0x4810 /* 0D3720 800D2B20 0C034138 */ jal memzero /* 0D3724 800D2B24 24050060 */ li $a1, 96 -/* 0D3728 800D2B28 3C0E800E */ lui $t6, %hi(D_800E4810) # $t6, 0x800e -/* 0D372C 800D2B2C 25CE4810 */ addiu $t6, %lo(D_800E4810) # addiu $t6, $t6, 0x4810 +/* 0D3728 800D2B28 3C0E800E */ lui $t6, %hi(vi) # $t6, 0x800e +/* 0D372C 800D2B2C 25CE4810 */ addiu $t6, %lo(vi) # addiu $t6, $t6, 0x4810 /* 0D3730 800D2B30 3C01800E */ lui $at, %hi(__osViCurr) # $at, 0x800e /* 0D3734 800D2B34 AC2E4870 */ sw $t6, %lo(__osViCurr)($at) /* 0D3738 800D2B38 3C01800E */ lui $at, %hi(__osViNext) # $at, 0x800e @@ -28,10 +28,10 @@ glabel __osViInit /* 0D3778 800D2B78 254A4760 */ addiu $t2, %lo(D_800E4760) # addiu $t2, $t2, 0x4760 /* 0D377C 800D2B7C 3C0C02F5 */ lui $t4, (0x02F5B2D2 >> 16) # lui $t4, 0x2f5 /* 0D3780 800D2B80 358CB2D2 */ ori $t4, (0x02F5B2D2 & 0xFFFF) # ori $t4, $t4, 0xb2d2 -/* 0D3784 800D2B84 3C01800E */ lui $at, %hi(D_800E4878) # $at, 0x800e +/* 0D3784 800D2B84 3C01800E */ lui $at, %hi(osViClock) # $at, 0x800e /* 0D3788 800D2B88 AD6A0008 */ sw $t2, 8($t3) /* 0D378C 800D2B8C 10000019 */ b .L800D2BF4 -/* 0D3790 800D2B90 AC2C4878 */ sw $t4, %lo(D_800E4878)($at) +/* 0D3790 800D2B90 AC2C4878 */ sw $t4, %lo(osViClock)($at) .L800D2B94: /* 0D3794 800D2B94 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 /* 0D3798 800D2B98 8DAD0300 */ lw $t5, %lo(osTvType)($t5) @@ -44,10 +44,10 @@ glabel __osViInit /* 0D37B4 800D2BB4 25EF47B0 */ addiu $t7, %lo(D_800E47B0) # addiu $t7, $t7, 0x47b0 /* 0D37B8 800D2BB8 3C0E02E6 */ lui $t6, (0x02E6025C >> 16) # lui $t6, 0x2e6 /* 0D37BC 800D2BBC 35CE025C */ ori $t6, (0x02E6025C & 0xFFFF) # ori $t6, $t6, 0x25c -/* 0D37C0 800D2BC0 3C01800E */ lui $at, %hi(D_800E4878) # $at, 0x800e +/* 0D37C0 800D2BC0 3C01800E */ lui $at, %hi(osViClock) # $at, 0x800e /* 0D37C4 800D2BC4 AF0F0008 */ sw $t7, 8($t8) /* 0D37C8 800D2BC8 1000000A */ b .L800D2BF4 -/* 0D37CC 800D2BCC AC2E4878 */ sw $t6, %lo(D_800E4878)($at) +/* 0D37CC 800D2BCC AC2E4878 */ sw $t6, %lo(osViClock)($at) .L800D2BD0: /* 0D37D0 800D2BD0 3C08800E */ lui $t0, %hi(__osViNext) # $t0, 0x800e /* 0D37D4 800D2BD4 8D084874 */ lw $t0, %lo(__osViNext)($t0) @@ -55,9 +55,9 @@ glabel __osViInit /* 0D37DC 800D2BDC 27394710 */ addiu $t9, %lo(D_800E4710) # addiu $t9, $t9, 0x4710 /* 0D37E0 800D2BE0 3C0902E6 */ lui $t1, (0x02E6D354 >> 16) # lui $t1, 0x2e6 /* 0D37E4 800D2BE4 3529D354 */ ori $t1, (0x02E6D354 & 0xFFFF) # ori $t1, $t1, 0xd354 -/* 0D37E8 800D2BE8 3C01800E */ lui $at, %hi(D_800E4878) # $at, 0x800e +/* 0D37E8 800D2BE8 3C01800E */ lui $at, %hi(osViClock) # $at, 0x800e /* 0D37EC 800D2BEC AD190008 */ sw $t9, 8($t0) -/* 0D37F0 800D2BF0 AC294878 */ sw $t1, %lo(D_800E4878)($at) +/* 0D37F0 800D2BF0 AC294878 */ sw $t1, %lo(osViClock)($at) .L800D2BF4: /* 0D37F4 800D2BF4 3C0B800E */ lui $t3, %hi(__osViNext) # $t3, 0x800e /* 0D37F8 800D2BF8 8D6B4874 */ lw $t3, %lo(__osViNext)($t3) diff --git a/lib/src/unknown_0D29F0.c b/lib/src/unknown_0D29F0.c index e2f6d64c..90f10c22 100644 --- a/lib/src/unknown_0D29F0.c +++ b/lib/src/unknown_0D29F0.c @@ -25,7 +25,7 @@ typedef struct /* 0x24 */ __OSViScale y; } __OSViContext; -static __OSViContext vi[2] = {0}; +__OSViContext vi[2] = {0}; __OSViContext *__osViCurr = &vi[0]; __OSViContext *__osViNext = &vi[1]; diff --git a/lib/src/unknown_0D6C90.c b/lib/src/unknown_0D6C90.c index 0f3d8d2d..fc00a63e 100644 --- a/lib/src/unknown_0D6C90.c +++ b/lib/src/unknown_0D6C90.c @@ -12,8 +12,8 @@ struct __osThreadTail } __osThreadTail; struct __osThreadTail __osThreadTail = {0, -1}; -OSThread *__osActiveQueue = &__osThreadTail.next; OSThread *__RunQueue = &__osThreadTail.next; +OSThread *__osActiveQueue = &__osThreadTail.next; extern OSThread *__osRunningThread = NULL; extern OSThread *D_800E4894 = NULL; // __osFaultedThread diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py index 1bac3917..7ca2234d 100644 --- a/tools/python/undefined_sym_fix.py +++ b/tools/python/undefined_sym_fix.py @@ -1,18 +1,57 @@ import subprocess import sys +import subprocess import argparse -parser = argparse.ArgumentParser(description="") -parser.add_argument("baseLabel", help="Base label") -parser.add_argument("badLabel", help="Bad label") -args = parser.parse_args() +def fixBadLabel(): + parser = argparse.ArgumentParser(description="") + parser.add_argument("baseLabel", help="Base label") + parser.add_argument("badLabel", help="Bad label") + args = parser.parse_args() -baseAddress = int(args.baseLabel[-8:], 16) -badAddress = int(args.badLabel[-8:], 16) + baseAddress = int(args.baseLabel[-8:], 16) + badAddress = int(args.badLabel[-8:], 16) -if baseAddress >= badAddress: - raise Exception('baseLabel should be smaller! base = ' + hex(baseAddress) + ', bad = ' + hex(badAddress)) + if baseAddress >= badAddress: + raise Exception('baseLabel should be smaller! base = ' + hex(baseAddress) + ', bad = ' + hex(badAddress)) -newLabel = args.baseLabel + '+' + str(badAddress-baseAddress) + newLabel = args.baseLabel + '+' + str(badAddress-baseAddress) + + subprocess.run(['./rename_sym.sh', args.badLabel, newLabel]) + +def load_syms(): + with open('undefined_syms.txt', 'r') as inFile: + return inFile.read().split('\n') + +def save_syms(syms): + with open('undefined_syms.txt', 'w') as outFile: + outFile.write('\n'.join(syms)) + +def check_is_double(symbol, address): + command = subprocess.run(['fgrep', '-ri', symbol], capture_output=True) + outLines = command.stdout.decode("utf-8").split('\n') + for outLine in outLines: + if 'lwc1' in outLine: + newSym = hex(address - 4)[2:].upper() + '+4' + subprocess.run(['./rename_sym.sh', symbol, newSym]) + return True + return False + +def fixDoubleLoads(): + syms = load_syms() + for i in range(0, len(syms)): + sym = syms[i] + if not sym.startswith('D_'): + continue + symSplit = sym.split(' = ') + symbol = symSplit[0] + address = int(symSplit[1][2:-1], 16) + if address >= 0x800E4BFC and address < 0x800E9BA0 and (address & 4 == 4): + if check_is_double(symbol, address): + syms.pop(i) + i -= 1 + save_syms(syms) + +#fixBadLabel() +fixDoubleLoads() -subprocess.run(['./rename_sym.sh', args.badLabel, newLabel]) diff --git a/undefined_syms.txt b/undefined_syms.txt index c017ac34..59ca3a06 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,10 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_800E4810 = 0x800E4810; -D_800E4878 = 0x800E4878; -__RunQueue = 0x800E4888; -__osActiveQueue = 0x800E488C; D_800E4BFC = 0x800E4BFC; D_800E4C0C = 0x800E4C0C; D_800E4C14 = 0x800E4C14; From 35c7e462c1ec28eaf43fd4fa2bd54970251cd4c2 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 01:35:32 -0500 Subject: [PATCH 06/39] Cleared data/rodata addresses from undefined_syms. Now it is onto bss! --- .../unknown_005740/func_80005254.s | 36 +- .../unknown_005740/func_80005D08.s | 14 +- .../unknown_005740/func_800063EC.s | 10 +- .../unknown_005740/func_80006BFC.s | 12 +- .../unknown_005740/func_80006FC8.s | 12 +- .../unknown_005740/func_80007FA4.s | 4 +- .../unknown_005740/func_800099EC.s | 4 +- .../unknown_005740/func_80009AB4.s | 4 +- .../unknown_00BC20/func_80011570.s | 12 +- .../unknown_00BC20/func_80013A0C.s | 4 +- .../unknown_00BC20/func_800159C8.s | 32 +- .../unknown_00BC20/func_80016748.s | 8 +- .../unknown_00BC20/func_80017A18.s | 10 +- .../unknown_00BC20/func_800185E4.s | 8 +- .../unknown_00BC20/func_8001955C.s | 4 +- .../unknown_00BC20/func_8001C6C4.s | 8 +- .../unknown_00BC20/func_8001EFA4.s | 2 +- .../unknown_00BC20/func_8001F460.s | 8 +- .../unknown_0255E0/func_8002581C.s | 4 +- .../unknown_0255E0/func_80026070.s | 8 +- .../unknown_0255E0/func_80026430.s | 12 +- .../unknown_0255E0/func_80027568.s | 6 +- .../unknown_0255E0/func_80028FAC.s | 4 +- .../unknown_0255E0/func_8002A5F8.s | 4 +- .../unknown_0255E0/func_8002A900.s | 6 +- .../unknown_0255E0/func_8002DE30.s | 4 +- .../unknown_032760/func_80033F60.s | 12 +- .../unknown_032760/func_80034860.s | 4 +- .../unknown_032760/func_80035260.s | 10 +- .../unknown_032760/func_800361E0.s | 16 +- .../unknown_032760/func_800389B8.s | 4 +- .../unknown_032760/func_80038AD4.s | 4 +- .../unknown_032760/func_80039330.s | 18 +- .../unknown_032760/func_8003B4BC.s | 4 +- .../unknown_032760/func_8003B988.s | 8 +- .../unknown_032760/func_8003CA68.s | 4 +- .../unknown_032760/func_8003D2B8.s | 4 +- .../unknown_032760/func_8003D5A0.s | 8 +- .../unknown_032760/func_8003E140.s | 6 +- .../unknown_032760/func_8003E694.s | 4 +- .../unknown_032760/func_8003EDD8.s | 4 +- .../unknown_032760/func_8003F2E8.s | 4 +- .../unknown_032760/func_800422F0.s | 4 +- .../unknown_043920/func_80042D20.s | 56 ++-- .../unknown_043920/func_8004447C.s | 4 +- .../unknown_043920/func_800452A0.s | 4 +- .../unknown_043920/func_80046524.s | 78 ++--- .../unknown_043920/func_80048C7C.s | 8 +- .../unknown_043920/func_80048E64.s | 4 +- .../unknown_043920/func_800494E0.s | 4 +- .../unknown_043920/func_80049794.s | 60 ++-- .../unknown_043920/func_8004C140.s | 4 +- .../unknown_043920/func_8004C2B0.s | 16 +- .../unknown_043920/func_8004DE38.s | 10 +- .../unknown_043920/func_8004F7F4.s | 28 +- .../unknown_043920/func_80050A28.s | 66 ++-- .../unknown_043920/func_80052B64.s | 4 +- .../unknown_043920/func_80052D7C.s | 38 +-- .../unknown_043920/func_80053478.s | 8 +- .../unknown_043920/func_80053750.s | 12 +- .../unknown_043920/func_80053E9C.s | 4 +- .../unknown_043920/func_80054110.s | 16 +- .../unknown_043920/func_8005492C.s | 32 +- .../unknown_043920/func_80054FD0.s | 6 +- .../unknown_043920/func_80055EC0.s | 2 +- .../unknown_043920/func_80057A40.s | 16 +- .../unknown_043920/func_800581E8.s | 8 +- .../unknown_043920/func_80059208.s | 4 +- .../unknown_043920/func_80059790.s | 4 +- .../unknown_043920/func_80059E40.s | 8 +- .../unknown_043920/func_8005A6F0.s | 18 +- .../unknown_043920/func_8005B818.s | 28 +- .../unknown_05CEF0/func_8005C364.s | 16 +- .../unknown_05DCD0/func_8005D0D0.s | 16 +- .../unknown_05DCD0/func_8005D820.s | 28 +- .../unknown_05F0C0/func_8005E4C0.s | 8 +- .../unknown_05F690/func_8005EA90.s | 24 +- .../unknown_05F690/func_8005F310.s | 10 +- .../unknown_065D30/__timeToSamplesNoRound.s | 4 +- .../unknown_072E50/func_80072578.s | 4 +- .../unknown_072E50/func_80072718.s | 8 +- .../unknown_072E50/func_80074EB8.s | 5 +- .../unknown_072E50/func_80075000.s | 10 +- .../unknown_072E50/func_800753D8.s | 10 +- .../unknown_072E50/func_800756D4.s | 5 +- .../unknown_080500/MenuLogoScreenLoop.s | 12 +- .../unknown_080500/func_8008FA54.s | 4 +- .../unknown_080500/func_800904E8.s | 8 +- .../unknown_09F8F0/func_8009F034.s | 12 +- .../unknown_09F8F0/func_800A14F0.s | 8 +- .../unknown_09F8F0/func_800A1E48.s | 4 +- .../unknown_09F8F0/func_800A277C.s | 4 +- .../unknown_09F8F0/func_800A6254.s | 8 +- .../unknown_09F8F0/func_800A7520.s | 16 +- .../unknown_09F8F0/func_800A8474.s | 16 +- .../unknown_09F8F0/func_800AA600.s | 4 +- .../unknown_0AEE70/func_800B0010.s | 16 +- .../unknown_0AEE70/func_800B03C0.s | 8 +- .../unknown_0AEE70/func_800B1130.s | 8 +- .../unknown_0CA9A0/func_800CB2D4.s | 4 +- src/unknown_001050.c | 2 +- src/unknown_072E50.c | 3 +- src/unknown_0B7A50.c | 9 +- tools/python/generate_ld.py | 12 + tools/python/undefined_sym_fix.py | 25 +- undefined_syms.txt | 313 ------------------ 106 files changed, 632 insertions(+), 920 deletions(-) diff --git a/asm/non_matchings/unknown_005740/func_80005254.s b/asm/non_matchings/unknown_005740/func_80005254.s index 3e248ea7..c6e6aac3 100644 --- a/asm/non_matchings/unknown_005740/func_80005254.s +++ b/asm/non_matchings/unknown_005740/func_80005254.s @@ -85,9 +85,9 @@ glabel func_80005254 /* 005F28 80005328 00000000 */ nop /* 005F2C 8000532C 24100064 */ li $s0, 100 .L80005330: -/* 005F30 80005330 3C01800E */ lui $at, %hi(D_800E4BFC) # $at, 0x800e +/* 005F30 80005330 3C01800E */ lui $at, %hi(D_800E4BF8 + 4) # $at, 0x800e /* 005F34 80005334 C4354BF8 */ lwc1 $f21, %lo(D_800E4BF8)($at) -/* 005F38 80005338 C4344BFC */ lwc1 $f20, %lo(D_800E4BFC)($at) +/* 005F38 80005338 C4344BFC */ lwc1 $f20, %lo(D_800E4BF8 + 4)($at) /* 005F3C 8000533C 8CE79C38 */ lw $a3, %lo(D_80119C38)($a3) /* 005F40 80005340 26319C38 */ addiu $s1, %lo(D_80119C38) # addiu $s1, $s1, -0x63c8 .L80005344: @@ -270,10 +270,10 @@ glabel func_80005254 /* 0061D0 800055D0 00401825 */ move $v1, $v0 .L800055D4: /* 0061D4 800055D4 44835000 */ mtc1 $v1, $f10 -/* 0061D8 800055D8 3C01800E */ lui $at, %hi(D_800E4C0C) # $at, 0x800e +/* 0061D8 800055D8 3C01800E */ lui $at, %hi(D_800E4C08 + 4) # $at, 0x800e /* 0061DC 800055DC 468051A1 */ cvt.d.w $f6, $f10 /* 0061E0 800055E0 C4254C08 */ lwc1 $f5, %lo(D_800E4C08)($at) -/* 0061E4 800055E4 C4244C0C */ lwc1 $f4, %lo(D_800E4C0C)($at) +/* 0061E4 800055E4 C4244C0C */ lwc1 $f4, %lo(D_800E4C08 + 4)($at) /* 0061E8 800055E8 C4EC003C */ lwc1 $f12, 0x3c($a3) /* 0061EC 800055EC 46262002 */ mul.d $f0, $f4, $f6 /* 0061F0 800055F0 460060A1 */ cvt.d.s $f2, $f12 @@ -315,10 +315,10 @@ glabel func_80005254 /* 006274 80005674 10000012 */ b .L800056C0 /* 006278 80005678 460C4080 */ add.s $f2, $f8, $f12 .L8000567C: -/* 00627C 8000567C 3C01800E */ lui $at, %hi(D_800E4C14) # $at, 0x800e +/* 00627C 8000567C 3C01800E */ lui $at, %hi(D_800E4C10 + 4) # $at, 0x800e /* 006280 80005680 C4EA003C */ lwc1 $f10, 0x3c($a3) /* 006284 80005684 C4274C10 */ lwc1 $f7, %lo(D_800E4C10)($at) -/* 006288 80005688 C4264C14 */ lwc1 $f6, %lo(D_800E4C14)($at) +/* 006288 80005688 C4264C14 */ lwc1 $f6, %lo(D_800E4C10 + 4)($at) /* 00628C 8000568C 46005121 */ cvt.d.s $f4, $f10 /* 006290 80005690 46262202 */ mul.d $f8, $f4, $f6 /* 006294 80005694 46109101 */ sub.s $f4, $f18, $f16 @@ -337,10 +337,10 @@ glabel func_80005254 /* 0062C4 800056C4 3C014080 */ lui $at, 0x4080 /* 0062C8 800056C8 13000010 */ beqz $t8, .L8000570C /* 0062CC 800056CC 3C088012 */ lui $t0, %hi(D_80119C3C) # $t0, 0x8012 -# Used to access D_800E4C18 and D_800E4C1C. +# Used to access D_800E4C18 and D_800E4C18 + 4. /* 0062D0 800056D0 3C01800E */ lui $at, %hi(D_800E4C18) # $at, 0x800e /* 0062D4 800056D4 C4274C18 */ lwc1 $f7, %lo(D_800E4C18)($at) -/* 0062D8 800056D8 C4264C1C */ lwc1 $f6, %lo(D_800E4C1C)($at) +/* 0062D8 800056D8 C4264C1C */ lwc1 $f6, %lo(D_800E4C18 + 4)($at) /* 0062DC 800056DC C4E40040 */ lwc1 $f4, 0x40($a3) /* 0062E0 800056E0 3C014020 */ li $at, 0x40200000 # 2.500000 /* 0062E4 800056E4 46002021 */ cvt.d.s $f0, $f4 @@ -370,9 +370,9 @@ glabel func_80005254 /* 00633C 8000573C 850D0000 */ lh $t5, ($t0) /* 006340 80005740 2401FFFF */ li $at, -1 /* 006344 80005744 11A10006 */ beq $t5, $at, .L80005760 -/* 006348 80005748 3C01800E */ lui $at, %hi(D_800E4C24) # $at, 0x800e +/* 006348 80005748 3C01800E */ lui $at, %hi(D_800E4C20 + 4) # $at, 0x800e /* 00634C 8000574C C4254C20 */ lwc1 $f5, %lo(D_800E4C20)($at) -/* 006350 80005750 C4244C24 */ lwc1 $f4, %lo(D_800E4C24)($at) +/* 006350 80005750 C4244C24 */ lwc1 $f4, %lo(D_800E4C20 + 4)($at) /* 006354 80005754 460012A1 */ cvt.d.s $f10, $f2 /* 006358 80005758 46245180 */ add.d $f6, $f10, $f4 /* 00635C 8000575C 462030A0 */ cvt.s.d $f2, $f6 @@ -451,10 +451,10 @@ glabel func_80005254 /* 006470 80005870 80EF0090 */ lb $t7, 0x90($a3) /* 006474 80005874 44813000 */ mtc1 $at, $f6 /* 006478 80005878 448F4000 */ mtc1 $t7, $f8 -/* 00647C 8000587C 3C01800E */ lui $at, %hi(D_800E4C2C) # $at, 0x800e +/* 00647C 8000587C 3C01800E */ lui $at, %hi(D_800E4C28 + 4) # $at, 0x800e /* 006480 80005880 46804120 */ cvt.s.w $f4, $f8 /* 006484 80005884 C42B4C28 */ lwc1 $f11, %lo(D_800E4C28)($at) -/* 006488 80005888 C42A4C2C */ lwc1 $f10, %lo(D_800E4C2C)($at) +/* 006488 80005888 C42A4C2C */ lwc1 $f10, %lo(D_800E4C28 + 4)($at) /* 00648C 8000588C 46062003 */ div.s $f0, $f4, $f6 /* 006490 80005890 3C0140A0 */ li $at, 0x40A00000 # 5.000000 /* 006494 80005894 460061A1 */ cvt.d.s $f6, $f12 @@ -476,10 +476,10 @@ glabel func_80005254 /* 0064D0 800058D0 4500001A */ bc1f .L8000593C /* 0064D4 800058D4 00000000 */ nop /* 0064D8 800058D8 44985000 */ mtc1 $t8, $f10 -/* 0064DC 800058DC 3C01800E */ lui $at, %hi(D_800E4C34) # $at, 0x800e +/* 0064DC 800058DC 3C01800E */ lui $at, %hi(D_800E4C30 + 4) # $at, 0x800e /* 0064E0 800058E0 46805220 */ cvt.s.w $f8, $f10 /* 0064E4 800058E4 C4254C30 */ lwc1 $f5, %lo(D_800E4C30)($at) -/* 0064E8 800058E8 C4244C34 */ lwc1 $f4, %lo(D_800E4C34)($at) +/* 0064E8 800058E8 C4244C34 */ lwc1 $f4, %lo(D_800E4C30 + 4)($at) /* 0064EC 800058EC 460041A1 */ cvt.d.s $f6, $f8 /* 0064F0 800058F0 46243282 */ mul.d $f10, $f6, $f4 /* 0064F4 800058F4 3C01800E */ lui $at, %hi(D_800E4C38) # $at, 0x800e @@ -510,10 +510,10 @@ glabel func_80005254 /* 006554 80005954 45000018 */ bc1f .L800059B8 /* 006558 80005958 00EA1021 */ addu $v0, $a3, $t2 /* 00655C 8000595C 44993000 */ mtc1 $t9, $f6 -/* 006560 80005960 3C01800E */ lui $at, %hi(D_800E4C44) # $at, 0x800e +/* 006560 80005960 3C01800E */ lui $at, %hi(D_800E4C40 + 4) # $at, 0x800e /* 006564 80005964 46803120 */ cvt.s.w $f4, $f6 /* 006568 80005968 C4294C40 */ lwc1 $f9, %lo(D_800E4C40)($at) -/* 00656C 8000596C C4284C44 */ lwc1 $f8, %lo(D_800E4C44)($at) +/* 00656C 8000596C C4284C44 */ lwc1 $f8, %lo(D_800E4C40 + 4)($at) /* 006570 80005970 460022A1 */ cvt.d.s $f10, $f4 /* 006574 80005974 46285182 */ mul.d $f6, $f10, $f8 /* 006578 80005978 46000121 */ cvt.d.s $f4, $f0 @@ -573,10 +573,10 @@ glabel func_80005254 /* 006640 80005A40 1720000F */ bnez $t9, .L80005A80 /* 006644 80005A44 31AE4000 */ andi $t6, $t5, 0x4000 /* 006648 80005A48 11C0000D */ beqz $t6, .L80005A80 -/* 00664C 80005A4C 3C01800E */ lui $at, %hi(D_800E4C4C) # $at, 0x800e +/* 00664C 80005A4C 3C01800E */ lui $at, %hi(D_800E4C48 + 4) # $at, 0x800e /* 006650 80005A50 C508002C */ lwc1 $f8, 0x2c($t0) /* 006654 80005A54 C42B4C48 */ lwc1 $f11, %lo(D_800E4C48)($at) -/* 006658 80005A58 C42A4C4C */ lwc1 $f10, %lo(D_800E4C4C)($at) +/* 006658 80005A58 C42A4C4C */ lwc1 $f10, %lo(D_800E4C48 + 4)($at) /* 00665C 80005A5C 46004121 */ cvt.d.s $f4, $f8 /* 006660 80005A60 4624503C */ c.lt.d $f10, $f4 /* 006664 80005A64 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_80005D08.s b/asm/non_matchings/unknown_005740/func_80005D08.s index 7047a012..b7414355 100644 --- a/asm/non_matchings/unknown_005740/func_80005D08.s +++ b/asm/non_matchings/unknown_005740/func_80005D08.s @@ -195,7 +195,7 @@ glabel func_80005D08 /* 006B98 80005F98 44805000 */ mtc1 $zero, $f10 /* 006B9C 80005F9C 46008221 */ cvt.d.s $f8, $f16 /* 006BA0 80005FA0 46285032 */ c.eq.d $f10, $f8 -# Used to access D_800E4C58 and D_800E4C5C. +# Used to access D_800E4C58 and D_800E4C58 + 4. /* 006BA4 80005FA4 3C01800E */ lui $at, %hi(D_800E4C58) # $at, 0x800e /* 006BA8 80005FA8 45010034 */ bc1t .L8000607C /* 006BAC 80005FAC 00000000 */ nop @@ -212,10 +212,10 @@ glabel func_80005D08 /* 006BD8 80005FD8 00402825 */ move $a1, $v0 .L80005FDC: /* 006BDC 80005FDC 44853000 */ mtc1 $a1, $f6 -/* 006BE0 80005FE0 3C01800E */ lui $at, %hi(D_800E4C5C) # $at, 0x800e +/* 006BE0 80005FE0 3C01800E */ lui $at, %hi(D_800E4C58 + 4) # $at, 0x800e /* 006BE4 80005FE4 468032A1 */ cvt.d.w $f10, $f6 /* 006BE8 80005FE8 C4254C50 */ lwc1 $f5, %lo(D_800E4C50)($at) -/* 006BEC 80005FEC C4244C54 */ lwc1 $f4, %lo(D_800E4C54)($at) +/* 006BEC 80005FEC C4244C54 */ lwc1 $f4, %lo(D_800E4C50 + 4)($at) /* 006BF0 80005FF0 8D230000 */ lw $v1, ($t1) /* 006BF4 80005FF4 462A2002 */ mul.d $f0, $f4, $f10 /* 006BF8 80005FF8 C46C003C */ lwc1 $f12, 0x3c($v1) @@ -257,7 +257,7 @@ glabel func_80005D08 /* 006C7C 8000607C 8D230000 */ lw $v1, ($t1) /* 006C80 80006080 C4294C58 */ lwc1 $f9, %lo(D_800E4C58)($at) /* 006C84 80006084 C464003C */ lwc1 $f4, 0x3c($v1) -/* 006C88 80006088 C4284C5C */ lwc1 $f8, %lo(D_800E4C5C)($at) +/* 006C88 80006088 C4284C5C */ lwc1 $f8, %lo(D_800E4C58 + 4)($at) /* 006C8C 8000608C 460022A1 */ cvt.d.s $f10, $f4 /* 006C90 80006090 46285182 */ mul.d $f6, $f10, $f8 /* 006C94 80006094 3C048012 */ lui $a0, %hi(D_80119C3C) # $a0, 0x8012 @@ -293,9 +293,9 @@ glabel func_80005D08 /* 006D08 80006108 C7AE001C */ lwc1 $f14, 0x1c($sp) /* 006D0C 8000610C 14400007 */ bnez $v0, .L8000612C /* 006D10 80006110 25299C38 */ addiu $t1, %lo(D_80119C38) # addiu $t1, $t1, -0x63c8 -/* 006D14 80006114 3C01800E */ lui $at, %hi(D_800E4C64) # $at, 0x800e +/* 006D14 80006114 3C01800E */ lui $at, %hi(D_800E4C60 + 4) # $at, 0x800e /* 006D18 80006118 C4254C60 */ lwc1 $f5, %lo(D_800E4C60)($at) -/* 006D1C 8000611C C4244C64 */ lwc1 $f4, %lo(D_800E4C64)($at) +/* 006D1C 8000611C C4244C64 */ lwc1 $f4, %lo(D_800E4C60 + 4)($at) /* 006D20 80006120 460071A1 */ cvt.d.s $f6, $f14 /* 006D24 80006124 46243280 */ add.d $f10, $f6, $f4 /* 006D28 80006128 462053A0 */ cvt.s.d $f14, $f10 @@ -310,7 +310,7 @@ glabel func_80005D08 /* 006D48 80006148 46060100 */ add.s $f4, $f0, $f6 /* 006D4C 8000614C E464005C */ swc1 $f4, 0x5c($v1) /* 006D50 80006150 8D230000 */ lw $v1, ($t1) -/* 006D54 80006154 C42A4C6C */ lwc1 $f10, %lo(D_800E4C6C)($at) +/* 006D54 80006154 C42A4C6C */ lwc1 $f10, %lo(D_800E4C68 + 4)($at) /* 006D58 80006158 C460005C */ lwc1 $f0, 0x5c($v1) /* 006D5C 8000615C C42B4C68 */ lwc1 $f11, %lo(D_800E4C68)($at) /* 006D60 80006160 46000221 */ cvt.d.s $f8, $f0 diff --git a/asm/non_matchings/unknown_005740/func_800063EC.s b/asm/non_matchings/unknown_005740/func_800063EC.s index 0729b783..42836050 100644 --- a/asm/non_matchings/unknown_005740/func_800063EC.s +++ b/asm/non_matchings/unknown_005740/func_800063EC.s @@ -344,7 +344,7 @@ glabel func_800063EC /* 0074A4 800068A4 46049182 */ mul.s $f6, $f18, $f4 /* 0074A8 800068A8 46009221 */ cvt.d.s $f8, $f18 /* 0074AC 800068AC 46285032 */ c.eq.d $f10, $f8 -# Used to access D_800E4C88 and D_800E4C8C. +# Used to access D_800E4C88 and D_800E4C88 + 4. /* 0074B0 800068B0 3C01800E */ lui $at, %hi(D_800E4C88) # $at, 0x800e /* 0074B4 800068B4 45010032 */ bc1t .L80006980 /* 0074B8 800068B8 46067380 */ add.s $f14, $f14, $f6 @@ -361,10 +361,10 @@ glabel func_800063EC /* 0074E4 800068E4 00402025 */ move $a0, $v0 .L800068E8: /* 0074E8 800068E8 44843000 */ mtc1 $a0, $f6 -/* 0074EC 800068EC 3C01800E */ lui $at, %hi(D_800E4C8C) # $at, 0x800e +/* 0074EC 800068EC 3C01800E */ lui $at, %hi(D_800E4C88 + 4) # $at, 0x800e /* 0074F0 800068F0 468032A1 */ cvt.d.w $f10, $f6 /* 0074F4 800068F4 C4254C80 */ lwc1 $f5, %lo(D_800E4C80)($at) -/* 0074F8 800068F8 C4244C84 */ lwc1 $f4, %lo(D_800E4C84)($at) +/* 0074F8 800068F8 C4244C84 */ lwc1 $f4, %lo(D_800E4C80 + 4)($at) /* 0074FC 800068FC C46C003C */ lwc1 $f12, 0x3c($v1) /* 007500 80006900 462A2002 */ mul.d $f0, $f4, $f10 /* 007504 80006904 460060A1 */ cvt.d.s $f2, $f12 @@ -403,7 +403,7 @@ glabel func_800063EC .L80006980: /* 007580 80006980 C464003C */ lwc1 $f4, 0x3c($v1) /* 007584 80006984 C4294C88 */ lwc1 $f9, %lo(D_800E4C88)($at) -/* 007588 80006988 C4284C8C */ lwc1 $f8, %lo(D_800E4C8C)($at) +/* 007588 80006988 C4284C8C */ lwc1 $f8, %lo(D_800E4C88 + 4)($at) /* 00758C 8000698C 460022A1 */ cvt.d.s $f10, $f4 /* 007590 80006990 46285182 */ mul.d $f6, $f10, $f8 /* 007594 80006994 46203120 */ cvt.s.d $f4, $f6 @@ -423,7 +423,7 @@ glabel func_800063EC /* 0075C8 800069C8 46040280 */ add.s $f10, $f0, $f4 /* 0075CC 800069CC E46A005C */ swc1 $f10, 0x5c($v1) /* 0075D0 800069D0 8D230000 */ lw $v1, ($t1) -/* 0075D4 800069D4 C4284C94 */ lwc1 $f8, %lo(D_800E4C94)($at) +/* 0075D4 800069D4 C4284C94 */ lwc1 $f8, %lo(D_800E4C90 + 4)($at) /* 0075D8 800069D8 C466005C */ lwc1 $f6, 0x5c($v1) /* 0075DC 800069DC C4294C90 */ lwc1 $f9, %lo(D_800E4C90)($at) /* 0075E0 800069E0 46003121 */ cvt.d.s $f4, $f6 diff --git a/asm/non_matchings/unknown_005740/func_80006BFC.s b/asm/non_matchings/unknown_005740/func_80006BFC.s index 5f2c3a84..7ee51b5d 100644 --- a/asm/non_matchings/unknown_005740/func_80006BFC.s +++ b/asm/non_matchings/unknown_005740/func_80006BFC.s @@ -173,13 +173,13 @@ glabel func_80006BFC /* 007A48 80006E48 3C01428C */ li $at, 0x428C0000 # 70.000000 /* 007A4C 80006E4C 44816000 */ mtc1 $at, $f12 /* 007A50 80006E50 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 007A54 80006E54 3C01800E */ lui $at, %hi(D_800E4CA4) # $at, 0x800e +/* 007A54 80006E54 3C01800E */ lui $at, %hi(D_800E4CA0 + 4) # $at, 0x800e /* 007A58 80006E58 46026100 */ add.s $f4, $f12, $f2 /* 007A5C 80006E5C C4254CA0 */ lwc1 $f5, %lo(D_800E4CA0)($at) /* 007A60 80006E60 46026201 */ sub.s $f8, $f12, $f2 /* 007A64 80006E64 00000000 */ nop /* 007A68 80006E68 46082183 */ div.s $f6, $f4, $f8 -/* 007A6C 80006E6C C4244CA4 */ lwc1 $f4, %lo(D_800E4CA4)($at) +/* 007A6C 80006E6C C4244CA4 */ lwc1 $f4, %lo(D_800E4CA0 + 4)($at) /* 007A70 80006E70 460002A1 */ cvt.d.s $f10, $f0 /* 007A74 80006E74 46245202 */ mul.d $f8, $f10, $f4 /* 007A78 80006E78 444CF800 */ cfc1 $t4, $31 @@ -228,16 +228,16 @@ glabel func_80006BFC /* 007B24 80006F24 E4460068 */ swc1 $f6, 0x68($v0) /* 007B28 80006F28 3C028012 */ lui $v0, %hi(D_80119C38) # $v0, 0x8012 /* 007B2C 80006F2C 8C429C38 */ lw $v0, %lo(D_80119C38)($v0) -/* 007B30 80006F30 C42A4CAC */ lwc1 $f10, %lo(D_800E4CAC)($at) +/* 007B30 80006F30 C42A4CAC */ lwc1 $f10, %lo(D_800E4CA8 + 4)($at) /* 007B34 80006F34 C4480068 */ lwc1 $f8, 0x68($v0) /* 007B38 80006F38 C42B4CA8 */ lwc1 $f11, %lo(D_800E4CA8)($at) /* 007B3C 80006F3C 46004321 */ cvt.d.s $f12, $f8 /* 007B40 80006F40 462C503C */ c.lt.d $f10, $f12 -# Used to access D_800E4CB8 and D_800E4CBC. +# Used to access D_800E4CB8 and D_800E4CB8 + 4. /* 007B44 80006F44 3C01800E */ lui $at, %hi(D_800E4CB8) # $at, 0x800e /* 007B48 80006F48 45000009 */ bc1f .L80006F70 /* 007B4C 80006F4C 00000000 */ nop -/* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CBC) # $at, 0x800e +/* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CB8 + 4) # $at, 0x800e /* 007B54 80006F54 C4244CB0 */ lwc1 $f4, %lo(D_800E4CB0)($at) /* 007B58 80006F58 00000000 */ nop /* 007B5C 80006F5C E4440068 */ swc1 $f4, 0x68($v0) @@ -247,7 +247,7 @@ glabel func_80006BFC /* 007B6C 80006F6C 846F0000 */ lh $t7, ($v1) .L80006F70: /* 007B70 80006F70 C4274CB8 */ lwc1 $f7, %lo(D_800E4CB8)($at) -/* 007B74 80006F74 C4264CBC */ lwc1 $f6, %lo(D_800E4CBC)($at) +/* 007B74 80006F74 C4264CBC */ lwc1 $f6, %lo(D_800E4CB8 + 4)($at) /* 007B78 80006F78 3C01800E */ lui $at, %hi(D_800E4CC0) # $at, 0x800e /* 007B7C 80006F7C 4626603C */ c.lt.d $f12, $f6 /* 007B80 80006F80 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index 25ceb63c..c75f553f 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -54,10 +54,10 @@ glabel func_80006FC8 /* 007C40 80007040 AFA000AC */ sw $zero, 0xac($sp) /* 007C44 80007044 3C01800E */ lui $at, %hi(D_800E4CC4) # $at, 0x800e /* 007C48 80007048 C43E4CC4 */ lwc1 $f30, %lo(D_800E4CC4)($at) -/* 007C4C 8000704C 3C01800E */ lui $at, %hi(D_800E4CCC) # $at, 0x800e +/* 007C4C 8000704C 3C01800E */ lui $at, %hi(D_800E4CC8 + 4) # $at, 0x800e /* 007C50 80007050 3C148012 */ lui $s4, %hi(D_80119C38) # $s4, 0x8012 /* 007C54 80007054 C43D4CC8 */ lwc1 $f29, %lo(D_800E4CC8)($at) -/* 007C58 80007058 C43C4CCC */ lwc1 $f28, %lo(D_800E4CCC)($at) +/* 007C58 80007058 C43C4CCC */ lwc1 $f28, %lo(D_800E4CC8 + 4)($at) /* 007C5C 8000705C 4480C800 */ mtc1 $zero, $f25 /* 007C60 80007060 4480C000 */ mtc1 $zero, $f24 /* 007C64 80007064 8FBE00D8 */ lw $fp, 0xd8($sp) @@ -536,9 +536,9 @@ glabel func_80006FC8 /* 008348 80007748 1509FE49 */ bne $t0, $t1, .L80007070 /* 00834C 8000774C 26D60004 */ addiu $s6, $s6, 4 .L80007750: -/* 008350 80007750 3C01800E */ lui $at, %hi(D_800E4CDC) # $at, 0x800e +/* 008350 80007750 3C01800E */ lui $at, %hi(D_800E4CD8 + 4) # $at, 0x800e /* 008354 80007754 C43D4CD8 */ lwc1 $f29, %lo(D_800E4CD8)($at) -/* 008358 80007758 C43C4CDC */ lwc1 $f28, %lo(D_800E4CDC)($at) +/* 008358 80007758 C43C4CDC */ lwc1 $f28, %lo(D_800E4CD8 + 4)($at) /* 00835C 8000775C 8FAA007C */ lw $t2, 0x7c($sp) /* 008360 80007760 3C01800E */ lui $at, %hi(D_800E4CE0) # $at, 0x800e /* 008364 80007764 C43E4CE0 */ lwc1 $f30, %lo(D_800E4CE0)($at) @@ -641,9 +641,9 @@ glabel func_80006FC8 .L800078C4: /* 0084C4 800078C4 8FB600C8 */ lw $s6, 0xc8($sp) /* 0084C8 800078C8 194000D7 */ blez $t2, .L80007C28 -/* 0084CC 800078CC 3C01800E */ lui $at, %hi(D_800E4CEC) # $at, 0x800e +/* 0084CC 800078CC 3C01800E */ lui $at, %hi(D_800E4CE8 + 4) # $at, 0x800e /* 0084D0 800078D0 C4394CE8 */ lwc1 $f25, %lo(D_800E4CE8)($at) -/* 0084D4 800078D4 C4384CEC */ lwc1 $f24, %lo(D_800E4CEC)($at) +/* 0084D4 800078D4 C4384CEC */ lwc1 $f24, %lo(D_800E4CE8 + 4)($at) /* 0084D8 800078D8 00000000 */ nop .L800078DC: /* 0084DC 800078DC 8EC80000 */ lw $t0, ($s6) diff --git a/asm/non_matchings/unknown_005740/func_80007FA4.s b/asm/non_matchings/unknown_005740/func_80007FA4.s index b8609c7a..33c1c9f4 100644 --- a/asm/non_matchings/unknown_005740/func_80007FA4.s +++ b/asm/non_matchings/unknown_005740/func_80007FA4.s @@ -6,11 +6,11 @@ glabel D_800E4CF8 glabel func_80007FA4 /* 008BA4 80007FA4 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 008BA8 80007FA8 44818000 */ mtc1 $at, $f16 -/* 008BAC 80007FAC 3C01800E */ lui $at, %hi(D_800E4CFC) # $at, 0x800e +/* 008BAC 80007FAC 3C01800E */ lui $at, %hi(D_800E4CF8 + 4) # $at, 0x800e /* 008BB0 80007FB0 46106101 */ sub.s $f4, $f12, $f16 /* 008BB4 80007FB4 C4334CF8 */ lwc1 $f19, %lo(D_800E4CF8)($at) /* 008BB8 80007FB8 460C8180 */ add.s $f6, $f16, $f12 -/* 008BBC 80007FBC C4324CFC */ lwc1 $f18, %lo(D_800E4CFC)($at) +/* 008BBC 80007FBC C4324CFC */ lwc1 $f18, %lo(D_800E4CF8 + 4)($at) /* 008BC0 80007FC0 46062303 */ div.s $f12, $f4, $f6 /* 008BC4 80007FC4 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 008BC8 80007FC8 44801000 */ mtc1 $zero, $f2 diff --git a/asm/non_matchings/unknown_005740/func_800099EC.s b/asm/non_matchings/unknown_005740/func_800099EC.s index 27e196d5..825f1c13 100644 --- a/asm/non_matchings/unknown_005740/func_800099EC.s +++ b/asm/non_matchings/unknown_005740/func_800099EC.s @@ -26,9 +26,9 @@ glabel func_800099EC /* 00A630 80009A30 44817000 */ mtc1 $at, $f14 /* 00A634 80009A34 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00A638 80009A38 44816000 */ mtc1 $at, $f12 -/* 00A63C 80009A3C 3C01800E */ lui $at, %hi(D_800E4F1C) # $at, 0x800e +/* 00A63C 80009A3C 3C01800E */ lui $at, %hi(D_800E4F18 + 4) # $at, 0x800e /* 00A640 80009A40 C4234F18 */ lwc1 $f3, %lo(D_800E4F18)($at) -/* 00A644 80009A44 C4224F1C */ lwc1 $f2, %lo(D_800E4F1C)($at) +/* 00A644 80009A44 C4224F1C */ lwc1 $f2, %lo(D_800E4F18 + 4)($at) /* 00A648 80009A48 8045017C */ lb $a1, 0x17c($v0) /* 00A64C 80009A4C 00000000 */ nop .L80009A50: diff --git a/asm/non_matchings/unknown_005740/func_80009AB4.s b/asm/non_matchings/unknown_005740/func_80009AB4.s index 46efb78d..ea1e577b 100644 --- a/asm/non_matchings/unknown_005740/func_80009AB4.s +++ b/asm/non_matchings/unknown_005740/func_80009AB4.s @@ -26,9 +26,9 @@ glabel func_80009AB4 /* 00A6F8 80009AF8 44817000 */ mtc1 $at, $f14 /* 00A6FC 80009AFC 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00A700 80009B00 44816000 */ mtc1 $at, $f12 -/* 00A704 80009B04 3C01800E */ lui $at, %hi(D_800E4F24) # $at, 0x800e +/* 00A704 80009B04 3C01800E */ lui $at, %hi(D_800E4F20 + 4) # $at, 0x800e /* 00A708 80009B08 C4234F20 */ lwc1 $f3, %lo(D_800E4F20)($at) -/* 00A70C 80009B0C C4224F24 */ lwc1 $f2, %lo(D_800E4F24)($at) +/* 00A70C 80009B0C C4224F24 */ lwc1 $f2, %lo(D_800E4F20 + 4)($at) /* 00A710 80009B10 804500B8 */ lb $a1, 0xb8($v0) /* 00A714 80009B14 00000000 */ nop .L80009B18: diff --git a/asm/non_matchings/unknown_00BC20/func_80011570.s b/asm/non_matchings/unknown_00BC20/func_80011570.s index bb5a8071..88ba53fd 100644 --- a/asm/non_matchings/unknown_00BC20/func_80011570.s +++ b/asm/non_matchings/unknown_00BC20/func_80011570.s @@ -36,11 +36,11 @@ glabel func_80011570 /* 0121D4 800115D4 00001025 */ move $v0, $zero .L800115D8: /* 0121D8 800115D8 844E003E */ lh $t6, 0x3e($v0) -/* 0121DC 800115DC 3C01800E */ lui $at, %hi(D_800E553C) # $at, 0x800e +/* 0121DC 800115DC 3C01800E */ lui $at, %hi(D_800E5538 + 4) # $at, 0x800e /* 0121E0 800115E0 448E3000 */ mtc1 $t6, $f6 /* 0121E4 800115E4 C42D5538 */ lwc1 $f13, %lo(D_800E5538)($at) /* 0121E8 800115E8 46803221 */ cvt.d.w $f8, $f6 -/* 0121EC 800115EC C42C553C */ lwc1 $f12, %lo(D_800E553C)($at) +/* 0121EC 800115EC C42C553C */ lwc1 $f12, %lo(D_800E5538 + 4)($at) /* 0121F0 800115F0 3C04800E */ lui $a0, %hi(D_800DC848) # $a0, 0x800e /* 0121F4 800115F4 462C4280 */ add.d $f10, $f8, $f12 /* 0121F8 800115F8 00001825 */ move $v1, $zero @@ -66,11 +66,11 @@ glabel func_80011570 /* 012244 80011644 24030001 */ li $v1, 1 .L80011648: /* 012248 80011648 84580042 */ lh $t8, 0x42($v0) -/* 01224C 8001164C 3C01800E */ lui $at, %hi(D_800E5544) # $at, 0x800e +/* 01224C 8001164C 3C01800E */ lui $at, %hi(D_800E5540 + 4) # $at, 0x800e /* 012250 80011650 44985000 */ mtc1 $t8, $f10 /* 012254 80011654 C4275540 */ lwc1 $f7, %lo(D_800E5540)($at) /* 012258 80011658 46805121 */ cvt.d.w $f4, $f10 -/* 01225C 8001165C C4265544 */ lwc1 $f6, %lo(D_800E5544)($at) +/* 01225C 8001165C C4265544 */ lwc1 $f6, %lo(D_800E5540 + 4)($at) /* 012260 80011660 00000000 */ nop /* 012264 80011664 46262200 */ add.d $f8, $f4, $f6 /* 012268 80011668 46204020 */ cvt.s.d $f0, $f8 @@ -81,11 +81,11 @@ glabel func_80011570 /* 01227C 8001167C 24030001 */ li $v1, 1 .L80011680: /* 012280 80011680 84590040 */ lh $t9, 0x40($v0) -/* 012284 80011684 3C01800E */ lui $at, %hi(D_800E554C) # $at, 0x800e +/* 012284 80011684 3C01800E */ lui $at, %hi(D_800E5548 + 4) # $at, 0x800e /* 012288 80011688 44995000 */ mtc1 $t9, $f10 /* 01228C 8001168C C4275548 */ lwc1 $f7, %lo(D_800E5548)($at) /* 012290 80011690 46805121 */ cvt.d.w $f4, $f10 -/* 012294 80011694 C426554C */ lwc1 $f6, %lo(D_800E554C)($at) +/* 012294 80011694 C426554C */ lwc1 $f6, %lo(D_800E5548 + 4)($at) /* 012298 80011698 00000000 */ nop /* 01229C 8001169C 46262201 */ sub.d $f8, $f4, $f6 /* 0122A0 800116A0 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_00BC20/func_80013A0C.s b/asm/non_matchings/unknown_00BC20/func_80013A0C.s index de3e1e6c..8e67b167 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013A0C.s +++ b/asm/non_matchings/unknown_00BC20/func_80013A0C.s @@ -142,10 +142,10 @@ glabel func_80013A0C /* 014808 80013C08 24040002 */ li $a0, 2 .L80013C0C: /* 01480C 80013C0C 44849000 */ mtc1 $a0, $f18 -/* 014810 80013C10 3C01800E */ lui $at, %hi(D_800E557C) # $at, 0x800e +/* 014810 80013C10 3C01800E */ lui $at, %hi(D_800E5578 + 4) # $at, 0x800e /* 014814 80013C14 468091A0 */ cvt.s.w $f6, $f18 /* 014818 80013C18 C4255578 */ lwc1 $f5, %lo(D_800E5578)($at) -/* 01481C 80013C1C C424557C */ lwc1 $f4, %lo(D_800E557C)($at) +/* 01481C 80013C1C C424557C */ lwc1 $f4, %lo(D_800E5578 + 4)($at) /* 014820 80013C20 46003221 */ cvt.d.s $f8, $f6 /* 014824 80013C24 46244282 */ mul.d $f10, $f8, $f4 /* 014828 80013C28 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 diff --git a/asm/non_matchings/unknown_00BC20/func_800159C8.s b/asm/non_matchings/unknown_00BC20/func_800159C8.s index d674ce00..f265333d 100644 --- a/asm/non_matchings/unknown_00BC20/func_800159C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800159C8.s @@ -72,13 +72,13 @@ glabel func_800159C8 /* 016690 80015A90 1441000C */ bne $v0, $at, .L80015AC4 /* 016694 80015A94 00000000 */ nop /* 016698 80015A98 44803000 */ mtc1 $zero, $f6 -/* 01669C 80015A9C 3C01800E */ lui $at, %hi(D_800E55BC) # $at, 0x800e +/* 01669C 80015A9C 3C01800E */ lui $at, %hi(D_800E55B8 + 4) # $at, 0x800e /* 0166A0 80015AA0 4606003C */ c.lt.s $f0, $f6 /* 0166A4 80015AA4 00000000 */ nop /* 0166A8 80015AA8 45000006 */ bc1f .L80015AC4 /* 0166AC 80015AAC 00000000 */ nop /* 0166B0 80015AB0 C42955B8 */ lwc1 $f9, %lo(D_800E55B8)($at) -/* 0166B4 80015AB4 C42855BC */ lwc1 $f8, %lo(D_800E55BC)($at) +/* 0166B4 80015AB4 C42855BC */ lwc1 $f8, %lo(D_800E55B8 + 4)($at) /* 0166B8 80015AB8 46000121 */ cvt.d.s $f4, $f0 /* 0166BC 80015ABC 46282282 */ mul.d $f10, $f4, $f8 /* 0166C0 80015AC0 46205020 */ cvt.s.d $f0, $f10 @@ -410,13 +410,13 @@ glabel func_800159C8 /* 016BA4 80015FA4 8C850064 */ lw $a1, 0x64($a0) /* 016BA8 80015FA8 00001025 */ move $v0, $zero /* 016BAC 80015FAC 80AF01D6 */ lb $t7, 0x1d6($a1) -# Used to access D_800E55E0 and D_800E55E4 +# Used to access D_800E55E0 and D_800E55E0 + 4 /* 016BB0 80015FB0 3C01800E */ lui $at, %hi(D_800E55E0) # $at, 0x800e /* 016BB4 80015FB4 152F0059 */ bne $t1, $t7, .L8001611C /* 016BB8 80015FB8 00000000 */ nop -/* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C4) # $at, 0x800e +/* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C0 + 4) # $at, 0x800e /* 016BC0 80015FC0 C42755C0 */ lwc1 $f7, %lo(D_800E55C0)($at) -/* 016BC4 80015FC4 C42655C4 */ lwc1 $f6, %lo(D_800E55C4)($at) +/* 016BC4 80015FC4 C42655C4 */ lwc1 $f6, %lo(D_800E55C0 + 4)($at) /* 016BC8 80015FC8 46008021 */ cvt.d.s $f0, $f16 /* 016BCC 80015FCC 4620303C */ c.lt.d $f6, $f0 /* 016BD0 80015FD0 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -424,7 +424,7 @@ glabel func_800159C8 /* 016BD8 80015FD8 00000000 */ nop /* 016BDC 80015FDC 44815800 */ mtc1 $at, $f11 /* 016BE0 80015FE0 44805000 */ mtc1 $zero, $f10 -/* 016BE4 80015FE4 3C01800E */ lui $at, %hi(D_800E55CC) # $at, 0x800e +/* 016BE4 80015FE4 3C01800E */ lui $at, %hi(D_800E55C8 + 4) # $at, 0x800e /* 016BE8 80015FE8 4620503C */ c.lt.d $f10, $f0 /* 016BEC 80015FEC 00000000 */ nop /* 016BF0 80015FF0 45000002 */ bc1f .L80015FFC @@ -435,7 +435,7 @@ glabel func_800159C8 /* 016C00 80016000 00000000 */ nop /* 016C04 80016004 C484001C */ lwc1 $f4, 0x1c($a0) /* 016C08 80016008 C42155C8 */ lwc1 $f1, %lo(D_800E55C8)($at) -/* 016C0C 8001600C C42055CC */ lwc1 $f0, %lo(D_800E55CC)($at) +/* 016C0C 8001600C C42055CC */ lwc1 $f0, %lo(D_800E55C8 + 4)($at) /* 016C10 80016010 46002221 */ cvt.d.s $f8, $f4 /* 016C14 80016014 46204182 */ mul.d $f6, $f8, $f0 /* 016C18 80016018 C4840024 */ lwc1 $f4, 0x24($a0) @@ -459,7 +459,7 @@ glabel func_800159C8 /* 016C5C 8001605C 460C2202 */ mul.s $f8, $f4, $f12 /* 016C60 80016060 C480001C */ lwc1 $f0, 0x1c($a0) /* 016C64 80016064 C4E4000C */ lwc1 $f4, 0xc($a3) -# Used to access D_800E55D8 and D_800E55DC. +# Used to access D_800E55D8 and D_800E55D8 + 4. /* 016C68 80016068 3C01800E */ lui $at, %hi(D_800E55D8) # $at, 0x800e /* 016C6C 8001606C 46003282 */ mul.s $f10, $f6, $f0 /* 016C70 80016070 460A4081 */ sub.s $f2, $f8, $f10 @@ -474,11 +474,11 @@ glabel func_800159C8 /* 016C94 80016094 00000000 */ nop /* 016C98 80016098 45000011 */ bc1f .L800160E0 /* 016C9C 8001609C 00000000 */ nop -# Used to access D_800E55D0 and D_800E55D4. +# Used to access D_800E55D0 and D_800E55D0 + 4. /* 016CA0 800160A0 3C01800E */ lui $at, %hi(D_800E55D0) # $at, 0x800e /* 016CA4 800160A4 C486001C */ lwc1 $f6, 0x1c($a0) /* 016CA8 800160A8 C42155D0 */ lwc1 $f1, %lo(D_800E55D0)($at) -/* 016CAC 800160AC C42055D4 */ lwc1 $f0, %lo(D_800E55D4)($at) +/* 016CAC 800160AC C42055D4 */ lwc1 $f0, %lo(D_800E55D0 + 4)($at) /* 016CB0 800160B0 460032A1 */ cvt.d.s $f10, $f6 /* 016CB4 800160B4 46205102 */ mul.d $f4, $f10, $f0 /* 016CB8 800160B8 46202220 */ cvt.s.d $f8, $f4 @@ -494,7 +494,7 @@ glabel func_800159C8 .L800160E0: /* 016CE0 800160E0 C48A001C */ lwc1 $f10, 0x1c($a0) /* 016CE4 800160E4 C42155D8 */ lwc1 $f1, %lo(D_800E55D8)($at) -/* 016CE8 800160E8 C42055DC */ lwc1 $f0, %lo(D_800E55DC)($at) +/* 016CE8 800160E8 C42055DC */ lwc1 $f0, %lo(D_800E55D8 + 4)($at) /* 016CEC 800160EC 46005107 */ neg.s $f4, $f10 /* 016CF0 800160F0 46002221 */ cvt.d.s $f8, $f4 /* 016CF4 800160F4 46204182 */ mul.d $f6, $f8, $f0 @@ -509,7 +509,7 @@ glabel func_800159C8 /* 016D18 80016118 E4AA011C */ swc1 $f10, 0x11c($a1) .L8001611C: /* 016D1C 8001611C C42555E0 */ lwc1 $f5, %lo(D_800E55E0)($at) -/* 016D20 80016120 C42455E4 */ lwc1 $f4, %lo(D_800E55E4)($at) +/* 016D20 80016120 C42455E4 */ lwc1 $f4, %lo(D_800E55E0 + 4)($at) /* 016D24 80016124 46008021 */ cvt.d.s $f0, $f16 /* 016D28 80016128 4620203C */ c.lt.d $f4, $f0 /* 016D2C 8001612C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -651,7 +651,7 @@ glabel func_800159C8 /* 016F30 80016330 15380070 */ bne $t1, $t8, .L800164F4 /* 016F34 80016334 8FBF0014 */ lw $ra, 0x14($sp) /* 016F38 80016338 84F90048 */ lh $t9, 0x48($a3) -/* 016F3C 8001633C 3C01800E */ lui $at, %hi(D_800E55EC) # $at, 0x800e +/* 016F3C 8001633C 3C01800E */ lui $at, %hi(D_800E55E8 + 4) # $at, 0x800e /* 016F40 80016340 1539006C */ bne $t1, $t9, .L800164F4 /* 016F44 80016344 8FBF0014 */ lw $ra, 0x14($sp) /* 016F48 80016348 910A0012 */ lbu $t2, 0x12($t0) @@ -659,7 +659,7 @@ glabel func_800159C8 /* 016F50 80016350 C42755E8 */ lwc1 $f7, %lo(D_800E55E8)($at) /* 016F54 80016354 014C5823 */ subu $t3, $t2, $t4 /* 016F58 80016358 448B5000 */ mtc1 $t3, $f10 -/* 016F5C 8001635C C42655EC */ lwc1 $f6, %lo(D_800E55EC)($at) +/* 016F5C 8001635C C42655EC */ lwc1 $f6, %lo(D_800E55E8 + 4)($at) /* 016F60 80016360 46805120 */ cvt.s.w $f4, $f10 /* 016F64 80016364 8C850064 */ lw $a1, 0x64($a0) /* 016F68 80016368 8CED0064 */ lw $t5, 0x64($a3) @@ -681,7 +681,7 @@ glabel func_800159C8 .L800163A8: /* 016FA8 800163A8 8FB8004C */ lw $t8, 0x4c($sp) .L800163AC: -/* 016FAC 800163AC 3C01800E */ lui $at, %hi(D_800E55F4) # $at, 0x800e +/* 016FAC 800163AC 3C01800E */ lui $at, %hi(D_800E55F0 + 4) # $at, 0x800e /* 016FB0 800163B0 83020189 */ lb $v0, 0x189($t8) /* 016FB4 800163B4 00000000 */ nop /* 016FB8 800163B8 10400006 */ beqz $v0, .L800163D4 @@ -701,7 +701,7 @@ glabel func_800159C8 /* 016FEC 800163EC E7AC0068 */ swc1 $f12, 0x68($sp) .L800163F0: /* 016FF0 800163F0 C42155F0 */ lwc1 $f1, %lo(D_800E55F0)($at) -/* 016FF4 800163F4 C42055F4 */ lwc1 $f0, %lo(D_800E55F4)($at) +/* 016FF4 800163F4 C42055F4 */ lwc1 $f0, %lo(D_800E55F0 + 4)($at) /* 016FF8 800163F8 46008121 */ cvt.d.s $f4, $f16 /* 016FFC 800163FC 4624003C */ c.lt.d $f0, $f4 /* 017000 80016400 E7AC0068 */ swc1 $f12, 0x68($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80016748.s b/asm/non_matchings/unknown_00BC20/func_80016748.s index a31b8785..28a7cfe0 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016748.s +++ b/asm/non_matchings/unknown_00BC20/func_80016748.s @@ -79,12 +79,12 @@ glabel func_80016748 /* 017460 80016860 0000F025 */ move $fp, $zero /* 017464 80016864 1B0000BF */ blez $t8, .L80016B64 /* 017468 80016868 00009025 */ move $s2, $zero -/* 01746C 8001686C 3C01800E */ lui $at, %hi(D_800E55FC) # $at, 0x800e +/* 01746C 8001686C 3C01800E */ lui $at, %hi(D_800E55F8 + 4) # $at, 0x800e /* 017470 80016870 C43D55F8 */ lwc1 $f29, %lo(D_800E55F8)($at) -/* 017474 80016874 C43C55FC */ lwc1 $f28, %lo(D_800E55FC)($at) -/* 017478 80016878 3C01800E */ lui $at, %hi(D_800E5604) # $at, 0x800e +/* 017474 80016874 C43C55FC */ lwc1 $f28, %lo(D_800E55F8 + 4)($at) +/* 017478 80016878 3C01800E */ lui $at, %hi(D_800E5600 + 4) # $at, 0x800e /* 01747C 8001687C C43B5600 */ lwc1 $f27, %lo(D_800E5600)($at) -/* 017480 80016880 C43A5604 */ lwc1 $f26, %lo(D_800E5604)($at) +/* 017480 80016880 C43A5604 */ lwc1 $f26, %lo(D_800E5600 + 4)($at) /* 017484 80016884 4480C000 */ mtc1 $zero, $f24 /* 017488 80016888 2417000A */ li $s7, 10 .L8001688C: diff --git a/asm/non_matchings/unknown_00BC20/func_80017A18.s b/asm/non_matchings/unknown_00BC20/func_80017A18.s index e9d175c5..394e9c77 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017A18.s +++ b/asm/non_matchings/unknown_00BC20/func_80017A18.s @@ -110,7 +110,7 @@ glabel func_80017A18 /* 018798 80017B98 3C01800E */ lui $at, %hi(D_800E5608) # $at, 0x800e /* 01879C 80017B9C 46048402 */ mul.s $f16, $f16, $f4 /* 0187A0 80017BA0 46125001 */ sub.s $f0, $f10, $f18 -/* 0187A4 80017BA4 C42A560C */ lwc1 $f10, %lo(D_800E560C)($at) +/* 0187A4 80017BA4 C42A560C */ lwc1 $f10, %lo(D_800E5608 + 4)($at) /* 0187A8 80017BA8 E7BC0060 */ swc1 $f28, 0x60($sp) /* 0187AC 80017BAC 460E8380 */ add.s $f14, $f16, $f14 /* 0187B0 80017BB0 E7B40068 */ swc1 $f20, 0x68($sp) @@ -123,9 +123,9 @@ glabel func_80017A18 /* 0187CC 80017BCC 46126581 */ sub.s $f22, $f12, $f18 /* 0187D0 80017BD0 4500006D */ bc1f .L80017D88 /* 0187D4 80017BD4 E7A80070 */ swc1 $f8, 0x70($sp) -/* 0187D8 80017BD8 3C01800E */ lui $at, %hi(D_800E5614) # $at, 0x800e +/* 0187D8 80017BD8 3C01800E */ lui $at, %hi(D_800E5610 + 4) # $at, 0x800e /* 0187DC 80017BDC C4295610 */ lwc1 $f9, %lo(D_800E5610)($at) -/* 0187E0 80017BE0 C4285614 */ lwc1 $f8, %lo(D_800E5614)($at) +/* 0187E0 80017BE0 C4285614 */ lwc1 $f8, %lo(D_800E5610 + 4)($at) /* 0187E4 80017BE4 4600B2A1 */ cvt.d.s $f10, $f22 /* 0187E8 80017BE8 4628503C */ c.lt.d $f10, $f8 /* 0187EC 80017BEC C7AA0060 */ lwc1 $f10, 0x60($sp) @@ -186,9 +186,9 @@ glabel func_80017A18 /* 0188B8 80017CB8 00000000 */ nop .L80017CBC: /* 0188BC 80017CBC 10C00032 */ beqz $a2, .L80017D88 -/* 0188C0 80017CC0 3C01800E */ lui $at, %hi(D_800E561C) # $at, 0x800e +/* 0188C0 80017CC0 3C01800E */ lui $at, %hi(D_800E5618 + 4) # $at, 0x800e /* 0188C4 80017CC4 C4295618 */ lwc1 $f9, %lo(D_800E5618)($at) -/* 0188C8 80017CC8 C428561C */ lwc1 $f8, %lo(D_800E561C)($at) +/* 0188C8 80017CC8 C428561C */ lwc1 $f8, %lo(D_800E5618 + 4)($at) /* 0188CC 80017CCC 4600D1A1 */ cvt.d.s $f6, $f26 /* 0188D0 80017CD0 4626403C */ c.lt.d $f8, $f6 /* 0188D4 80017CD4 240D0001 */ li $t5, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_800185E4.s b/asm/non_matchings/unknown_00BC20/func_800185E4.s index c14c05b7..2e81bbd2 100644 --- a/asm/non_matchings/unknown_00BC20/func_800185E4.s +++ b/asm/non_matchings/unknown_00BC20/func_800185E4.s @@ -249,23 +249,23 @@ glabel func_800185E4 /* 019580 80018980 14790019 */ bne $v1, $t9, .L800189E8 /* 019584 80018984 00000000 */ nop /* 019588 80018988 8CE20064 */ lw $v0, 0x64($a3) -/* 01958C 8001898C 3C01800E */ lui $at, %hi(D_800E5624) # $at, 0x800e +/* 01958C 8001898C 3C01800E */ lui $at, %hi(D_800E5620 + 4) # $at, 0x800e /* 019590 80018990 844C0000 */ lh $t4, ($v0) /* 019594 80018994 00000000 */ nop /* 019598 80018998 154C0013 */ bne $t2, $t4, .L800189E8 /* 01959C 8001899C 00000000 */ nop /* 0195A0 800189A0 C4275620 */ lwc1 $f7, %lo(D_800E5620)($at) -/* 0195A4 800189A4 C4265624 */ lwc1 $f6, %lo(D_800E5624)($at) +/* 0195A4 800189A4 C4265624 */ lwc1 $f6, %lo(D_800E5620 + 4)($at) /* 0195A8 800189A8 460000A1 */ cvt.d.s $f2, $f0 /* 0195AC 800189AC 4626103C */ c.lt.d $f2, $f6 -/* 0195B0 800189B0 3C01800E */ lui $at, %hi(D_800E562C) # $at, 0x800e +/* 0195B0 800189B0 3C01800E */ lui $at, %hi(D_800E5628 + 4) # $at, 0x800e /* 0195B4 800189B4 45000003 */ bc1f .L800189C4 /* 0195B8 800189B8 00000000 */ nop /* 0195BC 800189BC 100000A6 */ b .L80018C58 /* 0195C0 800189C0 2402FF9C */ li $v0, -100 .L800189C4: /* 0195C4 800189C4 C4255628 */ lwc1 $f5, %lo(D_800E5628)($at) -/* 0195C8 800189C8 C424562C */ lwc1 $f4, %lo(D_800E562C)($at) +/* 0195C8 800189C8 C424562C */ lwc1 $f4, %lo(D_800E5628 + 4)($at) /* 0195CC 800189CC 00000000 */ nop /* 0195D0 800189D0 4622203C */ c.lt.d $f4, $f2 /* 0195D4 800189D4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001955C.s b/asm/non_matchings/unknown_00BC20/func_8001955C.s index f2b5cef5..2dfd8db8 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001955C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001955C.s @@ -124,13 +124,13 @@ glabel func_8001955C /* 01A318 80019718 0C0326B4 */ jal sqrtf /* 01A31C 8001971C 46123300 */ add.s $f12, $f6, $f18 /* 01A320 80019720 44802000 */ mtc1 $zero, $f4 -/* 01A324 80019724 3C01800E */ lui $at, %hi(D_800E5634) # $at, 0x800e +/* 01A324 80019724 3C01800E */ lui $at, %hi(D_800E5630 + 4) # $at, 0x800e /* 01A328 80019728 46040032 */ c.eq.s $f0, $f4 /* 01A32C 8001972C 00000000 */ nop /* 01A330 80019730 45010011 */ bc1t .L80019778 /* 01A334 80019734 00000000 */ nop /* 01A338 80019738 C4295630 */ lwc1 $f9, %lo(D_800E5630)($at) -/* 01A33C 8001973C C4285634 */ lwc1 $f8, %lo(D_800E5634)($at) +/* 01A33C 8001973C C4285634 */ lwc1 $f8, %lo(D_800E5630 + 4)($at) /* 01A340 80019740 460002A1 */ cvt.d.s $f10, $f0 /* 01A344 80019744 00000000 */ nop /* 01A348 80019748 462A4183 */ div.d $f6, $f8, $f10 diff --git a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s index ed14d98e..447e4b4b 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s @@ -38,10 +38,10 @@ glabel func_8001C6C4 /* 01D324 8001C724 AFA600F0 */ sw $a2, 0xf0($sp) /* 01D328 8001C728 15C00009 */ bnez $t6, .L8001C750 /* 01D32C 8001C72C AFA700F4 */ sw $a3, 0xf4($sp) -/* 01D330 8001C730 3C01800E */ lui $at, %hi(D_800E564C) # $at, 0x800e +/* 01D330 8001C730 3C01800E */ lui $at, %hi(D_800E5648 + 4) # $at, 0x800e /* 01D334 8001C734 C7A400F0 */ lwc1 $f4, 0xf0($sp) /* 01D338 8001C738 C4295648 */ lwc1 $f9, %lo(D_800E5648)($at) -/* 01D33C 8001C73C C428564C */ lwc1 $f8, %lo(D_800E564C)($at) +/* 01D33C 8001C73C C428564C */ lwc1 $f8, %lo(D_800E5648 + 4)($at) /* 01D340 8001C740 460021A1 */ cvt.d.s $f6, $f4 /* 01D344 8001C744 46283282 */ mul.d $f10, $f6, $f8 /* 01D348 8001C748 46205420 */ cvt.s.d $f16, $f10 @@ -208,9 +208,9 @@ glabel func_8001C6C4 /* 01D5AC 8001C9AC 46120032 */ c.eq.s $f0, $f18 /* 01D5B0 8001C9B0 460A5402 */ mul.s $f16, $f10, $f10 /* 01D5B4 8001C9B4 4501000D */ bc1t .L8001C9EC -/* 01D5B8 8001C9B8 3C01800E */ lui $at, %hi(D_800E565C) # $at, 0x800e +/* 01D5B8 8001C9B8 3C01800E */ lui $at, %hi(D_800E5658 + 4) # $at, 0x800e /* 01D5BC 8001C9BC C4295658 */ lwc1 $f9, %lo(D_800E5658)($at) -/* 01D5C0 8001C9C0 C428565C */ lwc1 $f8, %lo(D_800E565C)($at) +/* 01D5C0 8001C9C0 C428565C */ lwc1 $f8, %lo(D_800E5658 + 4)($at) /* 01D5C4 8001C9C4 46000121 */ cvt.d.s $f4, $f0 /* 01D5C8 8001C9C8 00000000 */ nop /* 01D5CC 8001C9CC 46244183 */ div.d $f6, $f8, $f4 diff --git a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s index e4176f0b..c8c7a36d 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s @@ -77,7 +77,7 @@ glabel func_8001EFA4 /* 01FCB0 8001F0B0 00000000 */ nop /* 01FCB4 8001F0B4 A60D0028 */ sh $t5, 0x28($s0) /* 01FCB8 8001F0B8 822E0014 */ lb $t6, 0x14($s1) -/* 01FCBC 8001F0BC C430566C */ lwc1 $f16, %lo(D_800E566C)($at) +/* 01FCBC 8001F0BC C430566C */ lwc1 $f16, %lo(D_800E5668 + 4)($at) /* 01FCC0 8001F0C0 448E3000 */ mtc1 $t6, $f6 /* 01FCC4 8001F0C4 C4315668 */ lwc1 $f17, %lo(D_800E5668)($at) /* 01FCC8 8001F0C8 46803220 */ cvt.s.w $f8, $f6 diff --git a/asm/non_matchings/unknown_00BC20/func_8001F460.s b/asm/non_matchings/unknown_00BC20/func_8001F460.s index 3895b23e..585f2357 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F460.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F460.s @@ -43,14 +43,14 @@ glabel func_8001F460 /* 0200D4 8001F4D4 44992000 */ mtc1 $t9, $f4 /* 0200D8 8001F4D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0200DC 8001F4DC 46802020 */ cvt.s.w $f0, $f4 -/* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5674) # $at, 0x800e +/* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5670 + 4) # $at, 0x800e /* 0200E4 8001F4E4 00008025 */ move $s0, $zero /* 0200E8 8001F4E8 E7A00114 */ swc1 $f0, 0x114($sp) /* 0200EC 8001F4EC 8ED30064 */ lw $s3, 0x64($s6) /* 0200F0 8001F4F0 15C00007 */ bnez $t6, .L8001F510 /* 0200F4 8001F4F4 24110004 */ li $s1, 4 /* 0200F8 8001F4F8 C4295670 */ lwc1 $f9, %lo(D_800E5670)($at) -/* 0200FC 8001F4FC C4285674 */ lwc1 $f8, %lo(D_800E5674)($at) +/* 0200FC 8001F4FC C4285674 */ lwc1 $f8, %lo(D_800E5670 + 4)($at) /* 020100 8001F500 460001A1 */ cvt.d.s $f6, $f0 /* 020104 8001F504 46283282 */ mul.d $f10, $f6, $f8 /* 020108 8001F508 46205120 */ cvt.s.d $f4, $f10 @@ -1720,11 +1720,11 @@ glabel func_8001F460 /* 021970 80020D70 030FC821 */ addu $t9, $t8, $t7 /* 021974 80020D74 032EC021 */ addu $t8, $t9, $t6 /* 021978 80020D78 8F0F0000 */ lw $t7, ($t8) -/* 02197C 80020D7C 3C01800E */ lui $at, %hi(D_800E5684) # $at, 0x800e +/* 02197C 80020D7C 3C01800E */ lui $at, %hi(D_800E5680 + 4) # $at, 0x800e /* 021980 80020D80 8DF1003C */ lw $s1, 0x3c($t7) /* 021984 80020D84 C4215680 */ lwc1 $f1, %lo(D_800E5680)($at) /* 021988 80020D88 82390014 */ lb $t9, 0x14($s1) -/* 02198C 80020D8C C4205684 */ lwc1 $f0, %lo(D_800E5684)($at) +/* 02198C 80020D8C C4205684 */ lwc1 $f0, %lo(D_800E5680 + 4)($at) /* 021990 80020D90 44995000 */ mtc1 $t9, $f10 /* 021994 80020D94 00000000 */ nop /* 021998 80020D98 46805220 */ cvt.s.w $f8, $f10 diff --git a/asm/non_matchings/unknown_0255E0/func_8002581C.s b/asm/non_matchings/unknown_0255E0/func_8002581C.s index 6013280d..04ca0f70 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002581C.s +++ b/asm/non_matchings/unknown_0255E0/func_8002581C.s @@ -64,9 +64,9 @@ glabel func_8002581C /* 026500 80025900 0004C400 */ sll $t8, $a0, 0x10 /* 026504 80025904 0C01C1FE */ jal func_800707F8 /* 026508 80025908 00182403 */ sra $a0, $t8, 0x10 -/* 02650C 8002590C 3C01800E */ lui $at, %hi(D_800E5E64) # $at, 0x800e +/* 02650C 8002590C 3C01800E */ lui $at, %hi(D_800E5E60 + 4) # $at, 0x800e /* 026510 80025910 C42F5E60 */ lwc1 $f15, %lo(D_800E5E60)($at) -/* 026514 80025914 C42E5E64 */ lwc1 $f14, %lo(D_800E5E64)($at) +/* 026514 80025914 C42E5E64 */ lwc1 $f14, %lo(D_800E5E60 + 4)($at) /* 026518 80025918 4600D221 */ cvt.d.s $f8, $f26 /* 02651C 8002591C 462E4282 */ mul.d $f10, $f8, $f14 /* 026520 80025920 8E020000 */ lw $v0, ($s0) diff --git a/asm/non_matchings/unknown_0255E0/func_80026070.s b/asm/non_matchings/unknown_0255E0/func_80026070.s index 61967b04..c5646d1b 100644 --- a/asm/non_matchings/unknown_0255E0/func_80026070.s +++ b/asm/non_matchings/unknown_0255E0/func_80026070.s @@ -169,7 +169,7 @@ glabel func_80026070 /* 026EDC 800262DC 46061282 */ mul.s $f10, $f2, $f6 /* 026EE0 800262E0 C7A60050 */ lwc1 $f6, 0x50($sp) /* 026EE4 800262E4 C42CD4A8 */ lwc1 $f12, %lo(D_8011D4A8)($at) -/* 026EE8 800262E8 3C01800E */ lui $at, %hi(D_800E5E6C) # $at, 0x800e +/* 026EE8 800262E8 3C01800E */ lui $at, %hi(D_800E5E68 + 4) # $at, 0x800e /* 026EEC 800262EC 460A4100 */ add.s $f4, $f8, $f10 /* 026EF0 800262F0 C7AA0058 */ lwc1 $f10, 0x58($sp) /* 026EF4 800262F4 46003202 */ mul.s $f8, $f6, $f0 @@ -186,14 +186,14 @@ glabel func_80026070 /* 026F20 80026320 46007486 */ mov.s $f18, $f14 .L80026324: /* 026F24 80026324 C42D5E68 */ lwc1 $f13, %lo(D_800E5E68)($at) -/* 026F28 80026328 C42C5E6C */ lwc1 $f12, %lo(D_800E5E6C)($at) +/* 026F28 80026328 C42C5E6C */ lwc1 $f12, %lo(D_800E5E68 + 4)($at) /* 026F2C 8002632C 46009021 */ cvt.d.s $f0, $f18 /* 026F30 80026330 462C003C */ c.lt.d $f0, $f12 -/* 026F34 80026334 3C01800E */ lui $at, %hi(D_800E5E74) # $at, 0x800e +/* 026F34 80026334 3C01800E */ lui $at, %hi(D_800E5E70 + 4) # $at, 0x800e /* 026F38 80026338 45010038 */ bc1t .L8002641C /* 026F3C 8002633C E7B20064 */ swc1 $f18, 0x64($sp) /* 026F40 80026340 C42F5E70 */ lwc1 $f15, %lo(D_800E5E70)($at) -/* 026F44 80026344 C42E5E74 */ lwc1 $f14, %lo(D_800E5E74)($at) +/* 026F44 80026344 C42E5E74 */ lwc1 $f14, %lo(D_800E5E70 + 4)($at) /* 026F48 80026348 460080A1 */ cvt.d.s $f2, $f16 /* 026F4C 8002634C 4622703C */ c.lt.d $f14, $f2 /* 026F50 80026350 E7B00060 */ swc1 $f16, 0x60($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_80026430.s b/asm/non_matchings/unknown_0255E0/func_80026430.s index 34a25dd3..94f0bde6 100644 --- a/asm/non_matchings/unknown_0255E0/func_80026430.s +++ b/asm/non_matchings/unknown_0255E0/func_80026430.s @@ -43,11 +43,11 @@ glabel func_80026430 /* 0270B0 800264B0 E7B4001C */ swc1 $f20, 0x1c($sp) /* 0270B4 800264B4 A7A0010E */ sh $zero, 0x10e($sp) /* 0270B8 800264B8 84840020 */ lh $a0, 0x20($a0) -/* 0270BC 800264BC 3C01800E */ lui $at, %hi(D_800E5E7C) # $at, 0x800e +/* 0270BC 800264BC 3C01800E */ lui $at, %hi(D_800E5E78 + 4) # $at, 0x800e /* 0270C0 800264C0 188001BC */ blez $a0, .L80026BB4 /* 0270C4 800264C4 27BE00B8 */ addiu $fp, $sp, 0xb8 /* 0270C8 800264C8 C43F5E78 */ lwc1 $f31, %lo(D_800E5E78)($at) -/* 0270CC 800264CC C43E5E7C */ lwc1 $f30, %lo(D_800E5E7C)($at) +/* 0270CC 800264CC C43E5E7C */ lwc1 $f30, %lo(D_800E5E78 + 4)($at) /* 0270D0 800264D0 4480A800 */ mtc1 $zero, $f21 /* 0270D4 800264D4 4480A000 */ mtc1 $zero, $f20 /* 0270D8 800264D8 27B500D0 */ addiu $s5, $sp, 0xd0 @@ -243,7 +243,7 @@ glabel func_80026430 /* 0273A8 800267A8 C7A00094 */ lwc1 $f0, 0x94($sp) /* 0273AC 800267AC 460E3202 */ mul.s $f8, $f6, $f14 /* 0273B0 800267B0 C7A400B0 */ lwc1 $f4, 0xb0($sp) -/* 0273B4 800267B4 3C01800E */ lui $at, %hi(D_800E5E84) # $at, 0x800e +/* 0273B4 800267B4 3C01800E */ lui $at, %hi(D_800E5E80 + 4) # $at, 0x800e /* 0273B8 800267B8 00008025 */ move $s0, $zero /* 0273BC 800267BC 46040282 */ mul.s $f10, $f0, $f4 /* 0273C0 800267C0 C7A400AC */ lwc1 $f4, 0xac($sp) @@ -258,7 +258,7 @@ glabel func_80026430 /* 0273E4 800267E4 460A0182 */ mul.s $f6, $f0, $f10 /* 0273E8 800267E8 C7AA00C4 */ lwc1 $f10, 0xc4($sp) /* 0273EC 800267EC 46064100 */ add.s $f4, $f8, $f6 -/* 0273F0 800267F0 C4285E84 */ lwc1 $f8, %lo(D_800E5E84)($at) +/* 0273F0 800267F0 C4285E84 */ lwc1 $f8, %lo(D_800E5E80 + 4)($at) /* 0273F4 800267F4 46005021 */ cvt.d.s $f0, $f10 /* 0273F8 800267F8 4628003C */ c.lt.d $f0, $f8 /* 0273FC 800267FC 46162300 */ add.s $f12, $f4, $f22 @@ -271,13 +271,13 @@ glabel func_80026430 /* 027414 80026814 4620F03C */ c.lt.d $f30, $f0 /* 027418 80026818 C7A600C8 */ lwc1 $f6, 0xc8($sp) /* 02741C 8002681C 45000004 */ bc1f .L80026830 -/* 027420 80026820 3C01800E */ lui $at, %hi(D_800E5E8C) # $at, 0x800e +/* 027420 80026820 3C01800E */ lui $at, %hi(D_800E5E88 + 4) # $at, 0x800e /* 027424 80026824 344E0002 */ ori $t6, $v0, 2 /* 027428 80026828 000EC600 */ sll $t8, $t6, 0x18 /* 02742C 8002682C 00181603 */ sra $v0, $t8, 0x18 .L80026830: /* 027430 80026830 C4255E88 */ lwc1 $f5, %lo(D_800E5E88)($at) -/* 027434 80026834 C4245E8C */ lwc1 $f4, %lo(D_800E5E8C)($at) +/* 027434 80026834 C4245E8C */ lwc1 $f4, %lo(D_800E5E88 + 4)($at) /* 027438 80026838 46003021 */ cvt.d.s $f0, $f6 /* 02743C 8002683C 4624003C */ c.lt.d $f0, $f4 /* 027440 80026840 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_80027568.s b/asm/non_matchings/unknown_0255E0/func_80027568.s index b064a279..8883023f 100644 --- a/asm/non_matchings/unknown_0255E0/func_80027568.s +++ b/asm/non_matchings/unknown_0255E0/func_80027568.s @@ -134,7 +134,7 @@ glabel func_80027568 /* 028338 80027738 E7A0005C */ swc1 $f0, 0x5c($sp) /* 02833C 8002773C 46003221 */ cvt.d.s $f8, $f6 /* 028340 80027740 462A4101 */ sub.d $f4, $f8, $f10 -/* 028344 80027744 C4285E94 */ lwc1 $f8, %lo(D_800E5E94)($at) +/* 028344 80027744 C4285E94 */ lwc1 $f8, %lo(D_800E5E90 + 4)($at) /* 028348 80027748 46202320 */ cvt.s.d $f12, $f4 /* 02834C 8002774C C4295E90 */ lwc1 $f9, %lo(D_800E5E90)($at) /* 028350 80027750 460061A1 */ cvt.d.s $f6, $f12 @@ -146,7 +146,7 @@ glabel func_80027568 /* 028368 80027768 C5700010 */ lwc1 $f16, 0x10($t3) /* 02836C 8002776C 46027282 */ mul.s $f10, $f14, $f2 /* 028370 80027770 C5720014 */ lwc1 $f18, 0x14($t3) -/* 028374 80027774 3C01800E */ lui $at, %hi(D_800E5E9C) # $at, 0x800e +/* 028374 80027774 3C01800E */ lui $at, %hi(D_800E5E98 + 4) # $at, 0x800e /* 028378 80027778 00001025 */ move $v0, $zero /* 02837C 8002777C 4610A102 */ mul.s $f4, $f20, $f16 /* 028380 80027780 00000000 */ nop @@ -154,7 +154,7 @@ glabel func_80027568 /* 028388 80027788 46045180 */ add.s $f6, $f10, $f4 /* 02838C 8002778C C4275E98 */ lwc1 $f7, %lo(D_800E5E98)($at) /* 028390 80027790 46083280 */ add.s $f10, $f6, $f8 -/* 028394 80027794 C4265E9C */ lwc1 $f6, %lo(D_800E5E9C)($at) +/* 028394 80027794 C4265E9C */ lwc1 $f6, %lo(D_800E5E98 + 4)($at) /* 028398 80027798 46185000 */ add.s $f0, $f10, $f24 /* 02839C 8002779C C7A8005C */ lwc1 $f8, 0x5c($sp) /* 0283A0 800277A0 46000121 */ cvt.d.s $f4, $f0 diff --git a/asm/non_matchings/unknown_0255E0/func_80028FAC.s b/asm/non_matchings/unknown_0255E0/func_80028FAC.s index 69e0bce7..aab03875 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028FAC.s +++ b/asm/non_matchings/unknown_0255E0/func_80028FAC.s @@ -153,7 +153,7 @@ glabel func_80028FAC /* 029DC0 800291C0 10400033 */ beqz $v0, .L80029290 /* 029DC4 800291C4 8FA3016C */ lw $v1, 0x16c($sp) /* 029DC8 800291C8 8639002E */ lh $t9, 0x2e($s1) -/* 029DCC 800291CC 3C01800E */ lui $at, %hi(D_800E5EA4) # $at, 0x800e +/* 029DCC 800291CC 3C01800E */ lui $at, %hi(D_800E5EA0 + 4) # $at, 0x800e /* 029DD0 800291D0 02D94021 */ addu $t0, $s6, $t9 /* 029DD4 800291D4 910A0001 */ lbu $t2, 1($t0) /* 029DD8 800291D8 00000000 */ nop @@ -161,7 +161,7 @@ glabel func_80028FAC /* 029DE0 800291E0 00000000 */ nop /* 029DE4 800291E4 C6260034 */ lwc1 $f6, 0x34($s1) /* 029DE8 800291E8 C4255EA0 */ lwc1 $f5, %lo(D_800E5EA0)($at) -/* 029DEC 800291EC C4245EA4 */ lwc1 $f4, %lo(D_800E5EA4)($at) +/* 029DEC 800291EC C4245EA4 */ lwc1 $f4, %lo(D_800E5EA0 + 4)($at) /* 029DF0 800291F0 46003221 */ cvt.d.s $f8, $f6 /* 029DF4 800291F4 4628203C */ c.lt.d $f4, $f8 /* 029DF8 800291F8 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s index 00355b84..a7672b2d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s @@ -181,10 +181,10 @@ glabel func_8002A5F8 /* 02B480 8002A880 3C028012 */ lui $v0, %hi(D_8011D380) # $v0, 0x8012 /* 02B484 8002A884 2442D380 */ addiu $v0, %lo(D_8011D380) # addiu $v0, $v0, -0x2c80 /* 02B488 8002A888 E4400000 */ swc1 $f0, ($v0) -/* 02B48C 8002A88C 3C01800E */ lui $at, %hi(D_800E5EAC) # $at, 0x800e +/* 02B48C 8002A88C 3C01800E */ lui $at, %hi(D_800E5EA8 + 4) # $at, 0x800e /* 02B490 8002A890 C4460000 */ lwc1 $f6, ($v0) /* 02B494 8002A894 C42B5EA8 */ lwc1 $f11, %lo(D_800E5EA8)($at) -/* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EAC)($at) +/* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EA8 + 4)($at) /* 02B49C 8002A89C 46003221 */ cvt.d.s $f8, $f6 /* 02B4A0 8002A8A0 462A403C */ c.lt.d $f8, $f10 /* 02B4A4 8002A8A4 3C018012 */ lui $at, %hi(D_8011B0BC) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_0255E0/func_8002A900.s b/asm/non_matchings/unknown_0255E0/func_8002A900.s index c752834e..b090a238 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A900.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A900.s @@ -63,7 +63,7 @@ glabel func_8002A900 /* 02B5CC 8002A9CC 44833000 */ mtc1 $v1, $f6 /* 02B5D0 8002A9D0 8FA5003C */ lw $a1, 0x3c($sp) /* 02B5D4 8002A9D4 46803320 */ cvt.s.w $f12, $f6 -/* 02B5D8 8002A9D8 3C01800E */ lui $at, %hi(D_800E5EB4) # $at, 0x800e +/* 02B5D8 8002A9D8 3C01800E */ lui $at, %hi(D_800E5EB0 + 4) # $at, 0x800e /* 02B5DC 8002A9DC 4600603C */ c.lt.s $f12, $f0 /* 02B5E0 8002A9E0 00000000 */ nop /* 02B5E4 8002A9E4 45000003 */ bc1f .L8002A9F4 @@ -74,7 +74,7 @@ glabel func_8002A900 /* 02B5F4 8002A9F4 44834000 */ mtc1 $v1, $f8 /* 02B5F8 8002A9F8 C4255EB0 */ lwc1 $f5, %lo(D_800E5EB0)($at) /* 02B5FC 8002A9FC 468042A1 */ cvt.d.w $f10, $f8 -/* 02B600 8002AA00 C4245EB4 */ lwc1 $f4, %lo(D_800E5EB4)($at) +/* 02B600 8002AA00 C4245EB4 */ lwc1 $f4, %lo(D_800E5EB0 + 4)($at) /* 02B604 8002AA04 00000000 */ nop /* 02B608 8002AA08 46245182 */ mul.d $f6, $f10, $f4 /* 02B60C 8002AA0C 462030A0 */ cvt.s.d $f2, $f6 @@ -104,7 +104,7 @@ glabel func_8002A900 /* 02B66C 8002AA6C 3C01800E */ lui $at, %hi(D_800E5EB8) # $at, 0x800e /* 02B670 8002AA70 460051A1 */ cvt.d.s $f6, $f10 /* 02B674 8002AA74 46262201 */ sub.d $f8, $f4, $f6 -/* 02B678 8002AA78 C4265EBC */ lwc1 $f6, %lo(D_800E5EBC)($at) +/* 02B678 8002AA78 C4265EBC */ lwc1 $f6, %lo(D_800E5EB8 + 4)($at) /* 02B67C 8002AA7C 462042A0 */ cvt.s.d $f10, $f8 /* 02B680 8002AA80 C4275EB8 */ lwc1 $f7, %lo(D_800E5EB8)($at) /* 02B684 8002AA84 46005121 */ cvt.d.s $f4, $f10 diff --git a/asm/non_matchings/unknown_0255E0/func_8002DE30.s b/asm/non_matchings/unknown_0255E0/func_8002DE30.s index a6d02aad..810d1f7d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002DE30.s +++ b/asm/non_matchings/unknown_0255E0/func_8002DE30.s @@ -104,9 +104,9 @@ glabel func_8002DE30 /* 02EBB4 8002DFB4 00005025 */ move $t2, $zero /* 02EBB8 8002DFB8 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 02EBBC 8002DFBC 4481B000 */ mtc1 $at, $f22 -/* 02EBC0 8002DFC0 3C01800E */ lui $at, %hi(D_800E5F44) # $at, 0x800e +/* 02EBC0 8002DFC0 3C01800E */ lui $at, %hi(D_800E5F40 + 4) # $at, 0x800e /* 02EBC4 8002DFC4 C4355F40 */ lwc1 $f21, %lo(D_800E5F40)($at) -/* 02EBC8 8002DFC8 C4345F44 */ lwc1 $f20, %lo(D_800E5F44)($at) +/* 02EBC8 8002DFC8 C4345F44 */ lwc1 $f20, %lo(D_800E5F40 + 4)($at) /* 02EBCC 8002DFCC 8EA2000C */ lw $v0, 0xc($s5) /* 02EBD0 8002DFD0 24120003 */ li $s2, 3 /* 02EBD4 8002DFD4 2411000A */ li $s1, 10 diff --git a/asm/non_matchings/unknown_032760/func_80033F60.s b/asm/non_matchings/unknown_032760/func_80033F60.s index 6a16baf0..f16888ac 100644 --- a/asm/non_matchings/unknown_032760/func_80033F60.s +++ b/asm/non_matchings/unknown_032760/func_80033F60.s @@ -20,9 +20,9 @@ glabel func_80033F60 /* 034B84 80033F84 00808025 */ move $s0, $a0 /* 034B88 80033F88 15E00008 */ bnez $t7, .L80033FAC /* 034B8C 80033F8C E7A0007C */ swc1 $f0, 0x7c($sp) -/* 034B90 80033F90 3C01800E */ lui $at, %hi(D_800E5FE4) # $at, 0x800e +/* 034B90 80033F90 3C01800E */ lui $at, %hi(D_800E5FE0 + 4) # $at, 0x800e /* 034B94 80033F94 C4295FE0 */ lwc1 $f9, %lo(D_800E5FE0)($at) -/* 034B98 80033F98 C4285FE4 */ lwc1 $f8, %lo(D_800E5FE4)($at) +/* 034B98 80033F98 C4285FE4 */ lwc1 $f8, %lo(D_800E5FE0 + 4)($at) /* 034B9C 80033F9C 460001A1 */ cvt.d.s $f6, $f0 /* 034BA0 80033FA0 46283282 */ mul.d $f10, $f6, $f8 /* 034BA4 80033FA4 46205120 */ cvt.s.d $f4, $f10 @@ -55,10 +55,10 @@ glabel func_80033F60 .L8003400C: /* 034C0C 8003400C C466000C */ lwc1 $f6, 0xc($v1) /* 034C10 80034010 C608000C */ lwc1 $f8, 0xc($s0) -/* 034C14 80034014 3C01800E */ lui $at, %hi(D_800E5FEC) # $at, 0x800e +/* 034C14 80034014 3C01800E */ lui $at, %hi(D_800E5FE8 + 4) # $at, 0x800e /* 034C18 80034018 46083281 */ sub.s $f10, $f6, $f8 /* 034C1C 8003401C C4335FE8 */ lwc1 $f19, %lo(D_800E5FE8)($at) -/* 034C20 80034020 C4325FEC */ lwc1 $f18, %lo(D_800E5FEC)($at) +/* 034C20 80034020 C4325FEC */ lwc1 $f18, %lo(D_800E5FE8 + 4)($at) /* 034C24 80034024 46005121 */ cvt.d.s $f4, $f10 /* 034C28 80034028 46322182 */ mul.d $f6, $f4, $f18 /* 034C2C 8003402C 3C014024 */ li $at, 0x40240000 # 2.562500 @@ -332,10 +332,10 @@ glabel func_80033F60 /* 03502C 8003442C 0C00FF11 */ jal func_8003FC44 /* 035030 80034430 E7A80014 */ swc1 $f8, 0x14($sp) .L80034434: -/* 035034 80034434 3C01800E */ lui $at, %hi(D_800E5FF4) # $at, 0x800e +/* 035034 80034434 3C01800E */ lui $at, %hi(D_800E5FF0 + 4) # $at, 0x800e /* 035038 80034438 C60A0008 */ lwc1 $f10, 8($s0) /* 03503C 8003443C C4275FF0 */ lwc1 $f7, %lo(D_800E5FF0)($at) -/* 035040 80034440 C4265FF4 */ lwc1 $f6, %lo(D_800E5FF4)($at) +/* 035040 80034440 C4265FF4 */ lwc1 $f6, %lo(D_800E5FF0 + 4)($at) /* 035044 80034444 46005121 */ cvt.d.s $f4, $f10 /* 035048 80034448 46262202 */ mul.d $f8, $f4, $f6 /* 03504C 8003444C 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 diff --git a/asm/non_matchings/unknown_032760/func_80034860.s b/asm/non_matchings/unknown_032760/func_80034860.s index 7ef7f2fd..15263e57 100644 --- a/asm/non_matchings/unknown_032760/func_80034860.s +++ b/asm/non_matchings/unknown_032760/func_80034860.s @@ -18,9 +18,9 @@ glabel func_80034860 /* 035484 80034884 00004025 */ move $t0, $zero /* 035488 80034888 15E00007 */ bnez $t7, .L800348A8 /* 03548C 8003488C 46001006 */ mov.s $f0, $f2 -/* 035490 80034890 3C01800E */ lui $at, %hi(D_800E5FFC) # $at, 0x800e +/* 035490 80034890 3C01800E */ lui $at, %hi(D_800E5FF8 + 4) # $at, 0x800e /* 035494 80034894 C4295FF8 */ lwc1 $f9, %lo(D_800E5FF8)($at) -/* 035498 80034898 C4285FFC */ lwc1 $f8, %lo(D_800E5FFC)($at) +/* 035498 80034898 C4285FFC */ lwc1 $f8, %lo(D_800E5FF8 + 4)($at) /* 03549C 8003489C 460011A1 */ cvt.d.s $f6, $f2 /* 0354A0 800348A0 46283282 */ mul.d $f10, $f6, $f8 /* 0354A4 800348A4 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80035260.s b/asm/non_matchings/unknown_032760/func_80035260.s index 9eef6a6b..6531724f 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/func_80035260.s @@ -20,9 +20,9 @@ glabel func_80035260 /* 035E84 80035284 00808025 */ move $s0, $a0 /* 035E88 80035288 15C00007 */ bnez $t6, .L800352A8 /* 035E8C 8003528C 46001006 */ mov.s $f0, $f2 -/* 035E90 80035290 3C01800E */ lui $at, %hi(D_800E6014) # $at, 0x800e +/* 035E90 80035290 3C01800E */ lui $at, %hi(D_800E6010 + 4) # $at, 0x800e /* 035E94 80035294 C4296010 */ lwc1 $f9, %lo(D_800E6010)($at) -/* 035E98 80035298 C4286014 */ lwc1 $f8, %lo(D_800E6014)($at) +/* 035E98 80035298 C4286014 */ lwc1 $f8, %lo(D_800E6010 + 4)($at) /* 035E9C 8003529C 460011A1 */ cvt.d.s $f6, $f2 /* 035EA0 800352A0 46283282 */ mul.d $f10, $f6, $f8 /* 035EA4 800352A4 46205020 */ cvt.s.d $f0, $f10 @@ -88,10 +88,10 @@ glabel func_80035260 /* 035F88 80035388 C606000C */ lwc1 $f6, 0xc($s0) /* 035F8C 8003538C C7A00038 */ lwc1 $f0, 0x38($sp) /* 035F90 80035390 46068101 */ sub.s $f4, $f16, $f6 -/* 035F94 80035394 3C01800E */ lui $at, %hi(D_800E601C) # $at, 0x800e +/* 035F94 80035394 3C01800E */ lui $at, %hi(D_800E6018 + 4) # $at, 0x800e /* 035F98 80035398 46002283 */ div.s $f10, $f4, $f0 /* 035F9C 8003539C C4236018 */ lwc1 $f3, %lo(D_800E6018)($at) -/* 035FA0 800353A0 C422601C */ lwc1 $f2, %lo(D_800E601C)($at) +/* 035FA0 800353A0 C422601C */ lwc1 $f2, %lo(D_800E6018 + 4)($at) /* 035FA4 800353A4 C6120010 */ lwc1 $f18, 0x10($s0) /* 035FA8 800353A8 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 035FAC 800353AC E60A001C */ swc1 $f10, 0x1c($s0) @@ -131,7 +131,7 @@ glabel func_80035260 /* 036034 80035434 E612001C */ swc1 $f18, 0x1c($s0) /* 036038 80035438 462022A0 */ cvt.s.d $f10, $f4 /* 03603C 8003543C E60A0024 */ swc1 $f10, 0x24($s0) -/* 036040 80035440 C4306024 */ lwc1 $f16, %lo(D_800E6024)($at) +/* 036040 80035440 C4306024 */ lwc1 $f16, %lo(D_800E6020 + 4)($at) /* 036044 80035444 C4316020 */ lwc1 $f17, %lo(D_800E6020)($at) /* 036048 80035448 460044A1 */ cvt.d.s $f18, $f8 /* 03604C 8003544C 46309182 */ mul.d $f6, $f18, $f16 diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/func_800361E0.s index d4d9789e..ac2666b8 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/func_800361E0.s @@ -24,9 +24,9 @@ glabel func_800361E0 /* 036E0C 8003620C 46000086 */ mov.s $f2, $f0 /* 036E10 80036210 15E00007 */ bnez $t7, .L80036230 /* 036E14 80036214 E7A4006C */ swc1 $f4, 0x6c($sp) -/* 036E18 80036218 3C01800E */ lui $at, %hi(D_800E602C) # $at, 0x800e +/* 036E18 80036218 3C01800E */ lui $at, %hi(D_800E6028 + 4) # $at, 0x800e /* 036E1C 8003621C C42B6028 */ lwc1 $f11, %lo(D_800E6028)($at) -/* 036E20 80036220 C42A602C */ lwc1 $f10, %lo(D_800E602C)($at) +/* 036E20 80036220 C42A602C */ lwc1 $f10, %lo(D_800E6028 + 4)($at) /* 036E24 80036224 46000221 */ cvt.d.s $f8, $f0 /* 036E28 80036228 462A4482 */ mul.d $f18, $f8, $f10 /* 036E2C 8003622C 462090A0 */ cvt.s.d $f2, $f18 @@ -133,10 +133,10 @@ glabel func_800361E0 /* 036FAC 800363AC 8E0D0078 */ lw $t5, 0x78($s0) /* 036FB0 800363B0 8FA3005C */ lw $v1, 0x5c($sp) /* 036FB4 800363B4 15A00047 */ bnez $t5, .L800364D4 -/* 036FB8 800363B8 3C01800E */ lui $at, %hi(D_800E6034) # $at, 0x800e +/* 036FB8 800363B8 3C01800E */ lui $at, %hi(D_800E6030 + 4) # $at, 0x800e /* 036FBC 800363BC C7B20070 */ lwc1 $f18, 0x70($sp) /* 036FC0 800363C0 C42B6030 */ lwc1 $f11, %lo(D_800E6030)($at) -/* 036FC4 800363C4 C42A6034 */ lwc1 $f10, %lo(D_800E6034)($at) +/* 036FC4 800363C4 C42A6034 */ lwc1 $f10, %lo(D_800E6030 + 4)($at) /* 036FC8 800363C8 46009221 */ cvt.d.s $f8, $f18 /* 036FCC 800363CC 462A403C */ c.lt.d $f8, $f10 /* 036FD0 800363D0 00000000 */ nop @@ -407,10 +407,10 @@ glabel func_800361E0 /* 0373A4 800367A4 00000000 */ nop /* 0373A8 800367A8 24030010 */ li $v1, 16 .L800367AC: -/* 0373AC 800367AC 3C01800E */ lui $at, %hi(D_800E603C) # $at, 0x800e +/* 0373AC 800367AC 3C01800E */ lui $at, %hi(D_800E6038 + 4) # $at, 0x800e /* 0373B0 800367B0 0003C903 */ sra $t9, $v1, 4 /* 0373B4 800367B4 C4216038 */ lwc1 $f1, %lo(D_800E6038)($at) -/* 0373B8 800367B8 C420603C */ lwc1 $f0, %lo(D_800E603C)($at) +/* 0373B8 800367B8 C420603C */ lwc1 $f0, %lo(D_800E6038 + 4)($at) /* 0373BC 800367BC 00994021 */ addu $t0, $a0, $t9 /* 0373C0 800367C0 A6080000 */ sh $t0, ($s0) /* 0373C4 800367C4 C7B20078 */ lwc1 $f18, 0x78($sp) @@ -451,10 +451,10 @@ glabel func_800361E0 /* 03744C 8003684C 10000099 */ b .L80036AB4 /* 037450 80036850 C7AA006C */ lwc1 $f10, 0x6c($sp) .L80036854: -/* 037454 80036854 3C01800E */ lui $at, %hi(D_800E6044) # $at, 0x800e +/* 037454 80036854 3C01800E */ lui $at, %hi(D_800E6040 + 4) # $at, 0x800e /* 037458 80036858 C7A40078 */ lwc1 $f4, 0x78($sp) /* 03745C 8003685C C4216040 */ lwc1 $f1, %lo(D_800E6040)($at) -/* 037460 80036860 C4206044 */ lwc1 $f0, %lo(D_800E6044)($at) +/* 037460 80036860 C4206044 */ lwc1 $f0, %lo(D_800E6040 + 4)($at) /* 037464 80036864 460024A1 */ cvt.d.s $f18, $f4 /* 037468 80036868 46209202 */ mul.d $f8, $f18, $f0 /* 03746C 8003686C 240A0001 */ li $t2, 1 diff --git a/asm/non_matchings/unknown_032760/func_800389B8.s b/asm/non_matchings/unknown_032760/func_800389B8.s index f33667dc..406d5c38 100644 --- a/asm/non_matchings/unknown_032760/func_800389B8.s +++ b/asm/non_matchings/unknown_032760/func_800389B8.s @@ -12,9 +12,9 @@ glabel func_800389B8 /* 0395CC 800389CC AFBF0014 */ sw $ra, 0x14($sp) /* 0395D0 800389D0 15C00007 */ bnez $t6, .L800389F0 /* 0395D4 800389D4 46001006 */ mov.s $f0, $f2 -/* 0395D8 800389D8 3C01800E */ lui $at, %hi(D_800E6054) # $at, 0x800e +/* 0395D8 800389D8 3C01800E */ lui $at, %hi(D_800E6050 + 4) # $at, 0x800e /* 0395DC 800389DC C4296050 */ lwc1 $f9, %lo(D_800E6050)($at) -/* 0395E0 800389E0 C4286054 */ lwc1 $f8, %lo(D_800E6054)($at) +/* 0395E0 800389E0 C4286054 */ lwc1 $f8, %lo(D_800E6050 + 4)($at) /* 0395E4 800389E4 460011A1 */ cvt.d.s $f6, $f2 /* 0395E8 800389E8 46283282 */ mul.d $f10, $f6, $f8 /* 0395EC 800389EC 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80038AD4.s b/asm/non_matchings/unknown_032760/func_80038AD4.s index 1e4562ef..c1bb434f 100644 --- a/asm/non_matchings/unknown_032760/func_80038AD4.s +++ b/asm/non_matchings/unknown_032760/func_80038AD4.s @@ -12,9 +12,9 @@ glabel func_80038AD4 /* 0396E8 80038AE8 AFBF0014 */ sw $ra, 0x14($sp) /* 0396EC 80038AEC 15C00007 */ bnez $t6, .L80038B0C /* 0396F0 80038AF0 46001006 */ mov.s $f0, $f2 -/* 0396F4 80038AF4 3C01800E */ lui $at, %hi(D_800E605C) # $at, 0x800e +/* 0396F4 80038AF4 3C01800E */ lui $at, %hi(D_800E6058 + 4) # $at, 0x800e /* 0396F8 80038AF8 C4296058 */ lwc1 $f9, %lo(D_800E6058)($at) -/* 0396FC 80038AFC C428605C */ lwc1 $f8, %lo(D_800E605C)($at) +/* 0396FC 80038AFC C428605C */ lwc1 $f8, %lo(D_800E6058 + 4)($at) /* 039700 80038B00 460011A1 */ cvt.d.s $f6, $f2 /* 039704 80038B04 46283282 */ mul.d $f10, $f6, $f8 /* 039708 80038B08 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 9e814259..c7a5784d 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -35,9 +35,9 @@ glabel func_80039330 /* 039F60 80039360 46001006 */ mov.s $f0, $f2 /* 039F64 80039364 15E00007 */ bnez $t7, .L80039384 /* 039F68 80039368 E7A40098 */ swc1 $f4, 0x98($sp) -/* 039F6C 8003936C 3C01800E */ lui $at, %hi(D_800E6064) # $at, 0x800e +/* 039F6C 8003936C 3C01800E */ lui $at, %hi(D_800E6060 + 4) # $at, 0x800e /* 039F70 80039370 C42B6060 */ lwc1 $f11, %lo(D_800E6060)($at) -/* 039F74 80039374 C42A6064 */ lwc1 $f10, %lo(D_800E6064)($at) +/* 039F74 80039374 C42A6064 */ lwc1 $f10, %lo(D_800E6060 + 4)($at) /* 039F78 80039378 46001221 */ cvt.d.s $f8, $f2 /* 039F7C 8003937C 462A4402 */ mul.d $f16, $f8, $f10 /* 039F80 80039380 46208020 */ cvt.s.d $f0, $f16 @@ -103,10 +103,10 @@ glabel func_80039330 /* 03A064 80039464 8E190078 */ lw $t9, 0x78($s0) /* 03A068 80039468 00003025 */ move $a2, $zero /* 03A06C 8003946C 1720003C */ bnez $t9, .L80039560 -/* 03A070 80039470 3C01800E */ lui $at, %hi(D_800E606C) # $at, 0x800e +/* 03A070 80039470 3C01800E */ lui $at, %hi(D_800E6068 + 4) # $at, 0x800e /* 03A074 80039474 C7A6009C */ lwc1 $f6, 0x9c($sp) /* 03A078 80039478 C4316068 */ lwc1 $f17, %lo(D_800E6068)($at) -/* 03A07C 8003947C C430606C */ lwc1 $f16, %lo(D_800E606C)($at) +/* 03A07C 8003947C C430606C */ lwc1 $f16, %lo(D_800E6068 + 4)($at) /* 03A080 80039480 46003221 */ cvt.d.s $f8, $f6 /* 03A084 80039484 4630403C */ c.lt.d $f8, $f16 /* 03A088 80039488 00000000 */ nop @@ -567,7 +567,7 @@ glabel L80039AE0 /* 03A708 80039B08 462022A0 */ cvt.s.d $f10, $f4 /* 03A70C 80039B0C E62A0004 */ swc1 $f10, 4($s1) /* 03A710 80039B10 C6280004 */ lwc1 $f8, 4($s1) -/* 03A714 80039B14 C4326144 */ lwc1 $f18, %lo(D_800E6144)($at) +/* 03A714 80039B14 C4326144 */ lwc1 $f18, %lo(D_800E6140 + 4)($at) /* 03A718 80039B18 C4336140 */ lwc1 $f19, %lo(D_800E6140)($at) /* 03A71C 80039B1C 460041A1 */ cvt.d.s $f6, $f8 /* 03A720 80039B20 4626903C */ c.lt.d $f18, $f6 @@ -1415,10 +1415,10 @@ glabel L8003A5AC /* 03B360 8003A760 000F2403 */ sra $a0, $t7, 0x10 /* 03B364 8003A764 C7AC0048 */ lwc1 $f12, 0x48($sp) /* 03B368 8003A768 C7B200A8 */ lwc1 $f18, 0xa8($sp) -/* 03B36C 8003A76C 3C01800E */ lui $at, %hi(D_800E6154) # $at, 0x800e +/* 03B36C 8003A76C 3C01800E */ lui $at, %hi(D_800E6150 + 4) # $at, 0x800e /* 03B370 8003A770 46126402 */ mul.s $f16, $f12, $f18 /* 03B374 8003A774 C4236150 */ lwc1 $f3, %lo(D_800E6150)($at) -/* 03B378 8003A778 C4226154 */ lwc1 $f2, %lo(D_800E6154)($at) +/* 03B378 8003A778 C4226154 */ lwc1 $f2, %lo(D_800E6150 + 4)($at) /* 03B37C 8003A77C 02002025 */ move $a0, $s0 /* 03B380 8003A780 460082A1 */ cvt.d.s $f10, $f16 /* 03B384 8003A784 46225202 */ mul.d $f8, $f10, $f2 @@ -1433,11 +1433,11 @@ glabel L8003A5AC /* 03B3A8 8003A7A8 0C00455C */ jal func_80011570 /* 03B3AC 8003A7AC 00000000 */ nop /* 03B3B0 8003A7B0 8FB900B4 */ lw $t9, 0xb4($sp) -/* 03B3B4 8003A7B4 3C01800E */ lui $at, %hi(D_800E615C) # $at, 0x800e +/* 03B3B4 8003A7B4 3C01800E */ lui $at, %hi(D_800E6158 + 4) # $at, 0x800e /* 03B3B8 8003A7B8 44994000 */ mtc1 $t9, $f8 /* 03B3BC 8003A7BC C4276158 */ lwc1 $f7, %lo(D_800E6158)($at) /* 03B3C0 8003A7C0 46804121 */ cvt.d.w $f4, $f8 -/* 03B3C4 8003A7C4 C426615C */ lwc1 $f6, %lo(D_800E615C)($at) +/* 03B3C4 8003A7C4 C426615C */ lwc1 $f6, %lo(D_800E6158 + 4)($at) /* 03B3C8 8003A7C8 C6300004 */ lwc1 $f16, 4($s1) /* 03B3CC 8003A7CC 46262482 */ mul.d $f18, $f4, $f6 /* 03B3D0 8003A7D0 460082A1 */ cvt.d.s $f10, $f16 diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/func_8003B4BC.s index 4ca2c046..24d3ca79 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/func_8003B4BC.s @@ -16,9 +16,9 @@ glabel func_8003B4BC /* 03C0E0 8003B4E0 AFA50054 */ sw $a1, 0x54($sp) /* 03C0E4 8003B4E4 15E00007 */ bnez $t7, .L8003B504 /* 03C0E8 8003B4E8 46000086 */ mov.s $f2, $f0 -/* 03C0EC 8003B4EC 3C01800E */ lui $at, %hi(D_800E6164) # $at, 0x800e +/* 03C0EC 8003B4EC 3C01800E */ lui $at, %hi(D_800E6160 + 4) # $at, 0x800e /* 03C0F0 8003B4F0 C4296160 */ lwc1 $f9, %lo(D_800E6160)($at) -/* 03C0F4 8003B4F4 C4286164 */ lwc1 $f8, %lo(D_800E6164)($at) +/* 03C0F4 8003B4F4 C4286164 */ lwc1 $f8, %lo(D_800E6160 + 4)($at) /* 03C0F8 8003B4F8 460001A1 */ cvt.d.s $f6, $f0 /* 03C0FC 8003B4FC 46283282 */ mul.d $f10, $f6, $f8 /* 03C100 8003B500 462050A0 */ cvt.s.d $f2, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003B988.s b/asm/non_matchings/unknown_032760/func_8003B988.s index 3fe49df6..855d9eac 100644 --- a/asm/non_matchings/unknown_032760/func_8003B988.s +++ b/asm/non_matchings/unknown_032760/func_8003B988.s @@ -19,9 +19,9 @@ glabel func_8003B988 /* 03C5B0 8003B9B0 46000086 */ mov.s $f2, $f0 /* 03C5B4 8003B9B4 17000007 */ bnez $t8, .L8003B9D4 /* 03C5B8 8003B9B8 AFAE0034 */ sw $t6, 0x34($sp) -/* 03C5BC 8003B9BC 3C01800E */ lui $at, %hi(D_800E616C) # $at, 0x800e +/* 03C5BC 8003B9BC 3C01800E */ lui $at, %hi(D_800E6168 + 4) # $at, 0x800e /* 03C5C0 8003B9C0 C4296168 */ lwc1 $f9, %lo(D_800E6168)($at) -/* 03C5C4 8003B9C4 C428616C */ lwc1 $f8, %lo(D_800E616C)($at) +/* 03C5C4 8003B9C4 C428616C */ lwc1 $f8, %lo(D_800E6168 + 4)($at) /* 03C5C8 8003B9C8 460001A1 */ cvt.d.s $f6, $f0 /* 03C5CC 8003B9CC 46283282 */ mul.d $f10, $f6, $f8 /* 03C5D0 8003B9D0 462050A0 */ cvt.s.d $f2, $f10 @@ -324,10 +324,10 @@ glabel func_8003B988 /* 03CA1C 8003BE1C 2401FFFF */ li $at, -1 /* 03CA20 8003BE20 14C30015 */ bne $a2, $v1, .L8003BE78 /* 03CA24 8003BE24 00000000 */ nop -/* 03CA28 8003BE28 3C01800E */ lui $at, %hi(D_800E6174) # $at, 0x800e +/* 03CA28 8003BE28 3C01800E */ lui $at, %hi(D_800E6170 + 4) # $at, 0x800e /* 03CA2C 8003BE2C C5120000 */ lwc1 $f18, ($t0) /* 03CA30 8003BE30 C4276170 */ lwc1 $f7, %lo(D_800E6170)($at) -/* 03CA34 8003BE34 C4266174 */ lwc1 $f6, %lo(D_800E6174)($at) +/* 03CA34 8003BE34 C4266174 */ lwc1 $f6, %lo(D_800E6170 + 4)($at) /* 03CA38 8003BE38 C6100010 */ lwc1 $f16, 0x10($s0) /* 03CA3C 8003BE3C 46009121 */ cvt.d.s $f4, $f18 /* 03CA40 8003BE40 46262200 */ add.d $f8, $f4, $f6 diff --git a/asm/non_matchings/unknown_032760/func_8003CA68.s b/asm/non_matchings/unknown_032760/func_8003CA68.s index 7204ae6d..778100e7 100644 --- a/asm/non_matchings/unknown_032760/func_8003CA68.s +++ b/asm/non_matchings/unknown_032760/func_8003CA68.s @@ -17,9 +17,9 @@ glabel func_8003CA68 /* 03D690 8003CA90 00808025 */ move $s0, $a0 /* 03D694 8003CA94 15E00007 */ bnez $t7, .L8003CAB4 /* 03D698 8003CA98 46000306 */ mov.s $f12, $f0 -/* 03D69C 8003CA9C 3C01800E */ lui $at, %hi(D_800E617C) # $at, 0x800e +/* 03D69C 8003CA9C 3C01800E */ lui $at, %hi(D_800E6178 + 4) # $at, 0x800e /* 03D6A0 8003CAA0 C4296178 */ lwc1 $f9, %lo(D_800E6178)($at) -/* 03D6A4 8003CAA4 C428617C */ lwc1 $f8, %lo(D_800E617C)($at) +/* 03D6A4 8003CAA4 C428617C */ lwc1 $f8, %lo(D_800E6178 + 4)($at) /* 03D6A8 8003CAA8 460001A1 */ cvt.d.s $f6, $f0 /* 03D6AC 8003CAAC 46283282 */ mul.d $f10, $f6, $f8 /* 03D6B0 8003CAB0 46205320 */ cvt.s.d $f12, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003D2B8.s b/asm/non_matchings/unknown_032760/func_8003D2B8.s index cbc7533b..815b39aa 100644 --- a/asm/non_matchings/unknown_032760/func_8003D2B8.s +++ b/asm/non_matchings/unknown_032760/func_8003D2B8.s @@ -15,9 +15,9 @@ glabel func_8003D2B8 /* 03DED8 8003D2D8 AFA5002C */ sw $a1, 0x2c($sp) /* 03DEDC 8003D2DC 15E00007 */ bnez $t7, .L8003D2FC /* 03DEE0 8003D2E0 46001006 */ mov.s $f0, $f2 -/* 03DEE4 8003D2E4 3C01800E */ lui $at, %hi(D_800E618C) # $at, 0x800e +/* 03DEE4 8003D2E4 3C01800E */ lui $at, %hi(D_800E6188 + 4) # $at, 0x800e /* 03DEE8 8003D2E8 C4296188 */ lwc1 $f9, %lo(D_800E6188)($at) -/* 03DEEC 8003D2EC C428618C */ lwc1 $f8, %lo(D_800E618C)($at) +/* 03DEEC 8003D2EC C428618C */ lwc1 $f8, %lo(D_800E6188 + 4)($at) /* 03DEF0 8003D2F0 460011A1 */ cvt.d.s $f6, $f2 /* 03DEF4 8003D2F4 46283282 */ mul.d $f10, $f6, $f8 /* 03DEF8 8003D2F8 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/func_8003D5A0.s index 108cf425..d9adafde 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/func_8003D5A0.s @@ -19,9 +19,9 @@ glabel func_8003D5A0 /* 03E1C0 8003D5C0 AFA50074 */ sw $a1, 0x74($sp) /* 03E1C4 8003D5C4 15E00007 */ bnez $t7, .L8003D5E4 /* 03E1C8 8003D5C8 46001006 */ mov.s $f0, $f2 -/* 03E1CC 8003D5CC 3C01800E */ lui $at, %hi(D_800E6194) # $at, 0x800e +/* 03E1CC 8003D5CC 3C01800E */ lui $at, %hi(D_800E6190 + 4) # $at, 0x800e /* 03E1D0 8003D5D0 C4296190 */ lwc1 $f9, %lo(D_800E6190)($at) -/* 03E1D4 8003D5D4 C4286194 */ lwc1 $f8, %lo(D_800E6194)($at) +/* 03E1D4 8003D5D4 C4286194 */ lwc1 $f8, %lo(D_800E6190 + 4)($at) /* 03E1D8 8003D5D8 460011A1 */ cvt.d.s $f6, $f2 /* 03E1DC 8003D5DC 46283282 */ mul.d $f10, $f6, $f8 /* 03E1E0 8003D5E0 46205020 */ cvt.s.d $f0, $f10 @@ -154,9 +154,9 @@ glabel func_8003D5A0 /* 03E3CC 8003D7CC 818E0009 */ lb $t6, 9($t4) /* 03E3D0 8003D7D0 00000000 */ nop /* 03E3D4 8003D7D4 11C10016 */ beq $t6, $at, .L8003D830 -/* 03E3D8 8003D7D8 3C01800E */ lui $at, %hi(D_800E619C) # $at, 0x800e +/* 03E3D8 8003D7D8 3C01800E */ lui $at, %hi(D_800E6198 + 4) # $at, 0x800e /* 03E3DC 8003D7DC C4216198 */ lwc1 $f1, %lo(D_800E6198)($at) -/* 03E3E0 8003D7E0 C420619C */ lwc1 $f0, %lo(D_800E619C)($at) +/* 03E3E0 8003D7E0 C420619C */ lwc1 $f0, %lo(D_800E6198 + 4)($at) /* 03E3E4 8003D7E4 C60A0020 */ lwc1 $f10, 0x20($s0) /* 03E3E8 8003D7E8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 03E3EC 8003D7EC 44819800 */ mtc1 $at, $f19 diff --git a/asm/non_matchings/unknown_032760/func_8003E140.s b/asm/non_matchings/unknown_032760/func_8003E140.s index 043f429c..0d1d01ac 100644 --- a/asm/non_matchings/unknown_032760/func_8003E140.s +++ b/asm/non_matchings/unknown_032760/func_8003E140.s @@ -34,7 +34,7 @@ glabel func_8003E140 /* 03ED98 8003E198 462054A0 */ cvt.s.d $f18, $f10 /* 03ED9C 8003E19C E4920008 */ swc1 $f18, 8($a0) /* 03EDA0 8003E1A0 C4900008 */ lwc1 $f16, 8($a0) -/* 03EDA4 8003E1A4 C42661AC */ lwc1 $f6, %lo(D_800E61AC)($at) +/* 03EDA4 8003E1A4 C42661AC */ lwc1 $f6, %lo(D_800E61A8 + 4)($at) /* 03EDA8 8003E1A8 C42761A8 */ lwc1 $f7, %lo(D_800E61A8)($at) /* 03EDAC 8003E1AC 46008021 */ cvt.d.s $f0, $f16 /* 03EDB0 8003E1B0 4626003C */ c.lt.d $f0, $f6 @@ -48,9 +48,9 @@ glabel func_8003E140 /* 03EDD0 8003E1D0 00000000 */ nop /* 03EDD4 8003E1D4 46002021 */ cvt.d.s $f0, $f4 .L8003E1D8: -/* 03EDD8 8003E1D8 3C01800E */ lui $at, %hi(D_800E61BC) # $at, 0x800e +/* 03EDD8 8003E1D8 3C01800E */ lui $at, %hi(D_800E61B8 + 4) # $at, 0x800e /* 03EDDC 8003E1DC C42B61B8 */ lwc1 $f11, %lo(D_800E61B8)($at) -/* 03EDE0 8003E1E0 C42A61BC */ lwc1 $f10, %lo(D_800E61BC)($at) +/* 03EDE0 8003E1E0 C42A61BC */ lwc1 $f10, %lo(D_800E61B8 + 4)($at) /* 03EDE4 8003E1E4 02002025 */ move $a0, $s0 /* 03EDE8 8003E1E8 462A003C */ c.lt.d $f0, $f10 /* 03EDEC 8003E1EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index 87bd5787..ca434080 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -53,11 +53,11 @@ glabel func_8003E694 /* 03F34C 8003E74C 448B8000 */ mtc1 $t3, $f16 /* 03F350 8003E750 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 03F354 8003E754 46808020 */ cvt.s.w $f0, $f16 -/* 03F358 8003E758 3C01800E */ lui $at, %hi(D_800E61F4) # $at, 0x800e +/* 03F358 8003E758 3C01800E */ lui $at, %hi(D_800E61F0 + 4) # $at, 0x800e /* 03F35C 8003E75C 15800006 */ bnez $t4, .L8003E778 /* 03F360 8003E760 46000086 */ mov.s $f2, $f0 /* 03F364 8003E764 C42561F0 */ lwc1 $f5, %lo(D_800E61F0)($at) -/* 03F368 8003E768 C42461F4 */ lwc1 $f4, %lo(D_800E61F4)($at) +/* 03F368 8003E768 C42461F4 */ lwc1 $f4, %lo(D_800E61F0 + 4)($at) /* 03F36C 8003E76C 460004A1 */ cvt.d.s $f18, $f0 /* 03F370 8003E770 46249182 */ mul.d $f6, $f18, $f4 /* 03F374 8003E774 462030A0 */ cvt.s.d $f2, $f6 diff --git a/asm/non_matchings/unknown_032760/func_8003EDD8.s b/asm/non_matchings/unknown_032760/func_8003EDD8.s index 08e1871b..70c5ced4 100644 --- a/asm/non_matchings/unknown_032760/func_8003EDD8.s +++ b/asm/non_matchings/unknown_032760/func_8003EDD8.s @@ -14,10 +14,10 @@ glabel func_8003EDD8 /* 03F9F4 8003EDF4 104000A1 */ beqz $v0, .L8003F07C /* 03F9F8 8003EDF8 00C08825 */ move $s1, $a2 /* 03F9FC 8003EDFC 8C430064 */ lw $v1, 0x64($v0) -/* 03FA00 8003EE00 3C01800E */ lui $at, %hi(D_800E61FC) # $at, 0x800e +/* 03FA00 8003EE00 3C01800E */ lui $at, %hi(D_800E61F8 + 4) # $at, 0x800e /* 03FA04 8003EE04 846E01BA */ lh $t6, 0x1ba($v1) /* 03FA08 8003EE08 C42D61F8 */ lwc1 $f13, %lo(D_800E61F8)($at) -/* 03FA0C 8003EE0C C42C61FC */ lwc1 $f12, %lo(D_800E61FC)($at) +/* 03FA0C 8003EE0C C42C61FC */ lwc1 $f12, %lo(D_800E61F8 + 4)($at) /* 03FA10 8003EE10 000E7843 */ sra $t7, $t6, 1 /* 03FA14 8003EE14 A4CF0014 */ sh $t7, 0x14($a2) /* 03FA18 8003EE18 847801BC */ lh $t8, 0x1bc($v1) diff --git a/asm/non_matchings/unknown_032760/func_8003F2E8.s b/asm/non_matchings/unknown_032760/func_8003F2E8.s index a54a1930..44bda8d0 100644 --- a/asm/non_matchings/unknown_032760/func_8003F2E8.s +++ b/asm/non_matchings/unknown_032760/func_8003F2E8.s @@ -28,9 +28,9 @@ glabel func_8003F2E8 /* 03FF1C 8003F31C 46001006 */ mov.s $f0, $f2 /* 03FF20 8003F320 15600007 */ bnez $t3, .L8003F340 /* 03FF24 8003F324 AFB90064 */ sw $t9, 0x64($sp) -/* 03FF28 8003F328 3C01800E */ lui $at, %hi(D_800E6204) # $at, 0x800e +/* 03FF28 8003F328 3C01800E */ lui $at, %hi(D_800E6200 + 4) # $at, 0x800e /* 03FF2C 8003F32C C4296200 */ lwc1 $f9, %lo(D_800E6200)($at) -/* 03FF30 8003F330 C4286204 */ lwc1 $f8, %lo(D_800E6204)($at) +/* 03FF30 8003F330 C4286204 */ lwc1 $f8, %lo(D_800E6200 + 4)($at) /* 03FF34 8003F334 460011A1 */ cvt.d.s $f6, $f2 /* 03FF38 8003F338 46283282 */ mul.d $f10, $f6, $f8 /* 03FF3C 8003F33C 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index ef6064ee..e1e5cb25 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -29,9 +29,9 @@ glabel func_800422F0 /* 042F20 80042320 E7B4001C */ swc1 $f20, 0x1c($sp) /* 042F24 80042324 15C00007 */ bnez $t6, .L80042344 /* 042F28 80042328 46000086 */ mov.s $f2, $f0 -/* 042F2C 8004232C 3C01800E */ lui $at, %hi(D_800E6254) # $at, 0x800e +/* 042F2C 8004232C 3C01800E */ lui $at, %hi(D_800E6250 + 4) # $at, 0x800e /* 042F30 80042330 C4296250 */ lwc1 $f9, %lo(D_800E6250)($at) -/* 042F34 80042334 C4286254 */ lwc1 $f8, %lo(D_800E6254)($at) +/* 042F34 80042334 C4286254 */ lwc1 $f8, %lo(D_800E6250 + 4)($at) /* 042F38 80042338 460001A1 */ cvt.d.s $f6, $f0 /* 042F3C 8004233C 46283282 */ mul.d $f10, $f6, $f8 /* 042F40 80042340 462050A0 */ cvt.s.d $f2, $f10 diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index 633d653d..62b5b94d 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -886,10 +886,10 @@ glabel func_80042D20 /* 0445A0 800439A0 15E1000F */ bne $t7, $at, .L800439E0 /* 0445A4 800439A4 00000000 */ nop /* 0445A8 800439A8 1060000D */ beqz $v1, .L800439E0 -/* 0445AC 800439AC 3C01800E */ lui $at, %hi(D_800E62AC) # $at, 0x800e +/* 0445AC 800439AC 3C01800E */ lui $at, %hi(D_800E62A8 + 4) # $at, 0x800e /* 0445B0 800439B0 C7B20090 */ lwc1 $f18, 0x90($sp) /* 0445B4 800439B4 C42B62A8 */ lwc1 $f11, %lo(D_800E62A8)($at) -/* 0445B8 800439B8 C42A62AC */ lwc1 $f10, %lo(D_800E62AC)($at) +/* 0445B8 800439B8 C42A62AC */ lwc1 $f10, %lo(D_800E62A8 + 4)($at) /* 0445BC 800439BC 460091A1 */ cvt.d.s $f6, $f18 /* 0445C0 800439C0 462A303C */ c.lt.d $f6, $f10 /* 0445C4 800439C4 240E0001 */ li $t6, 1 @@ -904,36 +904,36 @@ glabel func_80042D20 /* 0445E4 800439E4 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) /* 0445E8 800439E8 8FB90054 */ lw $t9, 0x54($sp) /* 0445EC 800439EC 15E00050 */ bnez $t7, .L80043B30 -/* 0445F0 800439F0 3C01800E */ lui $at, %hi(D_800E62B4) # $at, 0x800e +/* 0445F0 800439F0 3C01800E */ lui $at, %hi(D_800E62B0 + 4) # $at, 0x800e /* 0445F4 800439F4 C72E0004 */ lwc1 $f14, 4($t9) /* 0445F8 800439F8 C43162B0 */ lwc1 $f17, %lo(D_800E62B0)($at) -/* 0445FC 800439FC C43062B4 */ lwc1 $f16, %lo(D_800E62B4)($at) +/* 0445FC 800439FC C43062B4 */ lwc1 $f16, %lo(D_800E62B0 + 4)($at) /* 044600 80043A00 46007221 */ cvt.d.s $f8, $f14 /* 044604 80043A04 46304102 */ mul.d $f4, $f8, $f16 -/* 044608 80043A08 3C01800E */ lui $at, %hi(D_800E62BC) # $at, 0x800e +/* 044608 80043A08 3C01800E */ lui $at, %hi(D_800E62B8 + 4) # $at, 0x800e /* 04460C 80043A0C C43362B8 */ lwc1 $f19, %lo(D_800E62B8)($at) -/* 044610 80043A10 C43262BC */ lwc1 $f18, %lo(D_800E62BC)($at) -/* 044614 80043A14 3C01800E */ lui $at, %hi(D_800E62C4) # $at, 0x800e +/* 044610 80043A10 C43262BC */ lwc1 $f18, %lo(D_800E62B8 + 4)($at) +/* 044614 80043A14 3C01800E */ lui $at, %hi(D_800E62C0 + 4) # $at, 0x800e /* 044618 80043A18 C42B62C0 */ lwc1 $f11, %lo(D_800E62C0)($at) -/* 04461C 80043A1C C42A62C4 */ lwc1 $f10, %lo(D_800E62C4)($at) +/* 04461C 80043A1C C42A62C4 */ lwc1 $f10, %lo(D_800E62C0 + 4)($at) /* 044620 80043A20 46322180 */ add.d $f6, $f4, $f18 /* 044624 80043A24 AFA9005C */ sw $t1, 0x5c($sp) /* 044628 80043A28 462A3203 */ div.d $f8, $f6, $f10 /* 04462C 80043A2C 0C0326B4 */ jal sqrtf /* 044630 80043A30 46204320 */ cvt.s.d $f12, $f8 /* 044634 80043A34 8FB80054 */ lw $t8, 0x54($sp) -/* 044638 80043A38 3C01800E */ lui $at, %hi(D_800E62CC) # $at, 0x800e +/* 044638 80043A38 3C01800E */ lui $at, %hi(D_800E62C8 + 4) # $at, 0x800e /* 04463C 80043A3C C7020000 */ lwc1 $f2, ($t8) /* 044640 80043A40 C42562C8 */ lwc1 $f5, %lo(D_800E62C8)($at) -/* 044644 80043A44 C42462CC */ lwc1 $f4, %lo(D_800E62CC)($at) +/* 044644 80043A44 C42462CC */ lwc1 $f4, %lo(D_800E62C8 + 4)($at) /* 044648 80043A48 46001421 */ cvt.d.s $f16, $f2 /* 04464C 80043A4C 46248482 */ mul.d $f18, $f16, $f4 -/* 044650 80043A50 3C01800E */ lui $at, %hi(D_800E62D4) # $at, 0x800e +/* 044650 80043A50 3C01800E */ lui $at, %hi(D_800E62D0 + 4) # $at, 0x800e /* 044654 80043A54 C42762D0 */ lwc1 $f7, %lo(D_800E62D0)($at) -/* 044658 80043A58 C42662D4 */ lwc1 $f6, %lo(D_800E62D4)($at) -/* 04465C 80043A5C 3C01800E */ lui $at, %hi(D_800E62DC) # $at, 0x800e +/* 044658 80043A58 C42662D4 */ lwc1 $f6, %lo(D_800E62D0 + 4)($at) +/* 04465C 80043A5C 3C01800E */ lui $at, %hi(D_800E62D8 + 4) # $at, 0x800e /* 044660 80043A60 C42962D8 */ lwc1 $f9, %lo(D_800E62D8)($at) -/* 044664 80043A64 C42862DC */ lwc1 $f8, %lo(D_800E62DC)($at) +/* 044664 80043A64 C42862DC */ lwc1 $f8, %lo(D_800E62D8 + 4)($at) /* 044668 80043A68 46269280 */ add.d $f10, $f18, $f6 /* 04466C 80043A6C E7A00080 */ swc1 $f0, 0x80($sp) /* 044670 80043A70 46285403 */ div.d $f16, $f10, $f8 @@ -958,10 +958,10 @@ glabel func_80042D20 /* 0446BC 80043ABC 1420000B */ bnez $at, .L80043AEC /* 0446C0 80043AC0 46006086 */ mov.s $f2, $f12 /* 0446C4 80043AC4 44992000 */ mtc1 $t9, $f4 -/* 0446C8 80043AC8 3C01800E */ lui $at, %hi(D_800E62E4) # $at, 0x800e +/* 0446C8 80043AC8 3C01800E */ lui $at, %hi(D_800E62E0 + 4) # $at, 0x800e /* 0446CC 80043ACC 468021A0 */ cvt.s.w $f6, $f4 /* 0446D0 80043AD0 C42B62E0 */ lwc1 $f11, %lo(D_800E62E0)($at) -/* 0446D4 80043AD4 C42A62E4 */ lwc1 $f10, %lo(D_800E62E4)($at) +/* 0446D4 80043AD4 C42A62E4 */ lwc1 $f10, %lo(D_800E62E0 + 4)($at) /* 0446D8 80043AD8 46003221 */ cvt.d.s $f8, $f6 /* 0446DC 80043ADC 462A4402 */ mul.d $f16, $f8, $f10 /* 0446E0 80043AE0 460064A1 */ cvt.d.s $f18, $f12 @@ -969,17 +969,17 @@ glabel func_80042D20 /* 0446E8 80043AE8 462020A0 */ cvt.s.d $f2, $f4 .L80043AEC: /* 0446EC 80043AEC 46021182 */ mul.s $f6, $f2, $f2 -/* 0446F0 80043AF0 3C01800E */ lui $at, %hi(D_800E62EC) # $at, 0x800e +/* 0446F0 80043AF0 3C01800E */ lui $at, %hi(D_800E62E8 + 4) # $at, 0x800e /* 0446F4 80043AF4 C42B62E8 */ lwc1 $f11, %lo(D_800E62E8)($at) -/* 0446F8 80043AF8 C42A62EC */ lwc1 $f10, %lo(D_800E62EC)($at) +/* 0446F8 80043AF8 C42A62EC */ lwc1 $f10, %lo(D_800E62E8 + 4)($at) /* 0446FC 80043AFC 46003221 */ cvt.d.s $f8, $f6 /* 044700 80043B00 462A4482 */ mul.d $f18, $f8, $f10 -/* 044704 80043B04 3C01800E */ lui $at, %hi(D_800E62F4) # $at, 0x800e +/* 044704 80043B04 3C01800E */ lui $at, %hi(D_800E62F0 + 4) # $at, 0x800e /* 044708 80043B08 C43162F0 */ lwc1 $f17, %lo(D_800E62F0)($at) -/* 04470C 80043B0C C43062F4 */ lwc1 $f16, %lo(D_800E62F4)($at) -/* 044710 80043B10 3C01800E */ lui $at, %hi(D_800E62FC) # $at, 0x800e +/* 04470C 80043B0C C43062F4 */ lwc1 $f16, %lo(D_800E62F0 + 4)($at) +/* 044710 80043B10 3C01800E */ lui $at, %hi(D_800E62F8 + 4) # $at, 0x800e /* 044714 80043B14 C42762F8 */ lwc1 $f7, %lo(D_800E62F8)($at) -/* 044718 80043B18 C42662FC */ lwc1 $f6, %lo(D_800E62FC)($at) +/* 044718 80043B18 C42662FC */ lwc1 $f6, %lo(D_800E62F8 + 4)($at) /* 04471C 80043B1C 46309101 */ sub.d $f4, $f18, $f16 /* 044720 80043B20 00000000 */ nop /* 044724 80043B24 46262203 */ div.d $f8, $f4, $f6 @@ -992,10 +992,10 @@ glabel func_80042D20 /* 04473C 80043B3C 821801CA */ lb $t8, 0x1ca($s0) /* 044740 80043B40 24010003 */ li $at, 3 /* 044744 80043B44 1701000A */ bne $t8, $at, .L80043B70 -/* 044748 80043B48 3C01800E */ lui $at, %hi(D_800E6304) # $at, 0x800e +/* 044748 80043B48 3C01800E */ lui $at, %hi(D_800E6300 + 4) # $at, 0x800e /* 04474C 80043B4C C7B20094 */ lwc1 $f18, 0x94($sp) /* 044750 80043B50 C42B6300 */ lwc1 $f11, %lo(D_800E6300)($at) -/* 044754 80043B54 C42A6304 */ lwc1 $f10, %lo(D_800E6304)($at) +/* 044754 80043B54 C42A6304 */ lwc1 $f10, %lo(D_800E6300 + 4)($at) /* 044758 80043B58 46009421 */ cvt.d.s $f16, $f18 /* 04475C 80043B5C 4630503C */ c.lt.d $f10, $f16 /* 044760 80043B60 240E0002 */ li $t6, 2 @@ -1120,10 +1120,10 @@ glabel func_80042D20 /* 044914 80043D14 24010001 */ li $at, 1 /* 044918 80043D18 17210033 */ bne $t9, $at, .L80043DE8 /* 04491C 80043D1C A4600000 */ sh $zero, ($v1) -/* 044920 80043D20 3C01800E */ lui $at, %hi(D_800E630C) # $at, 0x800e +/* 044920 80043D20 3C01800E */ lui $at, %hi(D_800E6308 + 4) # $at, 0x800e /* 044924 80043D24 C7B00094 */ lwc1 $f16, 0x94($sp) /* 044928 80043D28 C42B6308 */ lwc1 $f11, %lo(D_800E6308)($at) -/* 04492C 80043D2C C42A630C */ lwc1 $f10, %lo(D_800E630C)($at) +/* 04492C 80043D2C C42A630C */ lwc1 $f10, %lo(D_800E6308 + 4)($at) /* 044930 80043D30 46008121 */ cvt.d.s $f4, $f16 /* 044934 80043D34 4624503C */ c.lt.d $f10, $f4 /* 044938 80043D38 3C014000 */ li $at, 0x40000000 # 2.000000 @@ -1188,10 +1188,10 @@ glabel func_80042D20 /* 044A10 80043E10 AC590000 */ sw $t9, ($v0) /* 044A14 80043E14 372E4000 */ ori $t6, $t9, 0x4000 /* 044A18 80043E18 AC4E0000 */ sw $t6, ($v0) -/* 044A1C 80043E1C 3C01800E */ lui $at, %hi(D_800E6314) # $at, 0x800e +/* 044A1C 80043E1C 3C01800E */ lui $at, %hi(D_800E6310 + 4) # $at, 0x800e /* 044A20 80043E20 C610002C */ lwc1 $f16, 0x2c($s0) /* 044A24 80043E24 C4336310 */ lwc1 $f19, %lo(D_800E6310)($at) -/* 044A28 80043E28 C4326314 */ lwc1 $f18, %lo(D_800E6314)($at) +/* 044A28 80043E28 C4326314 */ lwc1 $f18, %lo(D_800E6310 + 4)($at) /* 044A2C 80043E2C 460082A1 */ cvt.d.s $f10, $f16 /* 044A30 80043E30 462A903C */ c.lt.d $f18, $f10 /* 044A34 80043E34 35D98000 */ ori $t9, $t6, 0x8000 diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 92af9e13..4f3d2469 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -614,10 +614,10 @@ glabel L80044ADC .L80044D20: /* 045920 80044D20 AC2DD528 */ sw $t5, %lo(D_8011D528)($at) .L80044D24: -/* 045924 80044D24 3C01800E */ lui $at, %hi(D_800E6354) # $at, 0x800e +/* 045924 80044D24 3C01800E */ lui $at, %hi(D_800E6350 + 4) # $at, 0x800e /* 045928 80044D28 C7B0005C */ lwc1 $f16, 0x5c($sp) /* 04592C 80044D2C C4336350 */ lwc1 $f19, %lo(D_800E6350)($at) -/* 045930 80044D30 C4326354 */ lwc1 $f18, %lo(D_800E6354)($at) +/* 045930 80044D30 C4326354 */ lwc1 $f18, %lo(D_800E6350 + 4)($at) /* 045934 80044D34 46008121 */ cvt.d.s $f4, $f16 /* 045938 80044D38 4632203C */ c.lt.d $f4, $f18 /* 04593C 80044D3C 8FAB006C */ lw $t3, 0x6c($sp) diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index d765453b..74e69563 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -647,13 +647,13 @@ glabel L80045B58 /* 04676C 80045B6C A2A001CD */ sb $zero, 0x1cd($s5) glabel L80045B70 /* 046770 80045B70 82A90173 */ lb $t1, 0x173($s5) -/* 046774 80045B74 3C01800E */ lui $at, %hi(D_800E63A4) # $at, 0x800e +/* 046774 80045B74 3C01800E */ lui $at, %hi(D_800E63A0 + 4) # $at, 0x800e /* 046778 80045B78 15200002 */ bnez $t1, .L80045B84 /* 04677C 80045B7C 3C028012 */ lui $v0, %hi(D_8011D530) # $v0, 0x8012 /* 046780 80045B80 A2A001CD */ sb $zero, 0x1cd($s5) .L80045B84: /* 046784 80045B84 C42963A0 */ lwc1 $f9, %lo(D_800E63A0)($at) -/* 046788 80045B88 C42863A4 */ lwc1 $f8, %lo(D_800E63A4)($at) +/* 046788 80045B88 C42863A4 */ lwc1 $f8, %lo(D_800E63A0 + 4)($at) /* 04678C 80045B8C 460011A1 */ cvt.d.s $f6, $f2 /* 046790 80045B90 4628303C */ c.lt.d $f6, $f8 /* 046794 80045B94 2442D530 */ addiu $v0, %lo(D_8011D530) # addiu $v0, $v0, -0x2ad0 diff --git a/asm/non_matchings/unknown_043920/func_80046524.s b/asm/non_matchings/unknown_043920/func_80046524.s index 4128d38c..54c14747 100644 --- a/asm/non_matchings/unknown_043920/func_80046524.s +++ b/asm/non_matchings/unknown_043920/func_80046524.s @@ -66,10 +66,10 @@ glabel func_80046524 /* 047144 80046544 AFA5012C */ sw $a1, 0x12c($sp) /* 047148 80046548 10400009 */ beqz $v0, .L80046570 /* 04714C 8004654C 3C0A8012 */ lui $t2, %hi(D_8011D586) # $t2, 0x8012 -/* 047150 80046550 3C01800E */ lui $at, %hi(D_800E63AC) # $at, 0x800e +/* 047150 80046550 3C01800E */ lui $at, %hi(D_800E63A8 + 4) # $at, 0x800e /* 047154 80046554 C7A4012C */ lwc1 $f4, 0x12c($sp) /* 047158 80046558 C42963A8 */ lwc1 $f9, %lo(D_800E63A8)($at) -/* 04715C 8004655C C42863AC */ lwc1 $f8, %lo(D_800E63AC)($at) +/* 04715C 8004655C C42863AC */ lwc1 $f8, %lo(D_800E63A8 + 4)($at) /* 047160 80046560 460021A1 */ cvt.d.s $f6, $f4 /* 047164 80046564 46283282 */ mul.d $f10, $f6, $f8 /* 047168 80046568 46205120 */ cvt.s.d $f4, $f10 @@ -210,9 +210,9 @@ glabel func_80046524 /* 04735C 8004675C 1140001E */ beqz $t2, .L800467D8 /* 047360 80046760 00000000 */ nop /* 047364 80046764 C7A4012C */ lwc1 $f4, 0x12c($sp) -/* 047368 80046768 3C01800E */ lui $at, %hi(D_800E63B4) # $at, 0x800e +/* 047368 80046768 3C01800E */ lui $at, %hi(D_800E63B0 + 4) # $at, 0x800e /* 04736C 8004676C C42B63B0 */ lwc1 $f11, %lo(D_800E63B0)($at) -/* 047370 80046770 C42A63B4 */ lwc1 $f10, %lo(D_800E63B4)($at) +/* 047370 80046770 C42A63B4 */ lwc1 $f10, %lo(D_800E63B0 + 4)($at) /* 047374 80046774 46002221 */ cvt.d.s $f8, $f4 /* 047378 80046778 462A4182 */ mul.d $f6, $f8, $f10 /* 04737C 8004677C E7A80054 */ swc1 $f8, 0x54($sp) @@ -240,9 +240,9 @@ glabel func_80046524 /* 0473D4 800467D4 C60E002C */ lwc1 $f14, 0x2c($s0) .L800467D8: /* 0473D8 800467D8 C7A4012C */ lwc1 $f4, 0x12c($sp) -/* 0473DC 800467DC 3C01800E */ lui $at, %hi(D_800E63BC) # $at, 0x800e +/* 0473DC 800467DC 3C01800E */ lui $at, %hi(D_800E63B8 + 4) # $at, 0x800e /* 0473E0 800467E0 C42763B8 */ lwc1 $f7, %lo(D_800E63B8)($at) -/* 0473E4 800467E4 C42663BC */ lwc1 $f6, %lo(D_800E63BC)($at) +/* 0473E4 800467E4 C42663BC */ lwc1 $f6, %lo(D_800E63B8 + 4)($at) /* 0473E8 800467E8 46002221 */ cvt.d.s $f8, $f4 /* 0473EC 800467EC 46264282 */ mul.d $f10, $f8, $f6 /* 0473F0 800467F0 E7A80054 */ swc1 $f8, 0x54($sp) @@ -305,9 +305,9 @@ glabel func_80046524 /* 0474C4 800468C4 8C84D528 */ lw $a0, %lo(D_8011D528)($a0) /* 0474C8 800468C8 45000008 */ bc1f .L800468EC /* 0474CC 800468CC 308E4000 */ andi $t6, $a0, 0x4000 -/* 0474D0 800468D0 3C01800E */ lui $at, %hi(D_800E63C4) # $at, 0x800e +/* 0474D0 800468D0 3C01800E */ lui $at, %hi(D_800E63C0 + 4) # $at, 0x800e /* 0474D4 800468D4 C42763C0 */ lwc1 $f7, %lo(D_800E63C0)($at) -/* 0474D8 800468D8 C42663C4 */ lwc1 $f6, %lo(D_800E63C4)($at) +/* 0474D8 800468D8 C42663C4 */ lwc1 $f6, %lo(D_800E63C0 + 4)($at) /* 0474DC 800468DC 460062A1 */ cvt.d.s $f10, $f12 /* 0474E0 800468E0 46265102 */ mul.d $f4, $f10, $f6 /* 0474E4 800468E4 46202220 */ cvt.s.d $f8, $f4 @@ -326,9 +326,9 @@ glabel func_80046524 /* 047514 80046914 00000000 */ nop /* 047518 80046918 45000024 */ bc1f .L800469AC .L8004691C: -/* 04751C 8004691C 3C01800E */ lui $at, %hi(D_800E63CC) # $at, 0x800e +/* 04751C 8004691C 3C01800E */ lui $at, %hi(D_800E63C8 + 4) # $at, 0x800e /* 047520 80046920 C42563C8 */ lwc1 $f5, %lo(D_800E63C8)($at) -/* 047524 80046924 C42463CC */ lwc1 $f4, %lo(D_800E63CC)($at) +/* 047524 80046924 C42463CC */ lwc1 $f4, %lo(D_800E63C8 + 4)($at) /* 047528 80046928 C7A60054 */ lwc1 $f6, 0x54($sp) /* 04752C 8004692C C60A00B8 */ lwc1 $f10, 0xb8($s0) /* 047530 80046930 46243202 */ mul.d $f8, $f6, $f4 @@ -338,7 +338,7 @@ glabel func_80046524 /* 047540 80046940 462022A0 */ cvt.s.d $f10, $f4 /* 047544 80046944 E60A00B8 */ swc1 $f10, 0xb8($s0) /* 047548 80046948 C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 04754C 8004694C C42663D4 */ lwc1 $f6, %lo(D_800E63D4)($at) +/* 04754C 8004694C C42663D4 */ lwc1 $f6, %lo(D_800E63D0 + 4)($at) /* 047550 80046950 C42763D0 */ lwc1 $f7, %lo(D_800E63D0)($at) /* 047554 80046954 46004121 */ cvt.d.s $f4, $f8 /* 047558 80046958 4624303C */ c.lt.d $f6, $f4 @@ -365,9 +365,9 @@ glabel func_80046524 /* 0475A4 800469A4 10000019 */ b .L80046A0C /* 0475A8 800469A8 3C014040 */ lui $at, 0x4040 .L800469AC: -/* 0475AC 800469AC 3C01800E */ lui $at, %hi(D_800E63E4) # $at, 0x800e +/* 0475AC 800469AC 3C01800E */ lui $at, %hi(D_800E63E0 + 4) # $at, 0x800e /* 0475B0 800469B0 C42963E0 */ lwc1 $f9, %lo(D_800E63E0)($at) -/* 0475B4 800469B4 C42863E4 */ lwc1 $f8, %lo(D_800E63E4)($at) +/* 0475B4 800469B4 C42863E4 */ lwc1 $f8, %lo(D_800E63E0 + 4)($at) /* 0475B8 800469B8 C7AB0050 */ lwc1 $f11, 0x50($sp) /* 0475BC 800469BC C7AA0054 */ lwc1 $f10, 0x54($sp) /* 0475C0 800469C0 C60400B8 */ lwc1 $f4, 0xb8($s0) @@ -406,9 +406,9 @@ glabel func_80046524 /* 047640 80046A40 4628303C */ c.lt.d $f6, $f8 /* 047644 80046A44 00000000 */ nop /* 047648 80046A48 45000007 */ bc1f .L80046A68 -/* 04764C 80046A4C 3C01800E */ lui $at, %hi(D_800E63EC) # $at, 0x800e +/* 04764C 80046A4C 3C01800E */ lui $at, %hi(D_800E63E8 + 4) # $at, 0x800e /* 047650 80046A50 C42B63E8 */ lwc1 $f11, %lo(D_800E63E8)($at) -/* 047654 80046A54 C42A63EC */ lwc1 $f10, %lo(D_800E63EC)($at) +/* 047654 80046A54 C42A63EC */ lwc1 $f10, %lo(D_800E63E8 + 4)($at) /* 047658 80046A58 46006121 */ cvt.d.s $f4, $f12 /* 04765C 80046A5C 462A2182 */ mul.d $f6, $f4, $f10 /* 047660 80046A60 46203220 */ cvt.s.d $f8, $f6 @@ -924,11 +924,11 @@ glabel func_80046524 .L800471D0: /* 047DD0 800471D0 3C01800E */ lui $at, %hi(D_800E63F0) # $at, 0x800e /* 047DD4 800471D4 C42263F0 */ lwc1 $f2, %lo(D_800E63F0)($at) -/* 047DD8 800471D8 3C01800E */ lui $at, %hi(D_800E63FC) # $at, 0x800e +/* 047DD8 800471D8 3C01800E */ lui $at, %hi(D_800E63F8 + 4) # $at, 0x800e /* 047DDC 800471DC E7A200FC */ swc1 $f2, 0xfc($sp) /* 047DE0 800471E0 C6280020 */ lwc1 $f8, 0x20($s1) /* 047DE4 800471E4 C42563F8 */ lwc1 $f5, %lo(D_800E63F8)($at) -/* 047DE8 800471E8 C42463FC */ lwc1 $f4, %lo(D_800E63FC)($at) +/* 047DE8 800471E8 C42463FC */ lwc1 $f4, %lo(D_800E63F8 + 4)($at) /* 047DEC 800471EC 46004021 */ cvt.d.s $f0, $f8 /* 047DF0 800471F0 46240182 */ mul.d $f6, $f0, $f4 /* 047DF4 800471F4 C7AB0050 */ lwc1 $f11, 0x50($sp) @@ -992,9 +992,9 @@ glabel func_80046524 /* 047ED4 800472D4 46283100 */ add.d $f4, $f6, $f8 /* 047ED8 800472D8 44814800 */ mtc1 $at, $f9 /* 047EDC 800472DC 46245182 */ mul.d $f6, $f10, $f4 -/* 047EE0 800472E0 3C01800E */ lui $at, %hi(D_800E6404) # $at, 0x800e +/* 047EE0 800472E0 3C01800E */ lui $at, %hi(D_800E6400 + 4) # $at, 0x800e /* 047EE4 800472E4 C42B6400 */ lwc1 $f11, %lo(D_800E6400)($at) -/* 047EE8 800472E8 C42A6404 */ lwc1 $f10, %lo(D_800E6404)($at) +/* 047EE8 800472E8 C42A6404 */ lwc1 $f10, %lo(D_800E6400 + 4)($at) /* 047EEC 800472EC 44804000 */ mtc1 $zero, $f8 /* 047EF0 800472F0 462A0103 */ div.d $f4, $f0, $f10 /* 047EF4 800472F4 462033A0 */ cvt.s.d $f14, $f6 @@ -1162,11 +1162,11 @@ glabel func_80046524 /* 04814C 8004754C 45000010 */ bc1f .L80047590 /* 048150 80047550 00000000 */ nop /* 048154 80047554 8E0F0148 */ lw $t7, 0x148($s0) -/* 048158 80047558 3C01800E */ lui $at, %hi(D_800E640C) # $at, 0x800e +/* 048158 80047558 3C01800E */ lui $at, %hi(D_800E6408 + 4) # $at, 0x800e /* 04815C 8004755C 15E0000C */ bnez $t7, .L80047590 /* 048160 80047560 00000000 */ nop /* 048164 80047564 C42B6408 */ lwc1 $f11, %lo(D_800E6408)($at) -/* 048168 80047568 C42A640C */ lwc1 $f10, %lo(D_800E640C)($at) +/* 048168 80047568 C42A640C */ lwc1 $f10, %lo(D_800E6408 + 4)($at) /* 04816C 8004756C 46001121 */ cvt.d.s $f4, $f2 /* 048170 80047570 462A2202 */ mul.d $f8, $f4, $f10 /* 048174 80047574 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -1185,9 +1185,9 @@ glabel func_80046524 /* 0481A0 800475A0 A3A900AF */ sb $t1, 0xaf($sp) /* 0481A4 800475A4 0C015C88 */ jal func_80057220 /* 0481A8 800475A8 E7B20104 */ swc1 $f18, 0x104($sp) -/* 0481AC 800475AC 3C01800E */ lui $at, %hi(D_800E6414) # $at, 0x800e +/* 0481AC 800475AC 3C01800E */ lui $at, %hi(D_800E6410 + 4) # $at, 0x800e /* 0481B0 800475B0 C4296410 */ lwc1 $f9, %lo(D_800E6410)($at) -/* 0481B4 800475B4 C4286414 */ lwc1 $f8, %lo(D_800E6414)($at) +/* 0481B4 800475B4 C4286414 */ lwc1 $f8, %lo(D_800E6410 + 4)($at) /* 0481B8 800475B8 460001A1 */ cvt.d.s $f6, $f0 /* 0481BC 800475BC 46283102 */ mul.d $f4, $f6, $f8 /* 0481C0 800475C0 C7B20104 */ lwc1 $f18, 0x104($sp) @@ -1498,10 +1498,10 @@ glabel func_80046524 /* 04863C 80047A3C 44805000 */ mtc1 $zero, $f10 /* 048640 80047A40 46002221 */ cvt.d.s $f8, $f4 /* 048644 80047A44 462A4182 */ mul.d $f6, $f8, $f10 -/* 048648 80047A48 3C01800E */ lui $at, %hi(D_800E641C) # $at, 0x800e +/* 048648 80047A48 3C01800E */ lui $at, %hi(D_800E6418 + 4) # $at, 0x800e /* 04864C 80047A4C C4296418 */ lwc1 $f9, %lo(D_800E6418)($at) -/* 048650 80047A50 C428641C */ lwc1 $f8, %lo(D_800E641C)($at) -/* 048654 80047A54 3C01800E */ lui $at, %hi(D_800E6424) # $at, 0x800e +/* 048650 80047A50 C428641C */ lwc1 $f8, %lo(D_800E6418 + 4)($at) +/* 048654 80047A54 3C01800E */ lui $at, %hi(D_800E6420 + 4) # $at, 0x800e /* 048658 80047A58 46203420 */ cvt.s.d $f16, $f6 /* 04865C 80047A5C 3C0E8012 */ lui $t6, %hi(D_8011D528) # $t6, 0x8012 /* 048660 80047A60 46008121 */ cvt.d.s $f4, $f16 @@ -1517,7 +1517,7 @@ glabel func_80046524 /* 048688 80047A88 46000307 */ neg.s $f12, $f0 .L80047A8C: /* 04868C 80047A8C C4296420 */ lwc1 $f9, %lo(D_800E6420)($at) -/* 048690 80047A90 C4286424 */ lwc1 $f8, %lo(D_800E6424)($at) +/* 048690 80047A90 C4286424 */ lwc1 $f8, %lo(D_800E6420 + 4)($at) /* 048694 80047A94 460062A1 */ cvt.d.s $f10, $f12 /* 048698 80047A98 462A403C */ c.lt.d $f8, $f10 /* 04869C 80047A9C 00000000 */ nop @@ -1547,10 +1547,10 @@ glabel func_80046524 /* 0486F8 80047AF8 10000039 */ b .L80047BE0 /* 0486FC 80047AFC E62A0024 */ swc1 $f10, 0x24($s1) .L80047B00: -/* 048700 80047B00 3C01800E */ lui $at, %hi(D_800E642C) # $at, 0x800e +/* 048700 80047B00 3C01800E */ lui $at, %hi(D_800E6428 + 4) # $at, 0x800e /* 048704 80047B04 C6040030 */ lwc1 $f4, 0x30($s0) /* 048708 80047B08 C4276428 */ lwc1 $f7, %lo(D_800E6428)($at) -/* 04870C 80047B0C C426642C */ lwc1 $f6, %lo(D_800E642C)($at) +/* 04870C 80047B0C C426642C */ lwc1 $f6, %lo(D_800E6428 + 4)($at) /* 048710 80047B10 46002021 */ cvt.d.s $f0, $f4 /* 048714 80047B14 46260202 */ mul.d $f8, $f0, $f6 /* 048718 80047B18 8C84D528 */ lw $a0, %lo(D_8011D528)($a0) @@ -1567,10 +1567,10 @@ glabel func_80046524 /* 048744 80047B44 308D4000 */ andi $t5, $a0, 0x4000 /* 048748 80047B48 28410028 */ slti $at, $v0, 0x28 /* 04874C 80047B4C 10200009 */ beqz $at, .L80047B74 -/* 048750 80047B50 3C01800E */ lui $at, %hi(D_800E6434) # $at, 0x800e +/* 048750 80047B50 3C01800E */ lui $at, %hi(D_800E6430 + 4) # $at, 0x800e /* 048754 80047B54 C7A400F4 */ lwc1 $f4, 0xf4($sp) /* 048758 80047B58 C4296430 */ lwc1 $f9, %lo(D_800E6430)($at) -/* 04875C 80047B5C C4286434 */ lwc1 $f8, %lo(D_800E6434)($at) +/* 04875C 80047B5C C4286434 */ lwc1 $f8, %lo(D_800E6430 + 4)($at) /* 048760 80047B60 460021A1 */ cvt.d.s $f6, $f4 /* 048764 80047B64 46283282 */ mul.d $f10, $f6, $f8 /* 048768 80047B68 46205120 */ cvt.s.d $f4, $f10 @@ -1858,9 +1858,9 @@ glabel func_80046524 /* 048BA0 80047FA0 00000000 */ nop /* 048BA4 80047FA4 45000007 */ bc1f .L80047FC4 .L80047FA8: -/* 048BA8 80047FA8 3C01800E */ lui $at, %hi(D_800E643C) # $at, 0x800e +/* 048BA8 80047FA8 3C01800E */ lui $at, %hi(D_800E6438 + 4) # $at, 0x800e /* 048BAC 80047FAC C42B6438 */ lwc1 $f11, %lo(D_800E6438)($at) -/* 048BB0 80047FB0 C42A643C */ lwc1 $f10, %lo(D_800E643C)($at) +/* 048BB0 80047FB0 C42A643C */ lwc1 $f10, %lo(D_800E6438 + 4)($at) /* 048BB4 80047FB4 00000000 */ nop /* 048BB8 80047FB8 462A0102 */ mul.d $f4, $f0, $f10 /* 048BBC 80047FBC 10000003 */ b .L80047FCC @@ -1883,9 +1883,9 @@ glabel func_80046524 /* 048BF8 80047FF8 00000000 */ nop /* 048BFC 80047FFC 45000007 */ bc1f .L8004801C .L80048000: -/* 048C00 80048000 3C01800E */ lui $at, %hi(D_800E6444) # $at, 0x800e +/* 048C00 80048000 3C01800E */ lui $at, %hi(D_800E6440 + 4) # $at, 0x800e /* 048C04 80048004 C42B6440 */ lwc1 $f11, %lo(D_800E6440)($at) -/* 048C08 80048008 C42A6444 */ lwc1 $f10, %lo(D_800E6444)($at) +/* 048C08 80048008 C42A6444 */ lwc1 $f10, %lo(D_800E6440 + 4)($at) /* 048C0C 8004800C 00000000 */ nop /* 048C10 80048010 462A0102 */ mul.d $f4, $f0, $f10 /* 048C14 80048014 1000000B */ b .L80048044 @@ -1962,7 +1962,7 @@ glabel func_80046524 /* 048D18 80048118 462032A0 */ cvt.s.d $f10, $f6 /* 048D1C 8004811C E60A00D4 */ swc1 $f10, 0xd4($s0) /* 048D20 80048120 C60400D4 */ lwc1 $f4, 0xd4($s0) -/* 048D24 80048124 C428644C */ lwc1 $f8, %lo(D_800E644C)($at) +/* 048D24 80048124 C428644C */ lwc1 $f8, %lo(D_800E6448 + 4)($at) /* 048D28 80048128 C4296448 */ lwc1 $f9, %lo(D_800E6448)($at) /* 048D2C 8004812C 460020A1 */ cvt.d.s $f2, $f4 /* 048D30 80048130 4622403C */ c.lt.d $f8, $f2 @@ -2018,9 +2018,9 @@ glabel func_80046524 /* 048DEC 800481EC 00000000 */ nop /* 048DF0 800481F0 46007021 */ cvt.d.s $f0, $f14 .L800481F4: -/* 048DF4 800481F4 3C01800E */ lui $at, %hi(D_800E645C) # $at, 0x800e +/* 048DF4 800481F4 3C01800E */ lui $at, %hi(D_800E6458 + 4) # $at, 0x800e /* 048DF8 800481F8 C4296458 */ lwc1 $f9, %lo(D_800E6458)($at) -/* 048DFC 800481FC C428645C */ lwc1 $f8, %lo(D_800E645C)($at) +/* 048DFC 800481FC C428645C */ lwc1 $f8, %lo(D_800E6458 + 4)($at) /* 048E00 80048200 C62A0010 */ lwc1 $f10, 0x10($s1) /* 048E04 80048204 46280182 */ mul.d $f6, $f0, $f8 /* 048E08 80048208 C7A40118 */ lwc1 $f4, 0x118($sp) @@ -2210,7 +2210,7 @@ glabel func_80046524 /* 0490B4 800484B4 E6280020 */ swc1 $f8, 0x20($s1) /* 0490B8 800484B8 C60A0008 */ lwc1 $f10, 8($s0) /* 0490BC 800484BC C604002C */ lwc1 $f4, 0x2c($s0) -/* 0490C0 800484C0 C4286464 */ lwc1 $f8, %lo(D_800E6464)($at) +/* 0490C0 800484C0 C4286464 */ lwc1 $f8, %lo(D_800E6460 + 4)($at) /* 0490C4 800484C4 C4296460 */ lwc1 $f9, %lo(D_800E6460)($at) /* 0490C8 800484C8 46005021 */ cvt.d.s $f0, $f10 /* 0490CC 800484CC 460021A1 */ cvt.d.s $f6, $f4 diff --git a/asm/non_matchings/unknown_043920/func_80048C7C.s b/asm/non_matchings/unknown_043920/func_80048C7C.s index 117b389f..aab88adb 100644 --- a/asm/non_matchings/unknown_043920/func_80048C7C.s +++ b/asm/non_matchings/unknown_043920/func_80048C7C.s @@ -97,9 +97,9 @@ glabel L80048DAC /* 0499B0 80048DB0 10000027 */ b .L80048E50 /* 0499B4 80048DB4 A20901ED */ sb $t1, 0x1ed($s0) glabel L80048DB8 -/* 0499B8 80048DB8 3C01800E */ lui $at, %hi(D_800E648C) # $at, 0x800e +/* 0499B8 80048DB8 3C01800E */ lui $at, %hi(D_800E6488 + 4) # $at, 0x800e /* 0499BC 80048DBC C4216488 */ lwc1 $f1, %lo(D_800E6488)($at) -/* 0499C0 80048DC0 C420648C */ lwc1 $f0, %lo(D_800E648C)($at) +/* 0499C0 80048DC0 C420648C */ lwc1 $f0, %lo(D_800E6488 + 4)($at) /* 0499C4 80048DC4 240A0078 */ li $t2, 120 /* 0499C8 80048DC8 A60A0204 */ sh $t2, 0x204($s0) /* 0499CC 80048DCC C490001C */ lwc1 $f16, 0x1c($a0) @@ -127,10 +127,10 @@ glabel L80048E18 /* 049A1C 80048E1C 240B0001 */ li $t3, 1 /* 049A20 80048E20 A20B01F1 */ sb $t3, 0x1f1($s0) /* 049A24 80048E24 E600002C */ swc1 $f0, 0x2c($s0) -/* 049A28 80048E28 3C01800E */ lui $at, %hi(D_800E6494) # $at, 0x800e +/* 049A28 80048E28 3C01800E */ lui $at, %hi(D_800E6490 + 4) # $at, 0x800e /* 049A2C 80048E2C C4860020 */ lwc1 $f6, 0x20($a0) /* 049A30 80048E30 C42B6490 */ lwc1 $f11, %lo(D_800E6490)($at) -/* 049A34 80048E34 C42A6494 */ lwc1 $f10, %lo(D_800E6494)($at) +/* 049A34 80048E34 C42A6494 */ lwc1 $f10, %lo(D_800E6490 + 4)($at) /* 049A38 80048E38 46003221 */ cvt.d.s $f8, $f6 /* 049A3C 80048E3C 462A4400 */ add.d $f16, $f8, $f10 /* 049A40 80048E40 24050139 */ li $a1, 313 diff --git a/asm/non_matchings/unknown_043920/func_80048E64.s b/asm/non_matchings/unknown_043920/func_80048E64.s index 3fbdec9e..ac090e74 100644 --- a/asm/non_matchings/unknown_043920/func_80048E64.s +++ b/asm/non_matchings/unknown_043920/func_80048E64.s @@ -158,11 +158,11 @@ glabel func_80048E64 /* 049C8C 8004908C 46100102 */ mul.s $f4, $f0, $f16 /* 049C90 80049090 3C0140C0 */ li $at, 0x40C00000 # 6.000000 /* 049C94 80049094 44814000 */ mtc1 $at, $f8 -/* 049C98 80049098 3C01800E */ lui $at, %hi(D_800E649C) # $at, 0x800e +/* 049C98 80049098 3C01800E */ lui $at, %hi(D_800E6498 + 4) # $at, 0x800e /* 049C9C 8004909C 46002187 */ neg.s $f6, $f4 /* 049CA0 800490A0 46083082 */ mul.s $f2, $f6, $f8 /* 049CA4 800490A4 C42B6498 */ lwc1 $f11, %lo(D_800E6498)($at) -/* 049CA8 800490A8 C42A649C */ lwc1 $f10, %lo(D_800E649C)($at) +/* 049CA8 800490A8 C42A649C */ lwc1 $f10, %lo(D_800E6498 + 4)($at) /* 049CAC 800490AC 3C014282 */ li $at, 0x42820000 # 65.000000 /* 049CB0 800490B0 46001121 */ cvt.d.s $f4, $f2 /* 049CB4 800490B4 4624503C */ c.lt.d $f10, $f4 diff --git a/asm/non_matchings/unknown_043920/func_800494E0.s b/asm/non_matchings/unknown_043920/func_800494E0.s index 4ebc8a01..44cb35e8 100644 --- a/asm/non_matchings/unknown_043920/func_800494E0.s +++ b/asm/non_matchings/unknown_043920/func_800494E0.s @@ -21,7 +21,7 @@ glabel func_800494E0 /* 04A118 80049518 46802020 */ cvt.s.w $f0, $f4 /* 04A11C 8004951C 44800000 */ mtc1 $zero, $f0 /* 04A120 80049520 C4A2002C */ lwc1 $f2, 0x2c($a1) -/* 04A124 80049524 3C01800E */ lui $at, %hi(D_800E64A4) # $at, 0x800e +/* 04A124 80049524 3C01800E */ lui $at, %hi(D_800E64A0 + 4) # $at, 0x800e /* 04A128 80049528 4600103C */ c.lt.s $f2, $f0 /* 04A12C 8004952C 00000000 */ nop /* 04A130 80049530 45000002 */ bc1f .L8004953C @@ -29,7 +29,7 @@ glabel func_800494E0 /* 04A138 80049538 46001087 */ neg.s $f2, $f2 .L8004953C: /* 04A13C 8004953C C42964A0 */ lwc1 $f9, %lo(D_800E64A0)($at) -/* 04A140 80049540 C42864A4 */ lwc1 $f8, %lo(D_800E64A4)($at) +/* 04A140 80049540 C42864A4 */ lwc1 $f8, %lo(D_800E64A0 + 4)($at) /* 04A144 80049544 460011A1 */ cvt.d.s $f6, $f2 /* 04A148 80049548 46283282 */ mul.d $f10, $f6, $f8 /* 04A14C 8004954C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 diff --git a/asm/non_matchings/unknown_043920/func_80049794.s b/asm/non_matchings/unknown_043920/func_80049794.s index dfd316ec..a68ef66d 100644 --- a/asm/non_matchings/unknown_043920/func_80049794.s +++ b/asm/non_matchings/unknown_043920/func_80049794.s @@ -63,10 +63,10 @@ glabel func_80049794 /* 04A3B8 800497B8 0C00384E */ jal func_8000E138 /* 04A3BC 800497BC AFA500FC */ sw $a1, 0xfc($sp) /* 04A3C0 800497C0 10400008 */ beqz $v0, .L800497E4 -/* 04A3C4 800497C4 3C01800E */ lui $at, %hi(D_800E64AC) # $at, 0x800e +/* 04A3C4 800497C4 3C01800E */ lui $at, %hi(D_800E64A8 + 4) # $at, 0x800e /* 04A3C8 800497C8 C7A400FC */ lwc1 $f4, 0xfc($sp) /* 04A3CC 800497CC C42964A8 */ lwc1 $f9, %lo(D_800E64A8)($at) -/* 04A3D0 800497D0 C42864AC */ lwc1 $f8, %lo(D_800E64AC)($at) +/* 04A3D0 800497D0 C42864AC */ lwc1 $f8, %lo(D_800E64A8 + 4)($at) /* 04A3D4 800497D4 460021A1 */ cvt.d.s $f6, $f4 /* 04A3D8 800497D8 46283282 */ mul.d $f10, $f6, $f8 /* 04A3DC 800497DC 462054A0 */ cvt.s.d $f18, $f10 @@ -209,12 +209,12 @@ glabel func_80049794 /* 04A5D8 800499D8 1122000D */ beq $t1, $v0, .L80049A10 /* 04A5DC 800499DC 3C0E8012 */ lui $t6, %hi(D_8011D5B0) # $t6, 0x8012 /* 04A5E0 800499E0 8DCED5B0 */ lw $t6, %lo(D_8011D5B0)($t6) -/* 04A5E4 800499E4 3C01800E */ lui $at, %hi(D_800E64B4) # $at, 0x800e +/* 04A5E4 800499E4 3C01800E */ lui $at, %hi(D_800E64B0 + 4) # $at, 0x800e /* 04A5E8 800499E8 01C57821 */ addu $t7, $t6, $a1 /* 04A5EC 800499EC 8DF80004 */ lw $t8, 4($t7) /* 04A5F0 800499F0 C42B64B0 */ lwc1 $f11, %lo(D_800E64B0)($at) /* 04A5F4 800499F4 C7060008 */ lwc1 $f6, 8($t8) -/* 04A5F8 800499F8 C42A64B4 */ lwc1 $f10, %lo(D_800E64B4)($at) +/* 04A5F8 800499F8 C42A64B4 */ lwc1 $f10, %lo(D_800E64B0 + 4)($at) /* 04A5FC 800499FC 46003221 */ cvt.d.s $f8, $f6 /* 04A600 80049A00 462A403C */ c.lt.d $f8, $f10 /* 04A604 80049A04 00000000 */ nop @@ -406,10 +406,10 @@ glabel func_80049794 /* 04A8A8 80049CA8 3C198012 */ lui $t9, %hi(D_8011D528) # $t9, 0x8012 /* 04A8AC 80049CAC 31CF8000 */ andi $t7, $t6, 0x8000 /* 04A8B0 80049CB0 11E00019 */ beqz $t7, .L80049D18 -/* 04A8B4 80049CB4 3C01800E */ lui $at, %hi(D_800E64BC) # $at, 0x800e +/* 04A8B4 80049CB4 3C01800E */ lui $at, %hi(D_800E64B8 + 4) # $at, 0x800e /* 04A8B8 80049CB8 C7A800FC */ lwc1 $f8, 0xfc($sp) /* 04A8BC 80049CBC C42564B8 */ lwc1 $f5, %lo(D_800E64B8)($at) -/* 04A8C0 80049CC0 C42464BC */ lwc1 $f4, %lo(D_800E64BC)($at) +/* 04A8C0 80049CC0 C42464BC */ lwc1 $f4, %lo(D_800E64B8 + 4)($at) /* 04A8C4 80049CC4 46004021 */ cvt.d.s $f0, $f8 /* 04A8C8 80049CC8 46240182 */ mul.d $f6, $f0, $f4 /* 04A8CC 80049CCC C60A00B4 */ lwc1 $f10, 0xb4($s0) @@ -432,10 +432,10 @@ glabel func_80049794 /* 04A910 80049D10 10000017 */ b .L80049D70 /* 04A914 80049D14 E60800B4 */ swc1 $f8, 0xb4($s0) .L80049D18: -/* 04A918 80049D18 3C01800E */ lui $at, %hi(D_800E64C4) # $at, 0x800e +/* 04A918 80049D18 3C01800E */ lui $at, %hi(D_800E64C0 + 4) # $at, 0x800e /* 04A91C 80049D1C C7AA00FC */ lwc1 $f10, 0xfc($sp) /* 04A920 80049D20 C42764C0 */ lwc1 $f7, %lo(D_800E64C0)($at) -/* 04A924 80049D24 C42664C4 */ lwc1 $f6, %lo(D_800E64C4)($at) +/* 04A924 80049D24 C42664C4 */ lwc1 $f6, %lo(D_800E64C0 + 4)($at) /* 04A928 80049D28 46005021 */ cvt.d.s $f0, $f10 /* 04A92C 80049D2C 46260202 */ mul.d $f8, $f0, $f6 /* 04A930 80049D30 C61200B4 */ lwc1 $f18, 0xb4($s0) @@ -481,9 +481,9 @@ glabel func_80049794 /* 04A9C8 80049DC8 00000000 */ nop /* 04A9CC 80049DCC 4500002B */ bc1f .L80049E7C .L80049DD0: -/* 04A9D0 80049DD0 3C01800E */ lui $at, %hi(D_800E64CC) # $at, 0x800e +/* 04A9D0 80049DD0 3C01800E */ lui $at, %hi(D_800E64C8 + 4) # $at, 0x800e /* 04A9D4 80049DD4 C42B64C8 */ lwc1 $f11, %lo(D_800E64C8)($at) -/* 04A9D8 80049DD8 C42A64CC */ lwc1 $f10, %lo(D_800E64CC)($at) +/* 04A9D8 80049DD8 C42A64CC */ lwc1 $f10, %lo(D_800E64C8 + 4)($at) /* 04A9DC 80049DDC C60400B8 */ lwc1 $f4, 0xb8($s0) /* 04A9E0 80049DE0 462A0482 */ mul.d $f18, $f0, $f10 /* 04A9E4 80049DE4 46002221 */ cvt.d.s $f8, $f4 @@ -493,7 +493,7 @@ glabel func_80049794 /* 04A9F4 80049DF4 46203120 */ cvt.s.d $f4, $f6 /* 04A9F8 80049DF8 E60400B8 */ swc1 $f4, 0xb8($s0) /* 04A9FC 80049DFC C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 04AA00 80049E00 C42A64D4 */ lwc1 $f10, %lo(D_800E64D4)($at) +/* 04AA00 80049E00 C42A64D4 */ lwc1 $f10, %lo(D_800E64D0 + 4)($at) /* 04AA04 80049E04 C42B64D0 */ lwc1 $f11, %lo(D_800E64D0)($at) /* 04AA08 80049E08 460044A1 */ cvt.d.s $f18, $f8 /* 04AA0C 80049E0C 4632503C */ c.lt.d $f10, $f18 @@ -527,9 +527,9 @@ glabel func_80049794 /* 04AA74 80049E74 10000015 */ b .L80049ECC /* 04AA78 80049E78 E7A200C4 */ swc1 $f2, 0xc4($sp) .L80049E7C: -/* 04AA7C 80049E7C 3C01800E */ lui $at, %hi(D_800E64E4) # $at, 0x800e +/* 04AA7C 80049E7C 3C01800E */ lui $at, %hi(D_800E64E0 + 4) # $at, 0x800e /* 04AA80 80049E80 C42564E0 */ lwc1 $f5, %lo(D_800E64E0)($at) -/* 04AA84 80049E84 C42464E4 */ lwc1 $f4, %lo(D_800E64E4)($at) +/* 04AA84 80049E84 C42464E4 */ lwc1 $f4, %lo(D_800E64E0 + 4)($at) /* 04AA88 80049E88 C61200B8 */ lwc1 $f18, 0xb8($s0) /* 04AA8C 80049E8C 46240202 */ mul.d $f8, $f0, $f4 /* 04AA90 80049E90 460091A1 */ cvt.d.s $f6, $f18 @@ -915,15 +915,15 @@ glabel func_80049794 /* 04B02C 8004A42C 4626203C */ c.lt.d $f4, $f6 /* 04B030 8004A430 C7AA00C8 */ lwc1 $f10, 0xc8($sp) /* 04B034 8004A434 4500000F */ bc1f .L8004A474 -/* 04B038 8004A438 3C01800E */ lui $at, %hi(D_800E64FC) # $at, 0x800e +/* 04B038 8004A438 3C01800E */ lui $at, %hi(D_800E64F8 + 4) # $at, 0x800e /* 04B03C 8004A43C C42964F8 */ lwc1 $f9, %lo(D_800E64F8)($at) -/* 04B040 8004A440 C42864FC */ lwc1 $f8, %lo(D_800E64FC)($at) +/* 04B040 8004A440 C42864FC */ lwc1 $f8, %lo(D_800E64F8 + 4)($at) /* 04B044 8004A444 460054A1 */ cvt.d.s $f18, $f10 /* 04B048 8004A448 46289102 */ mul.d $f4, $f18, $f8 -/* 04B04C 8004A44C 3C01800E */ lui $at, %hi(D_800E6504) # $at, 0x800e +/* 04B04C 8004A44C 3C01800E */ lui $at, %hi(D_800E6500 + 4) # $at, 0x800e /* 04B050 8004A450 C7AA00C4 */ lwc1 $f10, 0xc4($sp) /* 04B054 8004A454 C4296500 */ lwc1 $f9, %lo(D_800E6500)($at) -/* 04B058 8004A458 C4286504 */ lwc1 $f8, %lo(D_800E6504)($at) +/* 04B058 8004A458 C4286504 */ lwc1 $f8, %lo(D_800E6500 + 4)($at) /* 04B05C 8004A45C 462021A0 */ cvt.s.d $f6, $f4 /* 04B060 8004A460 460054A1 */ cvt.d.s $f18, $f10 /* 04B064 8004A464 46289102 */ mul.d $f4, $f18, $f8 @@ -1776,10 +1776,10 @@ glabel func_80049794 /* 04BC8C 8004B08C 44882000 */ mtc1 $t0, $f4 /* 04BC90 8004B090 C606002C */ lwc1 $f6, 0x2c($s0) /* 04BC94 8004B094 46802220 */ cvt.s.w $f8, $f4 -/* 04BC98 8004B098 3C01800E */ lui $at, %hi(D_800E6514) # $at, 0x800e +/* 04BC98 8004B098 3C01800E */ lui $at, %hi(D_800E6510 + 4) # $at, 0x800e /* 04BC9C 8004B09C C4256510 */ lwc1 $f5, %lo(D_800E6510)($at) /* 04BCA0 8004B0A0 46083482 */ mul.s $f18, $f6, $f8 -/* 04BCA4 8004B0A4 C4246514 */ lwc1 $f4, %lo(D_800E6514)($at) +/* 04BCA4 8004B0A4 C4246514 */ lwc1 $f4, %lo(D_800E6510 + 4)($at) /* 04BCA8 8004B0A8 C628001C */ lwc1 $f8, 0x1c($s1) /* 04BCAC 8004B0AC 3C028012 */ lui $v0, %hi(D_8011D528) # $v0, 0x8012 /* 04BCB0 8004B0B0 460092A1 */ cvt.d.s $f10, $f18 @@ -1977,10 +1977,10 @@ glabel func_80049794 /* 04BF7C 8004B37C 0C015C88 */ jal func_80057220 /* 04BF80 8004B380 E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04BF84 8004B384 C7AE00DC */ lwc1 $f14, 0xdc($sp) -/* 04BF88 8004B388 3C01800E */ lui $at, %hi(D_800E651C) # $at, 0x800e +/* 04BF88 8004B388 3C01800E */ lui $at, %hi(D_800E6518 + 4) # $at, 0x800e /* 04BF8C 8004B38C 46007382 */ mul.s $f14, $f14, $f0 /* 04BF90 8004B390 C4296518 */ lwc1 $f9, %lo(D_800E6518)($at) -/* 04BF94 8004B394 C428651C */ lwc1 $f8, %lo(D_800E651C)($at) +/* 04BF94 8004B394 C428651C */ lwc1 $f8, %lo(D_800E6518 + 4)($at) /* 04BF98 8004B398 820201D3 */ lb $v0, 0x1d3($s0) /* 04BF9C 8004B39C 460071A1 */ cvt.d.s $f6, $f14 /* 04BFA0 8004B3A0 46283282 */ mul.d $f10, $f6, $f8 @@ -2017,9 +2017,9 @@ glabel func_80049794 /* 04C014 8004B414 820D01E2 */ lb $t5, 0x1e2($s0) /* 04C018 8004B418 C7A400C8 */ lwc1 $f4, 0xc8($sp) /* 04C01C 8004B41C 15A0000F */ bnez $t5, .L8004B45C -/* 04C020 8004B420 3C01800E */ lui $at, %hi(D_800E6524) # $at, 0x800e +/* 04C020 8004B420 3C01800E */ lui $at, %hi(D_800E6520 + 4) # $at, 0x800e /* 04C024 8004B424 C4296520 */ lwc1 $f9, %lo(D_800E6520)($at) -/* 04C028 8004B428 C4286524 */ lwc1 $f8, %lo(D_800E6524)($at) +/* 04C028 8004B428 C4286524 */ lwc1 $f8, %lo(D_800E6520 + 4)($at) /* 04C02C 8004B42C 460021A1 */ cvt.d.s $f6, $f4 /* 04C030 8004B430 4628303C */ c.lt.d $f6, $f8 /* 04C034 8004B434 00000000 */ nop @@ -2187,10 +2187,10 @@ glabel func_80049794 /* 04C29C 8004B69C 2401FFFF */ li $at, -1 /* 04C2A0 8004B6A0 1441004E */ bne $v0, $at, .L8004B7DC .L8004B6A4: -/* 04C2A4 8004B6A4 3C01800E */ lui $at, %hi(D_800E6534) # $at, 0x800e +/* 04C2A4 8004B6A4 3C01800E */ lui $at, %hi(D_800E6530 + 4) # $at, 0x800e /* 04C2A8 8004B6A8 C612002C */ lwc1 $f18, 0x2c($s0) /* 04C2AC 8004B6AC C42B6530 */ lwc1 $f11, %lo(D_800E6530)($at) -/* 04C2B0 8004B6B0 C42A6534 */ lwc1 $f10, %lo(D_800E6534)($at) +/* 04C2B0 8004B6B0 C42A6534 */ lwc1 $f10, %lo(D_800E6530 + 4)($at) /* 04C2B4 8004B6B4 460091A1 */ cvt.d.s $f6, $f18 /* 04C2B8 8004B6B8 462A3202 */ mul.d $f8, $f6, $f10 /* 04C2BC 8004B6BC 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 @@ -2302,7 +2302,7 @@ glabel func_80049794 /* 04C454 8004B854 46049281 */ sub.s $f10, $f18, $f4 /* 04C458 8004B858 E62A0024 */ swc1 $f10, 0x24($s1) /* 04C45C 8004B85C C606002C */ lwc1 $f6, 0x2c($s0) -/* 04C460 8004B860 C424653C */ lwc1 $f4, %lo(D_800E653C)($at) +/* 04C460 8004B860 C424653C */ lwc1 $f4, %lo(D_800E6538 + 4)($at) /* 04C464 8004B864 C4256538 */ lwc1 $f5, %lo(D_800E6538)($at) /* 04C468 8004B868 460034A1 */ cvt.d.s $f18, $f6 /* 04C46C 8004B86C 46249282 */ mul.d $f10, $f18, $f4 @@ -2398,9 +2398,9 @@ glabel func_80049794 /* 04C5C8 8004B9C8 00000000 */ nop /* 04C5CC 8004B9CC 45000007 */ bc1f .L8004B9EC .L8004B9D0: -/* 04C5D0 8004B9D0 3C01800E */ lui $at, %hi(D_800E6544) # $at, 0x800e +/* 04C5D0 8004B9D0 3C01800E */ lui $at, %hi(D_800E6540 + 4) # $at, 0x800e /* 04C5D4 8004B9D4 C4336540 */ lwc1 $f19, %lo(D_800E6540)($at) -/* 04C5D8 8004B9D8 C4326544 */ lwc1 $f18, %lo(D_800E6544)($at) +/* 04C5D8 8004B9D8 C4326544 */ lwc1 $f18, %lo(D_800E6540 + 4)($at) /* 04C5DC 8004B9DC 00000000 */ nop /* 04C5E0 8004B9E0 46320102 */ mul.d $f4, $f0, $f18 /* 04C5E4 8004B9E4 10000003 */ b .L8004B9F4 @@ -2421,9 +2421,9 @@ glabel func_80049794 /* 04C618 8004BA18 00000000 */ nop /* 04C61C 8004BA1C 45000007 */ bc1f .L8004BA3C .L8004BA20: -/* 04C620 8004BA20 3C01800E */ lui $at, %hi(D_800E654C) # $at, 0x800e +/* 04C620 8004BA20 3C01800E */ lui $at, %hi(D_800E6548 + 4) # $at, 0x800e /* 04C624 8004BA24 C4276548 */ lwc1 $f7, %lo(D_800E6548)($at) -/* 04C628 8004BA28 C426654C */ lwc1 $f6, %lo(D_800E654C)($at) +/* 04C628 8004BA28 C426654C */ lwc1 $f6, %lo(D_800E6548 + 4)($at) /* 04C62C 8004BA2C 00000000 */ nop /* 04C630 8004BA30 46260282 */ mul.d $f10, $f0, $f6 /* 04C634 8004BA34 10000008 */ b .L8004BA58 diff --git a/asm/non_matchings/unknown_043920/func_8004C140.s b/asm/non_matchings/unknown_043920/func_8004C140.s index 327ce778..3bcba56e 100644 --- a/asm/non_matchings/unknown_043920/func_8004C140.s +++ b/asm/non_matchings/unknown_043920/func_8004C140.s @@ -88,9 +88,9 @@ glabel func_8004C140 /* 04CE5C 8004C25C 1000000F */ b .L8004C29C /* 04CE60 8004C260 A20C01DB */ sb $t4, 0x1db($s0) .L8004C264: -/* 04CE64 8004C264 3C01800E */ lui $at, %hi(D_800E6554) # $at, 0x800e +/* 04CE64 8004C264 3C01800E */ lui $at, %hi(D_800E6550 + 4) # $at, 0x800e /* 04CE68 8004C268 C4216550 */ lwc1 $f1, %lo(D_800E6550)($at) -/* 04CE6C 8004C26C C4206554 */ lwc1 $f0, %lo(D_800E6554)($at) +/* 04CE6C 8004C26C C4206554 */ lwc1 $f0, %lo(D_800E6550 + 4)($at) /* 04CE70 8004C270 A60D0204 */ sh $t5, 0x204($s0) /* 04CE74 8004C274 C484001C */ lwc1 $f4, 0x1c($a0) /* 04CE78 8004C278 C4900024 */ lwc1 $f16, 0x24($a0) diff --git a/asm/non_matchings/unknown_043920/func_8004C2B0.s b/asm/non_matchings/unknown_043920/func_8004C2B0.s index 51c01f57..8b7490a0 100644 --- a/asm/non_matchings/unknown_043920/func_8004C2B0.s +++ b/asm/non_matchings/unknown_043920/func_8004C2B0.s @@ -102,19 +102,19 @@ glabel func_8004C2B0 /* 04CFF0 8004C3F0 3401FFFF */ li $at, 65535 /* 04CFF4 8004C3F4 00812021 */ addu $a0, $a0, $at .L8004C3F8: -/* 04CFF8 8004C3F8 3C01800E */ lui $at, %hi(D_800E655C) # $at, 0x800e +/* 04CFF8 8004C3F8 3C01800E */ lui $at, %hi(D_800E6558 + 4) # $at, 0x800e /* 04CFFC 8004C3FC C4E80094 */ lwc1 $f8, 0x94($a3) /* 04D000 8004C400 C42B6558 */ lwc1 $f11, %lo(D_800E6558)($at) -/* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E655C)($at) +/* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E6558 + 4)($at) /* 04D008 8004C408 46004021 */ cvt.d.s $f0, $f8 /* 04D00C 8004C40C 462A003C */ c.lt.d $f0, $f10 /* 04D010 8004C410 3C01800E */ lui $at, %hi(D_800E6568) # $at, 0x800e /* 04D014 8004C414 45000009 */ bc1f .L8004C43C /* 04D018 8004C418 00000000 */ nop -# Used to access D_800E6560 and D_800E6564. +# Used to access D_800E6560 and D_800E6560 + 4. /* 04D01C 8004C41C 3C01800E */ lui $at, %hi(D_800E6560) # $at, 0x800e /* 04D020 8004C420 C4256560 */ lwc1 $f5, %lo(D_800E6560)($at) -/* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6564)($at) +/* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6560 + 4)($at) /* 04D028 8004C428 00000000 */ nop /* 04D02C 8004C42C 46240180 */ add.d $f6, $f0, $f4 /* 04D030 8004C430 46203220 */ cvt.s.d $f8, $f6 @@ -332,11 +332,11 @@ glabel func_8004C2B0 /* 04D324 8004C724 46020182 */ mul.s $f6, $f0, $f2 /* 04D328 8004C728 3C0140C0 */ li $at, 0x40C00000 # 6.000000 /* 04D32C 8004C72C 44815000 */ mtc1 $at, $f10 -/* 04D330 8004C730 3C01800E */ lui $at, %hi(D_800E6574) # $at, 0x800e +/* 04D330 8004C730 3C01800E */ lui $at, %hi(D_800E6570 + 4) # $at, 0x800e /* 04D334 8004C734 46003207 */ neg.s $f8, $f6 /* 04D338 8004C738 460A4402 */ mul.s $f16, $f8, $f10 /* 04D33C 8004C73C C4256570 */ lwc1 $f5, %lo(D_800E6570)($at) -/* 04D340 8004C740 C4246574 */ lwc1 $f4, %lo(D_800E6574)($at) +/* 04D340 8004C740 C4246574 */ lwc1 $f4, %lo(D_800E6570 + 4)($at) /* 04D344 8004C744 3C014282 */ li $at, 0x42820000 # 65.000000 /* 04D348 8004C748 460081A1 */ cvt.d.s $f6, $f16 /* 04D34C 8004C74C 4626203C */ c.lt.d $f4, $f6 @@ -521,10 +521,10 @@ glabel func_8004C2B0 /* 04D5F4 8004C9F4 3C014000 */ lui $at, 0x4000 /* 04D5F8 8004C9F8 45000009 */ bc1f .L8004CA20 /* 04D5FC 8004C9FC 00000000 */ nop -# Used to access D_800E6578 and D_800E657C. +# Used to access D_800E6578 and D_800E6578 + 4. /* 04D600 8004CA00 3C01800E */ lui $at, %hi(D_800E6578) # $at, 0x800e /* 04D604 8004CA04 C4296578 */ lwc1 $f9, %lo(D_800E6578)($at) -/* 04D608 8004CA08 C428657C */ lwc1 $f8, %lo(D_800E657C)($at) +/* 04D608 8004CA08 C428657C */ lwc1 $f8, %lo(D_800E6578 + 4)($at) /* 04D60C 8004CA0C 00000000 */ nop /* 04D610 8004CA10 46280181 */ sub.d $f6, $f0, $f8 /* 04D614 8004CA14 46203120 */ cvt.s.d $f4, $f6 diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index 2326d11c..f77b566a 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -174,11 +174,11 @@ glabel func_8004DE38 /* 04EC4C 8004E04C A20001F1 */ sb $zero, 0x1f1($s0) .L8004E050: /* 04EC50 8004E050 8F180300 */ lw $t8, %lo(osTvType)($t8) -/* 04EC54 8004E054 3C01800E */ lui $at, %hi(D_800E6594) # $at, 0x800e +/* 04EC54 8004E054 3C01800E */ lui $at, %hi(D_800E6590 + 4) # $at, 0x800e /* 04EC58 8004E058 17000006 */ bnez $t8, .L8004E074 /* 04EC5C 8004E05C 00000000 */ nop /* 04EC60 8004E060 C4256590 */ lwc1 $f5, %lo(D_800E6590)($at) -/* 04EC64 8004E064 C4246594 */ lwc1 $f4, %lo(D_800E6594)($at) +/* 04EC64 8004E064 C4246594 */ lwc1 $f4, %lo(D_800E6590 + 4)($at) /* 04EC68 8004E068 460082A1 */ cvt.d.s $f10, $f16 /* 04EC6C 8004E06C 46245182 */ mul.d $f6, $f10, $f4 /* 04EC70 8004E070 462034A0 */ cvt.s.d $f18, $f6 @@ -308,12 +308,12 @@ glabel func_8004DE38 /* 04EE2C 8004E22C 24A5D564 */ addiu $a1, %lo(D_8011D564) # addiu $a1, $a1, -0x2a9c /* 04EE30 8004E230 ACA20000 */ sw $v0, ($a1) /* 04EE34 8004E234 82080003 */ lb $t0, 3($s0) -/* 04EE38 8004E238 3C01800E */ lui $at, %hi(D_800E659C) # $at, 0x800e +/* 04EE38 8004E238 3C01800E */ lui $at, %hi(D_800E6598 + 4) # $at, 0x800e /* 04EE3C 8004E23C 00084880 */ sll $t1, $t0, 2 /* 04EE40 8004E240 00495021 */ addu $t2, $v0, $t1 /* 04EE44 8004E244 C5480000 */ lwc1 $f8, ($t2) /* 04EE48 8004E248 C4256598 */ lwc1 $f5, %lo(D_800E6598)($at) -/* 04EE4C 8004E24C C424659C */ lwc1 $f4, %lo(D_800E659C)($at) +/* 04EE4C 8004E24C C424659C */ lwc1 $f4, %lo(D_800E6598 + 4)($at) /* 04EE50 8004E250 460042A1 */ cvt.d.s $f10, $f8 /* 04EE54 8004E254 46245182 */ mul.d $f6, $f10, $f4 /* 04EE58 8004E258 3C038012 */ lui $v1, %hi(D_8011D56C) # $v1, 0x8012 @@ -1675,7 +1675,7 @@ glabel L8004ED88 /* 0501F4 8004F5F4 3C01800E */ lui $at, %hi(D_800E65F8) # $at, 0x800e /* 0501F8 8004F5F8 E7240008 */ swc1 $f4, 8($t9) /* 0501FC 8004F5FC C62A0030 */ lwc1 $f10, 0x30($s1) -/* 050200 8004F600 C42665FC */ lwc1 $f6, %lo(D_800E65FC)($at) +/* 050200 8004F600 C42665FC */ lwc1 $f6, %lo(D_800E65F8 + 4)($at) /* 050204 8004F604 C42765F8 */ lwc1 $f7, %lo(D_800E65F8)($at) /* 050208 8004F608 46005221 */ cvt.d.s $f8, $f10 /* 05020C 8004F60C 4626403C */ c.lt.d $f8, $f6 diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 611b821d..2526df9f 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -318,10 +318,10 @@ glabel func_8004F7F4 /* 05083C 8004FC3C 44809000 */ mtc1 $zero, $f18 /* 050840 8004FC40 46000121 */ cvt.d.s $f4, $f0 /* 050844 8004FC44 46322181 */ sub.d $f6, $f4, $f18 -/* 050848 8004FC48 3C01800E */ lui $at, %hi(D_800E6604) # $at, 0x800e +/* 050848 8004FC48 3C01800E */ lui $at, %hi(D_800E6600 + 4) # $at, 0x800e /* 05084C 8004FC4C 46203220 */ cvt.s.d $f8, $f6 /* 050850 8004FC50 C4316600 */ lwc1 $f17, %lo(D_800E6600)($at) -/* 050854 8004FC54 C4306604 */ lwc1 $f16, %lo(D_800E6604)($at) +/* 050854 8004FC54 C4306604 */ lwc1 $f16, %lo(D_800E6600 + 4)($at) /* 050858 8004FC58 460042A1 */ cvt.d.s $f10, $f8 /* 05085C 8004FC5C 46305102 */ mul.d $f4, $f10, $f16 /* 050860 8004FC60 C7B200C4 */ lwc1 $f18, 0xc4($sp) @@ -358,20 +358,20 @@ glabel func_8004F7F4 /* 0508D0 8004FCD0 02202025 */ move $a0, $s1 /* 0508D4 8004FCD4 1140000A */ beqz $t2, .L8004FD00 /* 0508D8 8004FCD8 02002825 */ move $a1, $s0 -/* 0508DC 8004FCDC 3C01800E */ lui $at, %hi(D_800E660C) # $at, 0x800e +/* 0508DC 8004FCDC 3C01800E */ lui $at, %hi(D_800E6608 + 4) # $at, 0x800e /* 0508E0 8004FCE0 C60800A8 */ lwc1 $f8, 0xa8($s0) /* 0508E4 8004FCE4 C4256608 */ lwc1 $f5, %lo(D_800E6608)($at) -/* 0508E8 8004FCE8 C424660C */ lwc1 $f4, %lo(D_800E660C)($at) +/* 0508E8 8004FCE8 C424660C */ lwc1 $f4, %lo(D_800E6608 + 4)($at) /* 0508EC 8004FCEC 460044A1 */ cvt.d.s $f18, $f8 /* 0508F0 8004FCF0 46249281 */ sub.d $f10, $f18, $f4 /* 0508F4 8004FCF4 462051A0 */ cvt.s.d $f6, $f10 /* 0508F8 8004FCF8 10000009 */ b .L8004FD20 /* 0508FC 8004FCFC E60600A8 */ swc1 $f6, 0xa8($s0) .L8004FD00: -/* 050900 8004FD00 3C01800E */ lui $at, %hi(D_800E6614) # $at, 0x800e +/* 050900 8004FD00 3C01800E */ lui $at, %hi(D_800E6610 + 4) # $at, 0x800e /* 050904 8004FD04 C61000A8 */ lwc1 $f16, 0xa8($s0) /* 050908 8004FD08 C4336610 */ lwc1 $f19, %lo(D_800E6610)($at) -/* 05090C 8004FD0C C4326614 */ lwc1 $f18, %lo(D_800E6614)($at) +/* 05090C 8004FD0C C4326614 */ lwc1 $f18, %lo(D_800E6610 + 4)($at) /* 050910 8004FD10 46008221 */ cvt.d.s $f8, $f16 /* 050914 8004FD14 46324101 */ sub.d $f4, $f8, $f18 /* 050918 8004FD18 462022A0 */ cvt.s.d $f10, $f4 @@ -383,15 +383,15 @@ glabel func_8004F7F4 /* 05092C 8004FD2C 0C016420 */ jal func_80059080 /* 050930 8004FD30 27A700B0 */ addiu $a3, $sp, 0xb0 /* 050934 8004FD34 920C01F0 */ lbu $t4, 0x1f0($s0) -# Used to access D_800E6620 and D_800E6624. +# Used to access D_800E6620 and D_800E6620 + 4. /* 050938 8004FD38 3C01800E */ lui $at, %hi(D_800E6620) # $at, 0x800e /* 05093C 8004FD3C 1180000A */ beqz $t4, .L8004FD68 /* 050940 8004FD40 00000000 */ nop -# Used to access D_800E6618 and D_800E661C. +# Used to access D_800E6618 and D_800E6618 + 4. /* 050944 8004FD44 3C01800E */ lui $at, %hi(D_800E6618) # $at, 0x800e /* 050948 8004FD48 C60600A8 */ lwc1 $f6, 0xa8($s0) /* 05094C 8004FD4C C4296618 */ lwc1 $f9, %lo(D_800E6618)($at) -/* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E661C)($at) +/* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E6618 + 4)($at) /* 050954 8004FD54 46003421 */ cvt.d.s $f16, $f6 /* 050958 8004FD58 46288480 */ add.d $f18, $f16, $f8 /* 05095C 8004FD5C 46209120 */ cvt.s.d $f4, $f18 @@ -400,7 +400,7 @@ glabel func_8004F7F4 .L8004FD68: /* 050968 8004FD68 C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 05096C 8004FD6C C4316620 */ lwc1 $f17, %lo(D_800E6620)($at) -/* 050970 8004FD70 C4306624 */ lwc1 $f16, %lo(D_800E6624)($at) +/* 050970 8004FD70 C4306624 */ lwc1 $f16, %lo(D_800E6620 + 4)($at) /* 050974 8004FD74 460051A1 */ cvt.d.s $f6, $f10 /* 050978 8004FD78 46303200 */ add.d $f8, $f6, $f16 /* 05097C 8004FD7C 462044A0 */ cvt.s.d $f18, $f8 @@ -534,12 +534,12 @@ glabel func_8004F7F4 .L8004FF5C: /* 050B5C 8004FF5C 3C188012 */ lui $t8, %hi(D_8011D552) # $t8, 0x8012 /* 050B60 8004FF60 9718D552 */ lhu $t8, %lo(D_8011D552)($t8) -/* 050B64 8004FF64 3C01800E */ lui $at, %hi(D_800E662C) # $at, 0x800e +/* 050B64 8004FF64 3C01800E */ lui $at, %hi(D_800E6628 + 4) # $at, 0x800e /* 050B68 8004FF68 2719FFD8 */ addiu $t9, $t8, -0x28 /* 050B6C 8004FF6C 44999000 */ mtc1 $t9, $f18 /* 050B70 8004FF70 C42B6628 */ lwc1 $f11, %lo(D_800E6628)($at) /* 050B74 8004FF74 46809220 */ cvt.s.w $f8, $f18 -/* 050B78 8004FF78 C42A662C */ lwc1 $f10, %lo(D_800E662C)($at) +/* 050B78 8004FF78 C42A662C */ lwc1 $f10, %lo(D_800E6628 + 4)($at) /* 050B7C 8004FF7C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 050B80 8004FF80 46004121 */ cvt.d.s $f4, $f8 /* 050B84 8004FF84 462A2402 */ mul.d $f16, $f4, $f10 @@ -605,7 +605,7 @@ glabel func_8004F7F4 /* 050C68 80050068 C7A800B8 */ lwc1 $f8, 0xb8($sp) /* 050C6C 8005006C E7B200B4 */ swc1 $f18, 0xb4($sp) /* 050C70 80050070 821901D2 */ lb $t9, 0x1d2($s0) -/* 050C74 80050074 3C01800E */ lui $at, %hi(D_800E6634) # $at, 0x800e +/* 050C74 80050074 3C01800E */ lui $at, %hi(D_800E6630 + 4) # $at, 0x800e /* 050C78 80050078 13200009 */ beqz $t9, .L800500A0 /* 050C7C 8005007C 00000000 */ nop /* 050C80 80050080 C604011C */ lwc1 $f4, 0x11c($s0) @@ -623,7 +623,7 @@ glabel func_8004F7F4 /* 050CAC 800500AC 00000000 */ nop /* 050CB0 800500B0 C7A800B8 */ lwc1 $f8, 0xb8($sp) /* 050CB4 800500B4 C4236630 */ lwc1 $f3, %lo(D_800E6630)($at) -/* 050CB8 800500B8 C4226634 */ lwc1 $f2, %lo(D_800E6634)($at) +/* 050CB8 800500B8 C4226634 */ lwc1 $f2, %lo(D_800E6630 + 4)($at) /* 050CBC 800500BC 46004121 */ cvt.d.s $f4, $f8 /* 050CC0 800500C0 46222282 */ mul.d $f10, $f4, $f2 /* 050CC4 800500C4 C7B000B4 */ lwc1 $f16, 0xb4($sp) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index 1938d2c6..91c53c2a 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -74,11 +74,11 @@ glabel func_80050A28 /* 051698 80050A98 31F8001F */ andi $t8, $t7, 0x1f /* 05169C 80050A9C 0338C821 */ addu $t9, $t9, $t8 /* 0516A0 80050AA0 8339CDB0 */ lb $t9, %lo(D_800DCDB0)($t9) -/* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E663C) # $at, 0x800e +/* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E6638 + 4) # $at, 0x800e /* 0516A8 80050AA8 44995000 */ mtc1 $t9, $f10 /* 0516AC 80050AAC C4276638 */ lwc1 $f7, %lo(D_800E6638)($at) /* 0516B0 80050AB0 468054A0 */ cvt.s.w $f18, $f10 -/* 0516B4 80050AB4 C426663C */ lwc1 $f6, %lo(D_800E663C)($at) +/* 0516B4 80050AB4 C426663C */ lwc1 $f6, %lo(D_800E6638 + 4)($at) /* 0516B8 80050AB8 C60A00A0 */ lwc1 $f10, 0xa0($s0) /* 0516BC 80050ABC 46009121 */ cvt.d.s $f4, $f18 /* 0516C0 80050AC0 46262202 */ mul.d $f8, $f4, $f6 @@ -181,10 +181,10 @@ glabel func_80050A28 /* 051824 80050C24 A20001FB */ sb $zero, 0x1fb($s0) .L80050C28: /* 051828 80050C28 AFA00060 */ sw $zero, 0x60($sp) -/* 05182C 80050C2C 3C01800E */ lui $at, %hi(D_800E6644) # $at, 0x800e +/* 05182C 80050C2C 3C01800E */ lui $at, %hi(D_800E6640 + 4) # $at, 0x800e /* 051830 80050C30 C60600B8 */ lwc1 $f6, 0xb8($s0) /* 051834 80050C34 C4256640 */ lwc1 $f5, %lo(D_800E6640)($at) -/* 051838 80050C38 C4246644 */ lwc1 $f4, %lo(D_800E6644)($at) +/* 051838 80050C38 C4246644 */ lwc1 $f4, %lo(D_800E6640 + 4)($at) /* 05183C 80050C3C 460032A1 */ cvt.d.s $f10, $f6 /* 051840 80050C40 462A203C */ c.lt.d $f4, $f10 /* 051844 80050C44 00000000 */ nop @@ -463,11 +463,11 @@ glabel func_80050A28 /* 051C2C 8005102C 13000019 */ beqz $t8, .L80051094 /* 051C30 80051030 00000000 */ nop /* 051C34 80051034 820401E6 */ lb $a0, 0x1e6($s0) -/* 051C38 80051038 3C01800E */ lui $at, %hi(D_800E664C) # $at, 0x800e +/* 051C38 80051038 3C01800E */ lui $at, %hi(D_800E6648 + 4) # $at, 0x800e /* 051C3C 8005103C 10800015 */ beqz $a0, .L80051094 /* 051C40 80051040 3C198012 */ lui $t9, %hi(D_8011D534) # $t9, 0x8012 /* 051C44 80051044 C4296648 */ lwc1 $f9, %lo(D_800E6648)($at) -/* 051C48 80051048 C428664C */ lwc1 $f8, %lo(D_800E664C)($at) +/* 051C48 80051048 C428664C */ lwc1 $f8, %lo(D_800E6648 + 4)($at) /* 051C4C 8005104C 46000121 */ cvt.d.s $f4, $f0 /* 051C50 80051050 46282182 */ mul.d $f6, $f4, $f8 /* 051C54 80051054 8F39D534 */ lw $t9, %lo(D_8011D534)($t9) @@ -627,7 +627,7 @@ glabel func_80050A28 /* 051E78 80051278 2406000C */ li $a2, 12 .L8005127C: /* 051E7C 8005127C 10400006 */ beqz $v0, .L80051298 -/* 051E80 80051280 3C01800E */ lui $at, %hi(D_800E6654) # $at, 0x800e +/* 051E80 80051280 3C01800E */ lui $at, %hi(D_800E6650 + 4) # $at, 0x800e /* 051E84 80051284 820A01E6 */ lb $t2, 0x1e6($s0) /* 051E88 80051288 00000000 */ nop /* 051E8C 8005128C 11400002 */ beqz $t2, .L80051298 @@ -636,19 +636,19 @@ glabel func_80050A28 .L80051298: /* 051E98 80051298 C60A002C */ lwc1 $f10, 0x2c($s0) /* 051E9C 8005129C C4256650 */ lwc1 $f5, %lo(D_800E6650)($at) -/* 051EA0 800512A0 C4246654 */ lwc1 $f4, %lo(D_800E6654)($at) +/* 051EA0 800512A0 C4246654 */ lwc1 $f4, %lo(D_800E6650 + 4)($at) /* 051EA4 800512A4 460050A1 */ cvt.d.s $f2, $f10 /* 051EA8 800512A8 4624103C */ c.lt.d $f2, $f4 /* 051EAC 800512AC 00001025 */ move $v0, $zero /* 051EB0 800512B0 45000005 */ bc1f .L800512C8 -/* 051EB4 800512B4 3C01800E */ lui $at, %hi(D_800E665C) # $at, 0x800e +/* 051EB4 800512B4 3C01800E */ lui $at, %hi(D_800E6658 + 4) # $at, 0x800e /* 051EB8 800512B8 00660019 */ multu $v1, $a2 /* 051EBC 800512BC 00001012 */ mflo $v0 /* 051EC0 800512C0 00000000 */ nop /* 051EC4 800512C4 00000000 */ nop .L800512C8: /* 051EC8 800512C8 C4296658 */ lwc1 $f9, %lo(D_800E6658)($at) -/* 051ECC 800512CC C428665C */ lwc1 $f8, %lo(D_800E665C)($at) +/* 051ECC 800512CC C428665C */ lwc1 $f8, %lo(D_800E6658 + 4)($at) /* 051ED0 800512D0 8FB90080 */ lw $t9, 0x80($sp) /* 051ED4 800512D4 4622403C */ c.lt.d $f8, $f2 /* 051ED8 800512D8 00000000 */ nop @@ -930,14 +930,14 @@ glabel func_80050A28 /* 0522E4 800516E4 460A6202 */ mul.s $f8, $f12, $f10 /* 0522E8 800516E8 C6120030 */ lwc1 $f18, 0x30($s0) /* 0522EC 800516EC 860E0000 */ lh $t6, ($s0) -/* 0522F0 800516F0 3C01800E */ lui $at, %hi(D_800E666C) # $at, 0x800e +/* 0522F0 800516F0 3C01800E */ lui $at, %hi(D_800E6668 + 4) # $at, 0x800e /* 0522F4 800516F4 46044183 */ div.s $f6, $f8, $f4 /* 0522F8 800516F8 46069280 */ add.s $f10, $f18, $f6 /* 0522FC 800516FC 146E0008 */ bne $v1, $t6, .L80051720 /* 052300 80051700 E60A0030 */ swc1 $f10, 0x30($s0) /* 052304 80051704 C6080030 */ lwc1 $f8, 0x30($s0) /* 052308 80051708 C4336668 */ lwc1 $f19, %lo(D_800E6668)($at) -/* 05230C 8005170C C432666C */ lwc1 $f18, %lo(D_800E666C)($at) +/* 05230C 8005170C C432666C */ lwc1 $f18, %lo(D_800E6668 + 4)($at) /* 052310 80051710 46004121 */ cvt.d.s $f4, $f8 /* 052314 80051714 46322182 */ mul.d $f6, $f4, $f18 /* 052318 80051718 462032A0 */ cvt.s.d $f10, $f6 @@ -987,9 +987,9 @@ glabel func_80050A28 /* 0523C0 800517C0 AC2AD554 */ sw $t2, %lo(D_8011D554)($at) /* 0523C4 800517C4 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 0523C8 800517C8 44814800 */ mtc1 $at, $f9 -/* 0523CC 800517CC 3C01800E */ lui $at, %hi(D_800E6674) # $at, 0x800e +/* 0523CC 800517CC 3C01800E */ lui $at, %hi(D_800E6670 + 4) # $at, 0x800e /* 0523D0 800517D0 C4336670 */ lwc1 $f19, %lo(D_800E6670)($at) -/* 0523D4 800517D4 C4326674 */ lwc1 $f18, %lo(D_800E6674)($at) +/* 0523D4 800517D4 C4326674 */ lwc1 $f18, %lo(D_800E6670 + 4)($at) /* 0523D8 800517D8 462C4101 */ sub.d $f4, $f8, $f12 /* 0523DC 800517DC 46322182 */ mul.d $f6, $f4, $f18 /* 0523E0 800517E0 00000000 */ nop @@ -1338,13 +1338,13 @@ glabel func_80050A28 /* 0528E4 80051CE4 C46A0004 */ lwc1 $f10, 4($v1) /* 0528E8 80051CE8 460091A1 */ cvt.d.s $f6, $f18 /* 0528EC 80051CEC 46283102 */ mul.d $f4, $f6, $f8 -/* 0528F0 80051CF0 3C01800E */ lui $at, %hi(D_800E667C) # $at, 0x800e +/* 0528F0 80051CF0 3C01800E */ lui $at, %hi(D_800E6678 + 4) # $at, 0x800e /* 0528F4 80051CF4 820B01D3 */ lb $t3, 0x1d3($s0) /* 0528F8 80051CF8 46005482 */ mul.s $f18, $f10, $f0 /* 0528FC 80051CFC C4336678 */ lwc1 $f19, %lo(D_800E6678)($at) /* 052900 80051D00 460091A1 */ cvt.d.s $f6, $f18 /* 052904 80051D04 46262200 */ add.d $f8, $f4, $f6 -/* 052908 80051D08 C432667C */ lwc1 $f18, %lo(D_800E667C)($at) +/* 052908 80051D08 C432667C */ lwc1 $f18, %lo(D_800E6678 + 4)($at) /* 05290C 80051D0C 462043A0 */ cvt.s.d $f14, $f8 /* 052910 80051D10 C7A60034 */ lwc1 $f6, 0x34($sp) /* 052914 80051D14 460072A1 */ cvt.d.s $f10, $f14 @@ -1404,9 +1404,9 @@ glabel func_80050A28 /* 0529DC 80051DDC 00000000 */ nop /* 0529E0 80051DE0 11C0002A */ beqz $t6, .L80051E8C .L80051DE4: -/* 0529E4 80051DE4 3C01800E */ lui $at, %hi(D_800E6684) # $at, 0x800e +/* 0529E4 80051DE4 3C01800E */ lui $at, %hi(D_800E6680 + 4) # $at, 0x800e /* 0529E8 80051DE8 C4296680 */ lwc1 $f9, %lo(D_800E6680)($at) -/* 0529EC 80051DEC C4286684 */ lwc1 $f8, %lo(D_800E6684)($at) +/* 0529EC 80051DEC C4286684 */ lwc1 $f8, %lo(D_800E6680 + 4)($at) /* 0529F0 80051DF0 46228181 */ sub.d $f6, $f16, $f2 /* 0529F4 80051DF4 24010004 */ li $at, 4 /* 0529F8 80051DF8 46283282 */ mul.d $f10, $f6, $f8 @@ -1436,9 +1436,9 @@ glabel func_80050A28 /* 052A54 80051E54 00000000 */ nop /* 052A58 80051E58 2B210005 */ slti $at, $t9, 5 /* 052A5C 80051E5C 14200006 */ bnez $at, .L80051E78 -/* 052A60 80051E60 3C01800E */ lui $at, %hi(D_800E668C) # $at, 0x800e +/* 052A60 80051E60 3C01800E */ lui $at, %hi(D_800E6688 + 4) # $at, 0x800e /* 052A64 80051E64 C42B6688 */ lwc1 $f11, %lo(D_800E6688)($at) -/* 052A68 80051E68 C42A668C */ lwc1 $f10, %lo(D_800E668C)($at) +/* 052A68 80051E68 C42A668C */ lwc1 $f10, %lo(D_800E6688 + 4)($at) /* 052A6C 80051E6C 46000221 */ cvt.d.s $f8, $f0 /* 052A70 80051E70 462A4482 */ mul.d $f18, $f8, $f10 /* 052A74 80051E74 46209020 */ cvt.s.d $f0, $f18 @@ -1450,10 +1450,10 @@ glabel func_80050A28 /* 052A88 80051E88 E60600B8 */ swc1 $f6, 0xb8($s0) .L80051E8C: /* 052A8C 80051E8C C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 052A90 80051E90 3C01800E */ lui $at, %hi(D_800E6694) # $at, 0x800e +/* 052A90 80051E90 3C01800E */ lui $at, %hi(D_800E6690 + 4) # $at, 0x800e /* 052A94 80051E94 460E4282 */ mul.s $f10, $f8, $f14 /* 052A98 80051E98 C4256690 */ lwc1 $f5, %lo(D_800E6690)($at) -/* 052A9C 80051E9C C4246694 */ lwc1 $f4, %lo(D_800E6694)($at) +/* 052A9C 80051E9C C4246694 */ lwc1 $f4, %lo(D_800E6690 + 4)($at) /* 052AA0 80051EA0 C60800B4 */ lwc1 $f8, 0xb4($s0) /* 052AA4 80051EA4 460054A1 */ cvt.d.s $f18, $f10 /* 052AA8 80051EA8 46249182 */ mul.d $f6, $f18, $f4 @@ -1464,15 +1464,15 @@ glabel func_80050A28 /* 052ABC 80051EBC 44805000 */ mtc1 $zero, $f10 /* 052AC0 80051EC0 E612002C */ swc1 $f18, 0x2c($s0) /* 052AC4 80051EC4 C60C002C */ lwc1 $f12, 0x2c($s0) -/* 052AC8 80051EC8 C424669C */ lwc1 $f4, %lo(D_800E669C)($at) +/* 052AC8 80051EC8 C424669C */ lwc1 $f4, %lo(D_800E6698 + 4)($at) /* 052ACC 80051ECC C4256698 */ lwc1 $f5, %lo(D_800E6698)($at) /* 052AD0 80051ED0 460060A1 */ cvt.d.s $f2, $f12 /* 052AD4 80051ED4 4622203C */ c.lt.d $f4, $f2 /* 052AD8 80051ED8 00000000 */ nop /* 052ADC 80051EDC 4500000D */ bc1f .L80051F14 -/* 052AE0 80051EE0 3C01800E */ lui $at, %hi(D_800E66A4) # $at, 0x800e +/* 052AE0 80051EE0 3C01800E */ lui $at, %hi(D_800E66A0 + 4) # $at, 0x800e /* 052AE4 80051EE4 C42766A0 */ lwc1 $f7, %lo(D_800E66A0)($at) -/* 052AE8 80051EE8 C42666A4 */ lwc1 $f6, %lo(D_800E66A4)($at) +/* 052AE8 80051EE8 C42666A4 */ lwc1 $f6, %lo(D_800E66A0 + 4)($at) /* 052AEC 80051EEC 00000000 */ nop /* 052AF0 80051EF0 4626103C */ c.lt.d $f2, $f6 /* 052AF4 80051EF4 00000000 */ nop @@ -1519,7 +1519,7 @@ glabel func_80050A28 /* 052B8C 80051F8C C4C80020 */ lwc1 $f8, 0x20($a2) /* 052B90 80051F90 460A7482 */ mul.s $f18, $f14, $f10 /* 052B94 80051F94 3C0D8012 */ lui $t5, %hi(D_8011D586) # $t5, 0x8012 -/* 052B98 80051F98 3C01800E */ lui $at, %hi(D_800E66AC) # $at, 0x800e +/* 052B98 80051F98 3C01800E */ lui $at, %hi(D_800E66A8 + 4) # $at, 0x800e /* 052B9C 80051F9C 46124101 */ sub.s $f4, $f8, $f18 /* 052BA0 80051FA0 E4C40020 */ swc1 $f4, 0x20($a2) /* 052BA4 80051FA4 85ADD586 */ lh $t5, %lo(D_8011D586)($t5) @@ -1531,7 +1531,7 @@ glabel func_80050A28 .L80051FBC: /* 052BBC 80051FBC C60600B8 */ lwc1 $f6, 0xb8($s0) /* 052BC0 80051FC0 C42966A8 */ lwc1 $f9, %lo(D_800E66A8)($at) -/* 052BC4 80051FC4 C42866AC */ lwc1 $f8, %lo(D_800E66AC)($at) +/* 052BC4 80051FC4 C42866AC */ lwc1 $f8, %lo(D_800E66A8 + 4)($at) /* 052BC8 80051FC8 460032A1 */ cvt.d.s $f10, $f6 /* 052BCC 80051FCC 4628503C */ c.lt.d $f10, $f8 /* 052BD0 80051FD0 00000000 */ nop @@ -1551,11 +1551,11 @@ glabel func_80050A28 /* 052C08 80052008 44802000 */ mtc1 $zero, $f4 /* 052C0C 8005200C 460064A1 */ cvt.d.s $f18, $f12 /* 052C10 80052010 4624903C */ c.lt.d $f18, $f4 -/* 052C14 80052014 3C01800E */ lui $at, %hi(D_800E66B4) # $at, 0x800e +/* 052C14 80052014 3C01800E */ lui $at, %hi(D_800E66B0 + 4) # $at, 0x800e /* 052C18 80052018 45000020 */ bc1f .L8005209C /* 052C1C 8005201C 46006086 */ mov.s $f2, $f12 /* 052C20 80052020 C42B66B0 */ lwc1 $f11, %lo(D_800E66B0)($at) -/* 052C24 80052024 C42A66B4 */ lwc1 $f10, %lo(D_800E66B4)($at) +/* 052C24 80052024 C42A66B4 */ lwc1 $f10, %lo(D_800E66B0 + 4)($at) /* 052C28 80052028 46001087 */ neg.s $f2, $f2 /* 052C2C 8005202C 460011A1 */ cvt.d.s $f6, $f2 /* 052C30 80052030 462A3201 */ sub.d $f8, $f6, $f10 @@ -1564,7 +1564,7 @@ glabel func_80050A28 /* 052C3C 8005203C 44809000 */ mtc1 $zero, $f18 /* 052C40 80052040 46001021 */ cvt.d.s $f0, $f2 /* 052C44 80052044 4632003C */ c.lt.d $f0, $f18 -/* 052C48 80052048 3C01800E */ lui $at, %hi(D_800E66BC) # $at, 0x800e +/* 052C48 80052048 3C01800E */ lui $at, %hi(D_800E66B8 + 4) # $at, 0x800e /* 052C4C 8005204C 45000004 */ bc1f .L80052060 /* 052C50 80052050 00000000 */ nop /* 052C54 80052054 44801000 */ mtc1 $zero, $f2 @@ -1572,7 +1572,7 @@ glabel func_80050A28 /* 052C5C 8005205C 46001021 */ cvt.d.s $f0, $f2 .L80052060: /* 052C60 80052060 C42566B8 */ lwc1 $f5, %lo(D_800E66B8)($at) -/* 052C64 80052064 C42466BC */ lwc1 $f4, %lo(D_800E66BC)($at) +/* 052C64 80052064 C42466BC */ lwc1 $f4, %lo(D_800E66B8 + 4)($at) /* 052C68 80052068 3C01800E */ lui $at, %hi(D_800E66C0) # $at, 0x800e /* 052C6C 8005206C 4620203C */ c.lt.d $f4, $f0 /* 052C70 80052070 00000000 */ nop @@ -1604,10 +1604,10 @@ glabel func_80050A28 /* 052CCC 800520CC 460A4480 */ add.s $f18, $f8, $f10 /* 052CD0 800520D0 E612002C */ swc1 $f18, 0x2c($s0) .L800520D4: -/* 052CD4 800520D4 3C01800E */ lui $at, %hi(D_800E66CC) # $at, 0x800e +/* 052CD4 800520D4 3C01800E */ lui $at, %hi(D_800E66C8 + 4) # $at, 0x800e /* 052CD8 800520D8 C606002C */ lwc1 $f6, 0x2c($s0) /* 052CDC 800520DC C42B66C8 */ lwc1 $f11, %lo(D_800E66C8)($at) -/* 052CE0 800520E0 C42A66CC */ lwc1 $f10, %lo(D_800E66CC)($at) +/* 052CE0 800520E0 C42A66CC */ lwc1 $f10, %lo(D_800E66C8 + 4)($at) /* 052CE4 800520E4 46003221 */ cvt.d.s $f8, $f6 /* 052CE8 800520E8 462A4482 */ mul.d $f18, $f8, $f10 /* 052CEC 800520EC C6040008 */ lwc1 $f4, 8($s0) diff --git a/asm/non_matchings/unknown_043920/func_80052B64.s b/asm/non_matchings/unknown_043920/func_80052B64.s index c4a3ea52..6b3cf658 100644 --- a/asm/non_matchings/unknown_043920/func_80052B64.s +++ b/asm/non_matchings/unknown_043920/func_80052B64.s @@ -9,10 +9,10 @@ glabel func_80052B64 /* 05376C 80052B6C AFB00018 */ sw $s0, 0x18($sp) /* 053770 80052B70 AFA50024 */ sw $a1, 0x24($sp) /* 053774 80052B74 AFA7002C */ sw $a3, 0x2c($sp) -/* 053778 80052B78 3C01800E */ lui $at, %hi(D_800E66F4) # $at, 0x800e +/* 053778 80052B78 3C01800E */ lui $at, %hi(D_800E66F0 + 4) # $at, 0x800e /* 05377C 80052B7C C4A4002C */ lwc1 $f4, 0x2c($a1) /* 053780 80052B80 C42966F0 */ lwc1 $f9, %lo(D_800E66F0)($at) -/* 053784 80052B84 C42866F4 */ lwc1 $f8, %lo(D_800E66F4)($at) +/* 053784 80052B84 C42866F4 */ lwc1 $f8, %lo(D_800E66F0 + 4)($at) /* 053788 80052B88 460021A1 */ cvt.d.s $f6, $f4 /* 05378C 80052B8C 46283282 */ mul.d $f10, $f6, $f8 /* 053790 80052B90 44809000 */ mtc1 $zero, $f18 diff --git a/asm/non_matchings/unknown_043920/func_80052D7C.s b/asm/non_matchings/unknown_043920/func_80052D7C.s index b8f90151..647a5877 100644 --- a/asm/non_matchings/unknown_043920/func_80052D7C.s +++ b/asm/non_matchings/unknown_043920/func_80052D7C.s @@ -195,11 +195,11 @@ glabel func_80052D7C /* 053BE0 80052FE0 462084A0 */ cvt.s.d $f18, $f16 /* 053BE4 80052FE4 E4B2002C */ swc1 $f18, 0x2c($a1) .L80052FE8: -/* 053BE8 80052FE8 3C01800E */ lui $at, %hi(D_800E66FC) # $at, 0x800e +/* 053BE8 80052FE8 3C01800E */ lui $at, %hi(D_800E66F8 + 4) # $at, 0x800e /* 053BEC 80052FEC A3AF0033 */ sb $t7, 0x33($sp) /* 053BF0 80052FF0 C4A60030 */ lwc1 $f6, 0x30($a1) /* 053BF4 80052FF4 C42166F8 */ lwc1 $f1, %lo(D_800E66F8)($at) -/* 053BF8 80052FF8 C42066FC */ lwc1 $f0, %lo(D_800E66FC)($at) +/* 053BF8 80052FF8 C42066FC */ lwc1 $f0, %lo(D_800E66F8 + 4)($at) /* 053BFC 80052FFC 46003121 */ cvt.d.s $f4, $f6 /* 053C00 80053000 46202202 */ mul.d $f8, $f4, $f0 /* 053C04 80053004 C4B0002C */ lwc1 $f16, 0x2c($a1) @@ -215,7 +215,7 @@ glabel func_80052D7C /* 053C2C 8005302C 24C6D4F8 */ addiu $a2, %lo(D_8011D4F8) # addiu $a2, $a2, -0x2b08 /* 053C30 80053030 E4A4002C */ swc1 $f4, 0x2c($a1) /* 053C34 80053034 8FA40040 */ lw $a0, 0x40($sp) -/* 053C38 80053038 C4306704 */ lwc1 $f16, %lo(D_800E6704)($at) +/* 053C38 80053038 C4306704 */ lwc1 $f16, %lo(D_800E6700 + 4)($at) /* 053C3C 8005303C C4880020 */ lwc1 $f8, 0x20($a0) /* 053C40 80053040 C4316700 */ lwc1 $f17, %lo(D_800E6700)($at) /* 053C44 80053044 460042A1 */ cvt.d.s $f10, $f8 @@ -244,7 +244,7 @@ glabel func_80052D7C /* 053C9C 8005309C A0AA01E8 */ sb $t2, 0x1e8($a1) .L800530A0: /* 053CA0 800530A0 80A201D3 */ lb $v0, 0x1d3($a1) -/* 053CA4 800530A4 3C01800E */ lui $at, %hi(D_800E670C) # $at, 0x800e +/* 053CA4 800530A4 3C01800E */ lui $at, %hi(D_800E6708 + 4) # $at, 0x800e /* 053CA8 800530A8 18400006 */ blez $v0, .L800530C4 /* 053CAC 800530AC 24C6D554 */ addiu $a2, %lo(D_8011D554) # addiu $a2, $a2, -0x2aac /* 053CB0 800530B0 8FAB0048 */ lw $t3, 0x48($sp) @@ -258,7 +258,7 @@ glabel func_80052D7C /* 053CC8 800530C8 C4AA002C */ lwc1 $f10, 0x2c($a1) /* 053CCC 800530CC 80A201E8 */ lb $v0, 0x1e8($a1) /* 053CD0 800530D0 C4296708 */ lwc1 $f9, %lo(D_800E6708)($at) -/* 053CD4 800530D4 C428670C */ lwc1 $f8, %lo(D_800E670C)($at) +/* 053CD4 800530D4 C428670C */ lwc1 $f8, %lo(D_800E6708 + 4)($at) /* 053CD8 800530D8 46005421 */ cvt.d.s $f16, $f10 /* 053CDC 800530DC 4630403C */ c.lt.d $f8, $f16 /* 053CE0 800530E0 00027080 */ sll $t6, $v0, 2 @@ -286,11 +286,11 @@ glabel func_80052D7C /* 053D34 80053134 44803000 */ mtc1 $zero, $f6 /* 053D38 80053138 46009021 */ cvt.d.s $f0, $f18 /* 053D3C 8005313C 4620303C */ c.lt.d $f6, $f0 -/* 053D40 80053140 3C01800E */ lui $at, %hi(D_800E6714) # $at, 0x800e +/* 053D40 80053140 3C01800E */ lui $at, %hi(D_800E6710 + 4) # $at, 0x800e /* 053D44 80053144 45000007 */ bc1f .L80053164 /* 053D48 80053148 00000000 */ nop /* 053D4C 8005314C C4256710 */ lwc1 $f5, %lo(D_800E6710)($at) -/* 053D50 80053150 C4246714 */ lwc1 $f4, %lo(D_800E6714)($at) +/* 053D50 80053150 C4246714 */ lwc1 $f4, %lo(D_800E6710 + 4)($at) /* 053D54 80053154 00000000 */ nop /* 053D58 80053158 46240281 */ sub.d $f10, $f0, $f4 /* 053D5C 8005315C 46205220 */ cvt.s.d $f8, $f10 @@ -305,10 +305,10 @@ glabel func_80052D7C /* 053D7C 8005317C 00000000 */ nop /* 053D80 80053180 00001825 */ move $v1, $zero .L80053184: -/* 053D84 80053184 3C01800E */ lui $at, %hi(D_800E671C) # $at, 0x800e +/* 053D84 80053184 3C01800E */ lui $at, %hi(D_800E6718 + 4) # $at, 0x800e /* 053D88 80053188 C5500020 */ lwc1 $f16, 0x20($t2) /* 053D8C 8005318C C4336718 */ lwc1 $f19, %lo(D_800E6718)($at) -/* 053D90 80053190 C432671C */ lwc1 $f18, %lo(D_800E671C)($at) +/* 053D90 80053190 C432671C */ lwc1 $f18, %lo(D_800E6718 + 4)($at) /* 053D94 80053194 46008021 */ cvt.d.s $f0, $f16 /* 053D98 80053198 46320182 */ mul.d $f6, $f0, $f18 /* 053D9C 8005319C C7A4004C */ lwc1 $f4, 0x4c($sp) @@ -349,10 +349,10 @@ glabel func_80052D7C /* 053E20 80053220 24010003 */ li $at, 3 /* 053E24 80053224 14410023 */ bne $v0, $at, .L800532B4 .L80053228: -/* 053E28 80053228 3C01800E */ lui $at, %hi(D_800E672C) # $at, 0x800e +/* 053E28 80053228 3C01800E */ lui $at, %hi(D_800E6728 + 4) # $at, 0x800e /* 053E2C 8005322C C4A40030 */ lwc1 $f4, 0x30($a1) /* 053E30 80053230 C4216728 */ lwc1 $f1, %lo(D_800E6728)($at) -/* 053E34 80053234 C420672C */ lwc1 $f0, %lo(D_800E672C)($at) +/* 053E34 80053234 C420672C */ lwc1 $f0, %lo(D_800E6728 + 4)($at) /* 053E38 80053238 460021A1 */ cvt.d.s $f6, $f4 /* 053E3C 8005323C 46203282 */ mul.d $f10, $f6, $f0 /* 053E40 80053240 C4B0002C */ lwc1 $f16, 0x2c($a1) @@ -366,10 +366,10 @@ glabel func_80052D7C /* 053E60 80053260 E4A6002C */ swc1 $f6, 0x2c($a1) /* 053E64 80053264 14200009 */ bnez $at, .L8005328C /* 053E68 80053268 A3AB0033 */ sb $t3, 0x33($sp) -/* 053E6C 8005326C 3C01800E */ lui $at, %hi(D_800E6734) # $at, 0x800e +/* 053E6C 8005326C 3C01800E */ lui $at, %hi(D_800E6730 + 4) # $at, 0x800e /* 053E70 80053270 C4AA002C */ lwc1 $f10, 0x2c($a1) /* 053E74 80053274 C4316730 */ lwc1 $f17, %lo(D_800E6730)($at) -/* 053E78 80053278 C4306734 */ lwc1 $f16, %lo(D_800E6734)($at) +/* 053E78 80053278 C4306734 */ lwc1 $f16, %lo(D_800E6730 + 4)($at) /* 053E7C 8005327C 46005221 */ cvt.d.s $f8, $f10 /* 053E80 80053280 46304481 */ sub.d $f18, $f8, $f16 /* 053E84 80053284 46209120 */ cvt.s.d $f4, $f18 @@ -377,10 +377,10 @@ glabel func_80052D7C .L8005328C: /* 053E8C 8005328C 2861FFCE */ slti $at, $v1, -0x32 /* 053E90 80053290 10200008 */ beqz $at, .L800532B4 -/* 053E94 80053294 3C01800E */ lui $at, %hi(D_800E673C) # $at, 0x800e +/* 053E94 80053294 3C01800E */ lui $at, %hi(D_800E6738 + 4) # $at, 0x800e /* 053E98 80053298 C4A6002C */ lwc1 $f6, 0x2c($a1) /* 053E9C 8005329C C4296738 */ lwc1 $f9, %lo(D_800E6738)($at) -/* 053EA0 800532A0 C428673C */ lwc1 $f8, %lo(D_800E673C)($at) +/* 053EA0 800532A0 C428673C */ lwc1 $f8, %lo(D_800E6738 + 4)($at) /* 053EA4 800532A4 460032A1 */ cvt.d.s $f10, $f6 /* 053EA8 800532A8 46285400 */ add.d $f16, $f10, $f8 /* 053EAC 800532AC 462084A0 */ cvt.s.d $f18, $f16 @@ -412,18 +412,18 @@ glabel func_80052D7C /* 053F10 80053310 80B901D3 */ lb $t9, 0x1d3($a1) .L80053314: /* 053F14 80053314 14200006 */ bnez $at, .L80053330 -/* 053F18 80053318 3C01800E */ lui $at, %hi(D_800E6744) # $at, 0x800e +/* 053F18 80053318 3C01800E */ lui $at, %hi(D_800E6740 + 4) # $at, 0x800e /* 053F1C 8005331C C4276740 */ lwc1 $f7, %lo(D_800E6740)($at) -/* 053F20 80053320 C4266744 */ lwc1 $f6, %lo(D_800E6744)($at) +/* 053F20 80053320 C4266744 */ lwc1 $f6, %lo(D_800E6740 + 4)($at) /* 053F24 80053324 46001121 */ cvt.d.s $f4, $f2 /* 053F28 80053328 46262282 */ mul.d $f10, $f4, $f6 /* 053F2C 8005332C 462050A0 */ cvt.s.d $f2, $f10 .L80053330: /* 053F30 80053330 2861FFCE */ slti $at, $v1, -0x32 /* 053F34 80053334 10200006 */ beqz $at, .L80053350 -/* 053F38 80053338 3C01800E */ lui $at, %hi(D_800E674C) # $at, 0x800e +/* 053F38 80053338 3C01800E */ lui $at, %hi(D_800E6748 + 4) # $at, 0x800e /* 053F3C 8005333C C4316748 */ lwc1 $f17, %lo(D_800E6748)($at) -/* 053F40 80053340 C430674C */ lwc1 $f16, %lo(D_800E674C)($at) +/* 053F40 80053340 C430674C */ lwc1 $f16, %lo(D_800E6748 + 4)($at) /* 053F44 80053344 46001221 */ cvt.d.s $f8, $f2 /* 053F48 80053348 46304482 */ mul.d $f18, $f8, $f16 /* 053F4C 8005334C 462090A0 */ cvt.s.d $f2, $f18 diff --git a/asm/non_matchings/unknown_043920/func_80053478.s b/asm/non_matchings/unknown_043920/func_80053478.s index 17e71be2..4acb685e 100644 --- a/asm/non_matchings/unknown_043920/func_80053478.s +++ b/asm/non_matchings/unknown_043920/func_80053478.s @@ -14,14 +14,14 @@ glabel func_80053478 /* 054080 80053480 44806000 */ mtc1 $zero, $f12 /* 054084 80053484 460000A1 */ cvt.d.s $f2, $f0 /* 054088 80053488 462C103C */ c.lt.d $f2, $f12 -/* 05408C 8005348C 3C01800E */ lui $at, %hi(D_800E6754) # $at, 0x800e +/* 05408C 8005348C 3C01800E */ lui $at, %hi(D_800E6750 + 4) # $at, 0x800e /* 054090 80053490 45000003 */ bc1f .L800534A0 /* 054094 80053494 00000000 */ nop /* 054098 80053498 46000007 */ neg.s $f0, $f0 /* 05409C 8005349C 460000A1 */ cvt.d.s $f2, $f0 .L800534A0: /* 0540A0 800534A0 C4256750 */ lwc1 $f5, %lo(D_800E6750)($at) -/* 0540A4 800534A4 C4246754 */ lwc1 $f4, %lo(D_800E6754)($at) +/* 0540A4 800534A4 C4246754 */ lwc1 $f4, %lo(D_800E6750 + 4)($at) /* 0540A8 800534A8 3C01800E */ lui $at, %hi(D_800E6758) # $at, 0x800e /* 0540AC 800534AC 4622203C */ c.lt.d $f4, $f2 /* 0540B0 800534B0 00000000 */ nop @@ -31,9 +31,9 @@ glabel func_80053478 /* 0540C0 800534C0 00000000 */ nop /* 0540C4 800534C4 460000A1 */ cvt.d.s $f2, $f0 .L800534C8: -/* 0540C8 800534C8 3C01800E */ lui $at, %hi(D_800E6764) # $at, 0x800e +/* 0540C8 800534C8 3C01800E */ lui $at, %hi(D_800E6760 + 4) # $at, 0x800e /* 0540CC 800534CC C4276760 */ lwc1 $f7, %lo(D_800E6760)($at) -/* 0540D0 800534D0 C4266764 */ lwc1 $f6, %lo(D_800E6764)($at) +/* 0540D0 800534D0 C4266764 */ lwc1 $f6, %lo(D_800E6760 + 4)($at) /* 0540D4 800534D4 3C014268 */ li $at, 0x42680000 # 58.000000 /* 0540D8 800534D8 46261201 */ sub.d $f8, $f2, $f6 /* 0540DC 800534DC 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_043920/func_80053750.s b/asm/non_matchings/unknown_043920/func_80053750.s index 5d594aa1..42662baa 100644 --- a/asm/non_matchings/unknown_043920/func_80053750.s +++ b/asm/non_matchings/unknown_043920/func_80053750.s @@ -52,10 +52,10 @@ glabel func_80053750 /* 0543EC 800537EC 44810000 */ mtc1 $at, $f0 /* 0543F0 800537F0 00000000 */ nop .L800537F4: -/* 0543F4 800537F4 3C01800E */ lui $at, %hi(D_800E678C) # $at, 0x800e +/* 0543F4 800537F4 3C01800E */ lui $at, %hi(D_800E6788 + 4) # $at, 0x800e /* 0543F8 800537F8 C4C600B8 */ lwc1 $f6, 0xb8($a2) /* 0543FC 800537FC C4236788 */ lwc1 $f3, %lo(D_800E6788)($at) -/* 054400 80053800 C422678C */ lwc1 $f2, %lo(D_800E678C)($at) +/* 054400 80053800 C422678C */ lwc1 $f2, %lo(D_800E6788 + 4)($at) /* 054404 80053804 46003221 */ cvt.d.s $f8, $f6 /* 054408 80053808 4628103C */ c.lt.d $f2, $f8 /* 05440C 8005380C 24020001 */ li $v0, 1 @@ -328,7 +328,7 @@ glabel func_80053750 /* 0547CC 80053BCC 80CB01FB */ lb $t3, 0x1fb($a2) /* 0547D0 80053BD0 24070001 */ li $a3, 1 /* 0547D4 80053BD4 1160002B */ beqz $t3, .L80053C84 -/* 0547D8 80053BD8 3C01800E */ lui $at, %hi(D_800E6794) # $at, 0x800e +/* 0547D8 80053BD8 3C01800E */ lui $at, %hi(D_800E6790 + 4) # $at, 0x800e /* 0547DC 80053BDC 00001025 */ move $v0, $zero /* 0547E0 80053BE0 24030008 */ li $v1, 8 .L80053BE4: @@ -376,10 +376,10 @@ glabel func_80053750 /* 054880 80053C80 AC8B0074 */ sw $t3, 0x74($a0) .L80053C84: /* 054884 80053C84 C4336790 */ lwc1 $f19, %lo(D_800E6790)($at) -/* 054888 80053C88 C4326794 */ lwc1 $f18, %lo(D_800E6794)($at) -/* 05488C 80053C8C 3C01800E */ lui $at, %hi(D_800E679C) # $at, 0x800e +/* 054888 80053C88 C4326794 */ lwc1 $f18, %lo(D_800E6790 + 4)($at) +/* 05488C 80053C8C 3C01800E */ lui $at, %hi(D_800E6798 + 4) # $at, 0x800e /* 054890 80053C90 C4316798 */ lwc1 $f17, %lo(D_800E6798)($at) -/* 054894 80053C94 C430679C */ lwc1 $f16, %lo(D_800E679C)($at) +/* 054894 80053C94 C430679C */ lwc1 $f16, %lo(D_800E6798 + 4)($at) /* 054898 80053C98 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 05489C 80053C9C 44817800 */ mtc1 $at, $f15 /* 0548A0 80053CA0 3C01C120 */ li $at, 0xC1200000 # -10.000000 diff --git a/asm/non_matchings/unknown_043920/func_80053E9C.s b/asm/non_matchings/unknown_043920/func_80053E9C.s index f3468f6a..fb5d6c41 100644 --- a/asm/non_matchings/unknown_043920/func_80053E9C.s +++ b/asm/non_matchings/unknown_043920/func_80053E9C.s @@ -167,10 +167,10 @@ glabel L800540C4 /* 054CC8 800540C8 240C0001 */ li $t4, 1 /* 054CCC 800540CC A20C01F1 */ sb $t4, 0x1f1($s0) /* 054CD0 800540D0 E60A002C */ swc1 $f10, 0x2c($s0) -/* 054CD4 800540D4 3C01800E */ lui $at, %hi(D_800E67C4) # $at, 0x800e +/* 054CD4 800540D4 3C01800E */ lui $at, %hi(D_800E67C0 + 4) # $at, 0x800e /* 054CD8 800540D8 C4900020 */ lwc1 $f16, 0x20($a0) /* 054CDC 800540DC C42567C0 */ lwc1 $f5, %lo(D_800E67C0)($at) -/* 054CE0 800540E0 C42467C4 */ lwc1 $f4, %lo(D_800E67C4)($at) +/* 054CE0 800540E0 C42467C4 */ lwc1 $f4, %lo(D_800E67C0 + 4)($at) /* 054CE4 800540E4 460084A1 */ cvt.d.s $f18, $f16 /* 054CE8 800540E8 46249180 */ add.d $f6, $f18, $f4 /* 054CEC 800540EC 24050139 */ li $a1, 313 diff --git a/asm/non_matchings/unknown_043920/func_80054110.s b/asm/non_matchings/unknown_043920/func_80054110.s index 00671236..75a0d35f 100644 --- a/asm/non_matchings/unknown_043920/func_80054110.s +++ b/asm/non_matchings/unknown_043920/func_80054110.s @@ -103,20 +103,20 @@ glabel func_80054110 /* 054E64 80054264 02202025 */ move $a0, $s1 /* 054E68 80054268 1100000A */ beqz $t0, .L80054294 /* 054E6C 8005426C 02002825 */ move $a1, $s0 -/* 054E70 80054270 3C01800E */ lui $at, %hi(D_800E67CC) # $at, 0x800e +/* 054E70 80054270 3C01800E */ lui $at, %hi(D_800E67C8 + 4) # $at, 0x800e /* 054E74 80054274 C60400A8 */ lwc1 $f4, 0xa8($s0) /* 054E78 80054278 C42967C8 */ lwc1 $f9, %lo(D_800E67C8)($at) -/* 054E7C 8005427C C42867CC */ lwc1 $f8, %lo(D_800E67CC)($at) +/* 054E7C 8005427C C42867CC */ lwc1 $f8, %lo(D_800E67C8 + 4)($at) /* 054E80 80054280 460021A1 */ cvt.d.s $f6, $f4 /* 054E84 80054284 46283401 */ sub.d $f16, $f6, $f8 /* 054E88 80054288 462082A0 */ cvt.s.d $f10, $f16 /* 054E8C 8005428C 10000009 */ b .L800542B4 /* 054E90 80054290 E60A00A8 */ swc1 $f10, 0xa8($s0) .L80054294: -/* 054E94 80054294 3C01800E */ lui $at, %hi(D_800E67D4) # $at, 0x800e +/* 054E94 80054294 3C01800E */ lui $at, %hi(D_800E67D0 + 4) # $at, 0x800e /* 054E98 80054298 C61200A8 */ lwc1 $f18, 0xa8($s0) /* 054E9C 8005429C C42767D0 */ lwc1 $f7, %lo(D_800E67D0)($at) -/* 054EA0 800542A0 C42667D4 */ lwc1 $f6, %lo(D_800E67D4)($at) +/* 054EA0 800542A0 C42667D4 */ lwc1 $f6, %lo(D_800E67D0 + 4)($at) /* 054EA4 800542A4 46009121 */ cvt.d.s $f4, $f18 /* 054EA8 800542A8 46262201 */ sub.d $f8, $f4, $f6 /* 054EAC 800542AC 46204420 */ cvt.s.d $f16, $f8 @@ -128,15 +128,15 @@ glabel func_80054110 /* 054EC0 800542C0 0C016420 */ jal func_80059080 /* 054EC4 800542C4 27A700A0 */ addiu $a3, $sp, 0xa0 /* 054EC8 800542C8 920A01F0 */ lbu $t2, 0x1f0($s0) -# Used to access D_800E67E0 and D_800E67E4. +# Used to access D_800E67E0 and D_800E67E0 + 4. /* 054ECC 800542CC 3C01800E */ lui $at, %hi(D_800E67E0) # $at, 0x800e /* 054ED0 800542D0 1140000A */ beqz $t2, .L800542FC /* 054ED4 800542D4 00000000 */ nop -# Used to access D_800E67D8 and D_800E67DC. +# Used to access D_800E67D8 and D_800E67D8 + 4. /* 054ED8 800542D8 3C01800E */ lui $at, %hi(D_800E67D8) # $at, 0x800e /* 054EDC 800542DC C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 054EE0 800542E0 C42567D8 */ lwc1 $f5, %lo(D_800E67D8)($at) -/* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67DC)($at) +/* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67D8 + 4)($at) /* 054EE8 800542E8 460054A1 */ cvt.d.s $f18, $f10 /* 054EEC 800542EC 46249180 */ add.d $f6, $f18, $f4 /* 054EF0 800542F0 46203220 */ cvt.s.d $f8, $f6 @@ -145,7 +145,7 @@ glabel func_80054110 .L800542FC: /* 054EFC 800542FC C61000A8 */ lwc1 $f16, 0xa8($s0) /* 054F00 80054300 C43367E0 */ lwc1 $f19, %lo(D_800E67E0)($at) -/* 054F04 80054304 C43267E4 */ lwc1 $f18, %lo(D_800E67E4)($at) +/* 054F04 80054304 C43267E4 */ lwc1 $f18, %lo(D_800E67E0 + 4)($at) /* 054F08 80054308 460082A1 */ cvt.d.s $f10, $f16 /* 054F0C 8005430C 46325100 */ add.d $f4, $f10, $f18 /* 054F10 80054310 462021A0 */ cvt.s.d $f6, $f4 diff --git a/asm/non_matchings/unknown_043920/func_8005492C.s b/asm/non_matchings/unknown_043920/func_8005492C.s index f2e9087d..bcaf035a 100644 --- a/asm/non_matchings/unknown_043920/func_8005492C.s +++ b/asm/non_matchings/unknown_043920/func_8005492C.s @@ -68,7 +68,7 @@ glabel func_8005492C /* 0555C8 800549C8 2403000C */ li $v1, 12 .L800549CC: /* 0555CC 800549CC 10400006 */ beqz $v0, .L800549E8 -/* 0555D0 800549D0 3C01800E */ lui $at, %hi(D_800E67EC) # $at, 0x800e +/* 0555D0 800549D0 3C01800E */ lui $at, %hi(D_800E67E8 + 4) # $at, 0x800e /* 0555D4 800549D4 80B801E6 */ lb $t8, 0x1e6($a1) /* 0555D8 800549D8 00000000 */ nop /* 0555DC 800549DC 13000002 */ beqz $t8, .L800549E8 @@ -77,19 +77,19 @@ glabel func_8005492C .L800549E8: /* 0555E8 800549E8 C4A4002C */ lwc1 $f4, 0x2c($a1) /* 0555EC 800549EC C42767E8 */ lwc1 $f7, %lo(D_800E67E8)($at) -/* 0555F0 800549F0 C42667EC */ lwc1 $f6, %lo(D_800E67EC)($at) +/* 0555F0 800549F0 C42667EC */ lwc1 $f6, %lo(D_800E67E8 + 4)($at) /* 0555F4 800549F4 46002021 */ cvt.d.s $f0, $f4 /* 0555F8 800549F8 4626003C */ c.lt.d $f0, $f6 /* 0555FC 800549FC 00001025 */ move $v0, $zero /* 055600 80054A00 45000005 */ bc1f .L80054A18 -/* 055604 80054A04 3C01800E */ lui $at, %hi(D_800E67F4) # $at, 0x800e +/* 055604 80054A04 3C01800E */ lui $at, %hi(D_800E67F0 + 4) # $at, 0x800e /* 055608 80054A08 00830019 */ multu $a0, $v1 /* 05560C 80054A0C 00001012 */ mflo $v0 /* 055610 80054A10 00000000 */ nop /* 055614 80054A14 00000000 */ nop .L80054A18: /* 055618 80054A18 C42967F0 */ lwc1 $f9, %lo(D_800E67F0)($at) -/* 05561C 80054A1C C42867F4 */ lwc1 $f8, %lo(D_800E67F4)($at) +/* 05561C 80054A1C C42867F4 */ lwc1 $f8, %lo(D_800E67F0 + 4)($at) /* 055620 80054A20 8FA80050 */ lw $t0, 0x50($sp) /* 055624 80054A24 4620403C */ c.lt.d $f8, $f0 /* 055628 80054A28 00000000 */ nop @@ -127,10 +127,10 @@ glabel func_8005492C /* 0556A4 80054AA4 0C014D1E */ jal func_80053478 /* 0556A8 80054AA8 AFA5004C */ sw $a1, 0x4c($sp) /* 0556AC 80054AAC 8FA5004C */ lw $a1, 0x4c($sp) -/* 0556B0 80054AB0 3C01800E */ lui $at, %hi(D_800E67FC) # $at, 0x800e +/* 0556B0 80054AB0 3C01800E */ lui $at, %hi(D_800E67F8 + 4) # $at, 0x800e /* 0556B4 80054AB4 C4A40030 */ lwc1 $f4, 0x30($a1) /* 0556B8 80054AB8 C42967F8 */ lwc1 $f9, %lo(D_800E67F8)($at) -/* 0556BC 80054ABC C42867FC */ lwc1 $f8, %lo(D_800E67FC)($at) +/* 0556BC 80054ABC C42867FC */ lwc1 $f8, %lo(D_800E67F8 + 4)($at) /* 0556C0 80054AC0 460021A1 */ cvt.d.s $f6, $f4 /* 0556C4 80054AC4 46283282 */ mul.d $f10, $f6, $f8 /* 0556C8 80054AC8 44809000 */ mtc1 $zero, $f18 @@ -294,7 +294,7 @@ glabel func_8005492C /* 055918 80054D18 46005202 */ mul.s $f8, $f10, $f0 /* 05591C 80054D1C 460041A1 */ cvt.d.s $f6, $f8 /* 055920 80054D20 46262280 */ add.d $f10, $f4, $f6 -/* 055924 80054D24 C424680C */ lwc1 $f4, %lo(D_800E680C)($at) +/* 055924 80054D24 C424680C */ lwc1 $f4, %lo(D_800E6808 + 4)($at) /* 055928 80054D28 462050A0 */ cvt.s.d $f2, $f10 /* 05592C 80054D2C C4256808 */ lwc1 $f5, %lo(D_800E6808)($at) /* 055930 80054D30 46001221 */ cvt.d.s $f8, $f2 @@ -342,14 +342,14 @@ glabel func_8005492C /* 0559C8 80054DC8 00000000 */ nop /* 0559CC 80054DCC 44818800 */ mtc1 $at, $f17 /* 0559D0 80054DD0 44808000 */ mtc1 $zero, $f16 -/* 0559D4 80054DD4 3C01800E */ lui $at, %hi(D_800E6814) # $at, 0x800e +/* 0559D4 80054DD4 3C01800E */ lui $at, %hi(D_800E6810 + 4) # $at, 0x800e /* 0559D8 80054DD8 4630003C */ c.lt.d $f0, $f16 /* 0559DC 80054DDC 00000000 */ nop /* 0559E0 80054DE0 45000017 */ bc1f .L80054E40 /* 0559E4 80054DE4 00000000 */ nop /* 0559E8 80054DE8 46208201 */ sub.d $f8, $f16, $f0 /* 0559EC 80054DEC C4256810 */ lwc1 $f5, %lo(D_800E6810)($at) -/* 0559F0 80054DF0 C4246814 */ lwc1 $f4, %lo(D_800E6814)($at) +/* 0559F0 80054DF0 C4246814 */ lwc1 $f4, %lo(D_800E6810 + 4)($at) /* 0559F4 80054DF4 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 /* 0559F8 80054DF8 46244182 */ mul.d $f6, $f8, $f4 /* 0559FC 80054DFC 8D08D538 */ lw $t0, %lo(D_8011D538)($t0) @@ -371,10 +371,10 @@ glabel func_8005492C /* 055A3C 80054E3C 00000000 */ nop .L80054E40: /* 055A40 80054E40 C4A800B8 */ lwc1 $f8, 0xb8($a1) -/* 055A44 80054E44 3C01800E */ lui $at, %hi(D_800E681C) # $at, 0x800e +/* 055A44 80054E44 3C01800E */ lui $at, %hi(D_800E6818 + 4) # $at, 0x800e /* 055A48 80054E48 46024102 */ mul.s $f4, $f8, $f2 /* 055A4C 80054E4C C42B6818 */ lwc1 $f11, %lo(D_800E6818)($at) -/* 055A50 80054E50 C42A681C */ lwc1 $f10, %lo(D_800E681C)($at) +/* 055A50 80054E50 C42A681C */ lwc1 $f10, %lo(D_800E6818 + 4)($at) /* 055A54 80054E54 3C01800E */ lui $at, %hi(D_800E6820) # $at, 0x800e /* 055A58 80054E58 460021A1 */ cvt.d.s $f6, $f4 /* 055A5C 80054E5C 462A3202 */ mul.d $f8, $f6, $f10 @@ -385,15 +385,15 @@ glabel func_8005492C /* 055A70 80054E70 46066281 */ sub.s $f10, $f12, $f6 /* 055A74 80054E74 E4AA002C */ swc1 $f10, 0x2c($a1) /* 055A78 80054E78 C4AC002C */ lwc1 $f12, 0x2c($a1) -/* 055A7C 80054E7C C4286824 */ lwc1 $f8, %lo(D_800E6824)($at) +/* 055A7C 80054E7C C4286824 */ lwc1 $f8, %lo(D_800E6820 + 4)($at) /* 055A80 80054E80 C4296820 */ lwc1 $f9, %lo(D_800E6820)($at) /* 055A84 80054E84 46006021 */ cvt.d.s $f0, $f12 /* 055A88 80054E88 4620403C */ c.lt.d $f8, $f0 -/* 055A8C 80054E8C 3C01800E */ lui $at, %hi(D_800E682C) # $at, 0x800e +/* 055A8C 80054E8C 3C01800E */ lui $at, %hi(D_800E6828 + 4) # $at, 0x800e /* 055A90 80054E90 4500000B */ bc1f .L80054EC0 /* 055A94 80054E94 00000000 */ nop /* 055A98 80054E98 C4256828 */ lwc1 $f5, %lo(D_800E6828)($at) -/* 055A9C 80054E9C C424682C */ lwc1 $f4, %lo(D_800E682C)($at) +/* 055A9C 80054E9C C424682C */ lwc1 $f4, %lo(D_800E6828 + 4)($at) /* 055AA0 80054EA0 00000000 */ nop /* 055AA4 80054EA4 4624003C */ c.lt.d $f0, $f4 /* 055AA8 80054EA8 00000000 */ nop @@ -442,10 +442,10 @@ glabel func_8005492C /* 055B48 80054F48 462A2182 */ mul.d $f6, $f4, $f10 /* 055B4C 80054F4C 46203020 */ cvt.s.d $f0, $f6 .L80054F50: -/* 055B50 80054F50 3C01800E */ lui $at, %hi(D_800E6834) # $at, 0x800e +/* 055B50 80054F50 3C01800E */ lui $at, %hi(D_800E6830 + 4) # $at, 0x800e /* 055B54 80054F54 C4A800B8 */ lwc1 $f8, 0xb8($a1) /* 055B58 80054F58 C42B6830 */ lwc1 $f11, %lo(D_800E6830)($at) -/* 055B5C 80054F5C C42A6834 */ lwc1 $f10, %lo(D_800E6834)($at) +/* 055B5C 80054F5C C42A6834 */ lwc1 $f10, %lo(D_800E6830 + 4)($at) /* 055B60 80054F60 46004121 */ cvt.d.s $f4, $f8 /* 055B64 80054F64 462A203C */ c.lt.d $f4, $f10 /* 055B68 80054F68 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80054FD0.s b/asm/non_matchings/unknown_043920/func_80054FD0.s index 6f457e33..22c40dfa 100644 --- a/asm/non_matchings/unknown_043920/func_80054FD0.s +++ b/asm/non_matchings/unknown_043920/func_80054FD0.s @@ -274,10 +274,10 @@ glabel func_80054FD0 /* 055FD8 800553D8 24010001 */ li $at, 1 /* 055FDC 800553DC 15E10069 */ bne $t7, $at, .L80055584 .L800553E0: -/* 055FE0 800553E0 3C01800E */ lui $at, %hi(D_800E683C) # $at, 0x800e +/* 055FE0 800553E0 3C01800E */ lui $at, %hi(D_800E6838 + 4) # $at, 0x800e /* 055FE4 800553E4 C60A002C */ lwc1 $f10, 0x2c($s0) /* 055FE8 800553E8 C4276838 */ lwc1 $f7, %lo(D_800E6838)($at) -/* 055FEC 800553EC C426683C */ lwc1 $f6, %lo(D_800E683C)($at) +/* 055FEC 800553EC C426683C */ lwc1 $f6, %lo(D_800E6838 + 4)($at) /* 055FF0 800553F0 46005121 */ cvt.d.s $f4, $f10 /* 055FF4 800553F4 46262202 */ mul.d $f8, $f4, $f6 /* 055FF8 800553F8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -378,7 +378,7 @@ glabel func_80054FD0 /* 056160 80055560 46062202 */ mul.s $f8, $f4, $f6 /* 056164 80055564 46005121 */ cvt.d.s $f4, $f10 /* 056168 80055568 E6080120 */ swc1 $f8, 0x120($s0) -/* 05616C 8005556C C4266844 */ lwc1 $f6, %lo(D_800E6844)($at) +/* 05616C 8005556C C4266844 */ lwc1 $f6, %lo(D_800E6840 + 4)($at) /* 056170 80055570 C4276840 */ lwc1 $f7, %lo(D_800E6840)($at) /* 056174 80055574 E6100030 */ swc1 $f16, 0x30($s0) /* 056178 80055578 46262202 */ mul.d $f8, $f4, $f6 diff --git a/asm/non_matchings/unknown_043920/func_80055EC0.s b/asm/non_matchings/unknown_043920/func_80055EC0.s index f6c00f7d..eac677bb 100644 --- a/asm/non_matchings/unknown_043920/func_80055EC0.s +++ b/asm/non_matchings/unknown_043920/func_80055EC0.s @@ -110,7 +110,7 @@ glabel func_80055EC0 /* 056C3C 8005603C 00000000 */ nop /* 056C40 80056040 A479002E */ sh $t9, 0x2e($v1) /* 056C44 80056044 C4E8001C */ lwc1 $f8, 0x1c($a3) -/* 056C48 80056048 C420684C */ lwc1 $f0, %lo(D_800E684C)($at) +/* 056C48 80056048 C420684C */ lwc1 $f0, %lo(D_800E6848 + 4)($at) /* 056C4C 8005604C C4216848 */ lwc1 $f1, %lo(D_800E6848)($at) /* 056C50 80056050 460041A1 */ cvt.d.s $f6, $f8 /* 056C54 80056054 46203282 */ mul.d $f10, $f6, $f0 diff --git a/asm/non_matchings/unknown_043920/func_80057A40.s b/asm/non_matchings/unknown_043920/func_80057A40.s index d7f55626..fb195734 100644 --- a/asm/non_matchings/unknown_043920/func_80057A40.s +++ b/asm/non_matchings/unknown_043920/func_80057A40.s @@ -195,15 +195,15 @@ glabel L80057CAC .L80057CD0: glabel L80057CD0 /* 0588D0 80057CD0 3C038012 */ lui $v1, %hi(D_8011D586) # $v1, 0x8012 -/* 0588D4 80057CD4 3C01800E */ lui $at, %hi(D_800E68F4) # $at, 0x800e +/* 0588D4 80057CD4 3C01800E */ lui $at, %hi(D_800E68F0 + 4) # $at, 0x800e /* 0588D8 80057CD8 2463D586 */ addiu $v1, %lo(D_8011D586) # addiu $v1, $v1, -0x2a7a /* 0588DC 80057CDC C42168F0 */ lwc1 $f1, %lo(D_800E68F0)($at) -/* 0588E0 80057CE0 C42068F4 */ lwc1 $f0, %lo(D_800E68F4)($at) +/* 0588E0 80057CE0 C42068F4 */ lwc1 $f0, %lo(D_800E68F0 + 4)($at) /* 0588E4 80057CE4 84790000 */ lh $t9, ($v1) -/* 0588E8 80057CE8 3C01800E */ lui $at, %hi(D_800E68FC) # $at, 0x800e +/* 0588E8 80057CE8 3C01800E */ lui $at, %hi(D_800E68F8 + 4) # $at, 0x800e /* 0588EC 80057CEC 44992000 */ mtc1 $t9, $f4 /* 0588F0 80057CF0 C42D68F8 */ lwc1 $f13, %lo(D_800E68F8)($at) -/* 0588F4 80057CF4 C42C68FC */ lwc1 $f12, %lo(D_800E68FC)($at) +/* 0588F4 80057CF4 C42C68FC */ lwc1 $f12, %lo(D_800E68F8 + 4)($at) /* 0588F8 80057CF8 468021A0 */ cvt.s.w $f6, $f4 /* 0588FC 80057CFC 8FA80038 */ lw $t0, 0x38($sp) /* 058900 80057D00 3C014620 */ li $at, 0x46200000 # 10240.000000 @@ -251,10 +251,10 @@ glabel L80057CD0 /* 0589A8 80057DA8 E7A30018 */ swc1 $f3, 0x18($sp) /* 0589AC 80057DAC 3C078012 */ lui $a3, %hi(D_8011D508) # $a3, 0x8012 /* 0589B0 80057DB0 24E7D508 */ addiu $a3, %lo(D_8011D508) # addiu $a3, $a3, -0x2af8 -/* 0589B4 80057DB4 3C01800E */ lui $at, %hi(D_800E6904) # $at, 0x800e +/* 0589B4 80057DB4 3C01800E */ lui $at, %hi(D_800E6900 + 4) # $at, 0x800e /* 0589B8 80057DB8 8CE20000 */ lw $v0, ($a3) /* 0589BC 80057DBC C4316900 */ lwc1 $f17, %lo(D_800E6900)($at) -/* 0589C0 80057DC0 C4306904 */ lwc1 $f16, %lo(D_800E6904)($at) +/* 0589C0 80057DC0 C4306904 */ lwc1 $f16, %lo(D_800E6900 + 4)($at) /* 0589C4 80057DC4 C44A0010 */ lwc1 $f10, 0x10($v0) /* 0589C8 80057DC8 46000221 */ cvt.d.s $f8, $f0 /* 0589CC 80057DCC 46304180 */ add.d $f6, $f8, $f16 @@ -317,13 +317,13 @@ glabel L80057CD0 /* 058AB0 80057EB0 15C0001D */ bnez $t6, .L80057F28 /* 058AB4 80057EB4 00000000 */ nop /* 058AB8 80057EB8 846F0000 */ lh $t7, ($v1) -/* 058ABC 80057EBC 3C01800E */ lui $at, %hi(D_800E690C) # $at, 0x800e +/* 058ABC 80057EBC 3C01800E */ lui $at, %hi(D_800E6908 + 4) # $at, 0x800e /* 058AC0 80057EC0 15E00019 */ bnez $t7, .L80057F28 /* 058AC4 80057EC4 00000000 */ nop /* 058AC8 80057EC8 8CE20000 */ lw $v0, ($a3) /* 058ACC 80057ECC C4216908 */ lwc1 $f1, %lo(D_800E6908)($at) /* 058AD0 80057ED0 C4480024 */ lwc1 $f8, 0x24($v0) -/* 058AD4 80057ED4 C420690C */ lwc1 $f0, %lo(D_800E690C)($at) +/* 058AD4 80057ED4 C420690C */ lwc1 $f0, %lo(D_800E6908 + 4)($at) /* 058AD8 80057ED8 460044A1 */ cvt.d.s $f18, $f8 /* 058ADC 80057EDC 46209402 */ mul.d $f16, $f18, $f0 /* 058AE0 80057EE0 462082A0 */ cvt.s.d $f10, $f16 diff --git a/asm/non_matchings/unknown_043920/func_800581E8.s b/asm/non_matchings/unknown_043920/func_800581E8.s index 286d056a..6971b13d 100644 --- a/asm/non_matchings/unknown_043920/func_800581E8.s +++ b/asm/non_matchings/unknown_043920/func_800581E8.s @@ -225,9 +225,9 @@ glabel func_800581E8 /* 0590F4 800584F4 00000000 */ nop .L800584F8: /* 0590F8 800584F8 460C2302 */ mul.s $f12, $f4, $f12 -/* 0590FC 800584FC 3C01800E */ lui $at, %hi(D_800E6914) # $at, 0x800e +/* 0590FC 800584FC 3C01800E */ lui $at, %hi(D_800E6910 + 4) # $at, 0x800e /* 059100 80058500 C4276910 */ lwc1 $f7, %lo(D_800E6910)($at) -/* 059104 80058504 C4266914 */ lwc1 $f6, %lo(D_800E6914)($at) +/* 059104 80058504 C4266914 */ lwc1 $f6, %lo(D_800E6910 + 4)($at) /* 059108 80058508 46006221 */ cvt.d.s $f8, $f12 /* 05910C 8005850C 4628303C */ c.lt.d $f6, $f8 /* 059110 80058510 3C014282 */ li $at, 0x42820000 # 65.000000 @@ -376,10 +376,10 @@ glabel func_800581E8 /* 059330 80058730 E7A80044 */ swc1 $f8, 0x44($sp) /* 059334 80058734 11E00023 */ beqz $t7, .L800587C4 /* 059338 80058738 46007086 */ mov.s $f2, $f14 -/* 05933C 8005873C 3C01800E */ lui $at, %hi(D_800E691C) # $at, 0x800e +/* 05933C 8005873C 3C01800E */ lui $at, %hi(D_800E6918 + 4) # $at, 0x800e /* 059340 80058740 C4E40030 */ lwc1 $f4, 0x30($a3) /* 059344 80058744 C4276918 */ lwc1 $f7, %lo(D_800E6918)($at) -/* 059348 80058748 C426691C */ lwc1 $f6, %lo(D_800E691C)($at) +/* 059348 80058748 C426691C */ lwc1 $f6, %lo(D_800E6918 + 4)($at) /* 05934C 8005874C 460022A1 */ cvt.d.s $f10, $f4 /* 059350 80058750 46265202 */ mul.d $f8, $f10, $f6 /* 059354 80058754 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 diff --git a/asm/non_matchings/unknown_043920/func_80059208.s b/asm/non_matchings/unknown_043920/func_80059208.s index 184399a2..d462935a 100644 --- a/asm/non_matchings/unknown_043920/func_80059208.s +++ b/asm/non_matchings/unknown_043920/func_80059208.s @@ -34,10 +34,10 @@ glabel func_80059208 /* 059E70 80059270 44802000 */ mtc1 $zero, $f4 /* 059E74 80059274 46003221 */ cvt.d.s $f8, $f6 /* 059E78 80059278 46282281 */ sub.d $f10, $f4, $f8 -/* 059E7C 8005927C 3C01800E */ lui $at, %hi(D_800E6924) # $at, 0x800e +/* 059E7C 8005927C 3C01800E */ lui $at, %hi(D_800E6920 + 4) # $at, 0x800e /* 059E80 80059280 46205020 */ cvt.s.d $f0, $f10 /* 059E84 80059284 C4316920 */ lwc1 $f17, %lo(D_800E6920)($at) -/* 059E88 80059288 C4306924 */ lwc1 $f16, %lo(D_800E6924)($at) +/* 059E88 80059288 C4306924 */ lwc1 $f16, %lo(D_800E6920 + 4)($at) /* 059E8C 8005928C 460000A1 */ cvt.d.s $f2, $f0 /* 059E90 80059290 4630103C */ c.lt.d $f2, $f16 /* 059E94 80059294 82240192 */ lb $a0, 0x192($s1) diff --git a/asm/non_matchings/unknown_043920/func_80059790.s b/asm/non_matchings/unknown_043920/func_80059790.s index f24b3bc5..9cc85e8a 100644 --- a/asm/non_matchings/unknown_043920/func_80059790.s +++ b/asm/non_matchings/unknown_043920/func_80059790.s @@ -10,10 +10,10 @@ glabel func_80059790 /* 05A39C 8005979C 15C10012 */ bne $t6, $at, .L800597E8 /* 05A3A0 800597A0 24080E10 */ li $t0, 3600 /* 05A3A4 800597A4 44842000 */ mtc1 $a0, $f4 -/* 05A3A8 800597A8 3C01800E */ lui $at, %hi(D_800E692C) # $at, 0x800e +/* 05A3A8 800597A8 3C01800E */ lui $at, %hi(D_800E6928 + 4) # $at, 0x800e /* 05A3AC 800597AC 468021A0 */ cvt.s.w $f6, $f4 /* 05A3B0 800597B0 C42B6928 */ lwc1 $f11, %lo(D_800E6928)($at) -/* 05A3B4 800597B4 C42A692C */ lwc1 $f10, %lo(D_800E692C)($at) +/* 05A3B4 800597B4 C42A692C */ lwc1 $f10, %lo(D_800E6928 + 4)($at) /* 05A3B8 800597B8 46003221 */ cvt.d.s $f8, $f6 /* 05A3BC 800597BC 462A4402 */ mul.d $f16, $f8, $f10 /* 05A3C0 800597C0 444FF800 */ cfc1 $t7, $31 diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index 708dbc1f..e9cbcfb6 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -32,9 +32,9 @@ glabel func_80059E40 /* 05AA98 80059E98 46060083 */ div.s $f2, $f0, $f6 /* 05AA9C 80059E9C 24010002 */ li $at, 2 /* 05AAA0 80059EA0 14A1000B */ bne $a1, $at, .L80059ED0 -/* 05AAA4 80059EA4 3C01800E */ lui $at, %hi(D_800E6934) # $at, 0x800e +/* 05AAA4 80059EA4 3C01800E */ lui $at, %hi(D_800E6930 + 4) # $at, 0x800e /* 05AAA8 80059EA8 C42B6930 */ lwc1 $f11, %lo(D_800E6930)($at) -/* 05AAAC 80059EAC C42A6934 */ lwc1 $f10, %lo(D_800E6934)($at) +/* 05AAAC 80059EAC C42A6934 */ lwc1 $f10, %lo(D_800E6930 + 4)($at) /* 05AAB0 80059EB0 46000221 */ cvt.d.s $f8, $f0 /* 05AAB4 80059EB4 462A4402 */ mul.d $f16, $f8, $f10 /* 05AAB8 80059EB8 3C01403E */ li $at, 0x403E0000 # 2.968750 @@ -310,12 +310,12 @@ glabel func_80059E40 /* 05AEBC 8005A2BC C7A20094 */ lwc1 $f2, 0x94($sp) /* 05AEC0 8005A2C0 A602002E */ sh $v0, 0x2e($s0) /* 05AEC4 8005A2C4 8FAF0060 */ lw $t7, 0x60($sp) -/* 05AEC8 8005A2C8 3C01800E */ lui $at, %hi(D_800E693C) # $at, 0x800e +/* 05AEC8 8005A2C8 3C01800E */ lui $at, %hi(D_800E6938 + 4) # $at, 0x800e /* 05AECC 8005A2CC 25F90003 */ addiu $t9, $t7, 3 /* 05AED0 8005A2D0 15B90033 */ bne $t5, $t9, .L8005A3A0 /* 05AED4 8005A2D4 24020001 */ li $v0, 1 /* 05AED8 8005A2D8 C42D6938 */ lwc1 $f13, %lo(D_800E6938)($at) -/* 05AEDC 8005A2DC C42C693C */ lwc1 $f12, %lo(D_800E693C)($at) +/* 05AEDC 8005A2DC C42C693C */ lwc1 $f12, %lo(D_800E6938 + 4)($at) /* 05AEE0 8005A2E0 46001021 */ cvt.d.s $f0, $f2 /* 05AEE4 8005A2E4 4620603E */ c.le.d $f12, $f0 /* 05AEE8 8005A2E8 8E020064 */ lw $v0, 0x64($s0) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index af6c2bc8..6ad63a63 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -81,12 +81,12 @@ glabel func_8005A6F0 /* 05B3A4 8005A7A4 2463D564 */ addiu $v1, %lo(D_8011D564) # addiu $v1, $v1, -0x2a9c /* 05B3A8 8005A7A8 AC620000 */ sw $v0, ($v1) /* 05B3AC 8005A7AC 82190003 */ lb $t9, 3($s0) -/* 05B3B0 8005A7B0 3C01800E */ lui $at, %hi(D_800E6944) # $at, 0x800e +/* 05B3B0 8005A7B0 3C01800E */ lui $at, %hi(D_800E6940 + 4) # $at, 0x800e /* 05B3B4 8005A7B4 00196880 */ sll $t5, $t9, 2 /* 05B3B8 8005A7B8 004D7021 */ addu $t6, $v0, $t5 /* 05B3BC 8005A7BC C5C40000 */ lwc1 $f4, ($t6) /* 05B3C0 8005A7C0 C4296940 */ lwc1 $f9, %lo(D_800E6940)($at) -/* 05B3C4 8005A7C4 C4286944 */ lwc1 $f8, %lo(D_800E6944)($at) +/* 05B3C4 8005A7C4 C4286944 */ lwc1 $f8, %lo(D_800E6940 + 4)($at) /* 05B3C8 8005A7C8 460021A1 */ cvt.d.s $f6, $f4 /* 05B3CC 8005A7CC 46283282 */ mul.d $f10, $f6, $f8 /* 05B3D0 8005A7D0 3C0C8012 */ lui $t4, %hi(D_8011D56C) # $t4, 0x8012 @@ -295,7 +295,7 @@ glabel func_8005A6F0 /* 05B6B4 8005AAB4 00000000 */ nop .L8005AAB8: /* 05B6B8 8005AAB8 10E0000B */ beqz $a3, .L8005AAE8 -/* 05B6BC 8005AABC 3C01800E */ lui $at, %hi(D_800E6954) # $at, 0x800e +/* 05B6BC 8005AABC 3C01800E */ lui $at, %hi(D_800E6950 + 4) # $at, 0x800e /* 05B6C0 8005AAC0 8FA400A0 */ lw $a0, 0xa0($sp) /* 05B6C4 8005AAC4 C4EA000C */ lwc1 $f10, 0xc($a3) /* 05B6C8 8005AAC8 C492000C */ lwc1 $f18, 0xc($a0) @@ -311,7 +311,7 @@ glabel func_8005A6F0 /* 05B6EC 8005AAEC 11000011 */ beqz $t0, .L8005AB34 /* 05B6F0 8005AAF0 00000000 */ nop /* 05B6F4 8005AAF4 C4256950 */ lwc1 $f5, %lo(D_800E6950)($at) -/* 05B6F8 8005AAF8 C4246954 */ lwc1 $f4, %lo(D_800E6954)($at) +/* 05B6F8 8005AAF8 C4246954 */ lwc1 $f4, %lo(D_800E6950 + 4)($at) /* 05B6FC 8005AAFC 460014A1 */ cvt.d.s $f18, $f2 /* 05B700 8005AB00 4632203E */ c.le.d $f4, $f18 /* 05B704 8005AB04 00000000 */ nop @@ -351,9 +351,9 @@ glabel func_8005A6F0 /* 05B780 8005AB80 82020201 */ lb $v0, 0x201($s0) /* 05B784 8005AB84 00000000 */ nop /* 05B788 8005AB88 1440000B */ bnez $v0, .L8005ABB8 -/* 05B78C 8005AB8C 3C01800E */ lui $at, %hi(D_800E6964) # $at, 0x800e +/* 05B78C 8005AB8C 3C01800E */ lui $at, %hi(D_800E6960 + 4) # $at, 0x800e /* 05B790 8005AB90 C4276960 */ lwc1 $f7, %lo(D_800E6960)($at) -/* 05B794 8005AB94 C4266964 */ lwc1 $f6, %lo(D_800E6964)($at) +/* 05B794 8005AB94 C4266964 */ lwc1 $f6, %lo(D_800E6960 + 4)($at) /* 05B798 8005AB98 46001121 */ cvt.d.s $f4, $f2 /* 05B79C 8005AB9C 4626203C */ c.lt.d $f4, $f6 /* 05B7A0 8005ABA0 240D001E */ li $t5, 30 @@ -849,11 +849,11 @@ glabel L8005B1B0 /* 05BEC4 8005B2C4 44802000 */ mtc1 $zero, $f4 /* 05BEC8 8005B2C8 46005021 */ cvt.d.s $f0, $f10 /* 05BECC 8005B2CC 4624003C */ c.lt.d $f0, $f4 -/* 05BED0 8005B2D0 3C01800E */ lui $at, %hi(D_800E69A4) # $at, 0x800e +/* 05BED0 8005B2D0 3C01800E */ lui $at, %hi(D_800E69A0 + 4) # $at, 0x800e /* 05BED4 8005B2D4 45000007 */ bc1f .L8005B2F4 /* 05BED8 8005B2D8 00000000 */ nop /* 05BEDC 8005B2DC C42769A0 */ lwc1 $f7, %lo(D_800E69A0)($at) -/* 05BEE0 8005B2E0 C42669A4 */ lwc1 $f6, %lo(D_800E69A4)($at) +/* 05BEE0 8005B2E0 C42669A4 */ lwc1 $f6, %lo(D_800E69A0 + 4)($at) /* 05BEE4 8005B2E4 00000000 */ nop /* 05BEE8 8005B2E8 46260482 */ mul.d $f18, $f0, $f6 /* 05BEEC 8005B2EC 46209220 */ cvt.s.d $f8, $f18 @@ -1181,7 +1181,7 @@ glabel L8005B1B0 /* 05C384 8005B784 3C01800E */ lui $at, %hi(D_800E69B8) # $at, 0x800e /* 05C388 8005B788 E5C60008 */ swc1 $f6, 8($t6) /* 05C38C 8005B78C C4640030 */ lwc1 $f4, 0x30($v1) -/* 05C390 8005B790 C42869BC */ lwc1 $f8, %lo(D_800E69BC)($at) +/* 05C390 8005B790 C42869BC */ lwc1 $f8, %lo(D_800E69B8 + 4)($at) /* 05C394 8005B794 C42969B8 */ lwc1 $f9, %lo(D_800E69B8)($at) /* 05C398 8005B798 460024A1 */ cvt.d.s $f18, $f4 /* 05C39C 8005B79C 4628903C */ c.lt.d $f18, $f8 diff --git a/asm/non_matchings/unknown_043920/func_8005B818.s b/asm/non_matchings/unknown_043920/func_8005B818.s index 12682972..186548ab 100644 --- a/asm/non_matchings/unknown_043920/func_8005B818.s +++ b/asm/non_matchings/unknown_043920/func_8005B818.s @@ -61,7 +61,7 @@ glabel func_8005B818 /* 05C4B4 8005B8B4 E7A20094 */ swc1 $f2, 0x94($sp) /* 05C4B8 8005B8B8 C6200124 */ lwc1 $f0, 0x124($s1) /* 05C4BC 8005B8BC 44813000 */ mtc1 $at, $f6 -/* 05C4C0 8005B8C0 3C01800E */ lui $at, %hi(D_800E69C4) # $at, 0x800e +/* 05C4C0 8005B8C0 3C01800E */ lui $at, %hi(D_800E69C0 + 4) # $at, 0x800e /* 05C4C4 8005B8C4 4606003C */ c.lt.s $f0, $f6 /* 05C4C8 8005B8C8 00000000 */ nop /* 05C4CC 8005B8CC 45000005 */ bc1f .L8005B8E4 @@ -82,15 +82,15 @@ glabel func_8005B818 /* 05C504 8005B904 00000000 */ nop .L8005B908: /* 05C508 8005B908 C42569C0 */ lwc1 $f5, %lo(D_800E69C0)($at) -/* 05C50C 8005B90C C42469C4 */ lwc1 $f4, %lo(D_800E69C4)($at) +/* 05C50C 8005B90C C42469C4 */ lwc1 $f4, %lo(D_800E69C0 + 4)($at) /* 05C510 8005B910 460004A1 */ cvt.d.s $f18, $f0 /* 05C514 8005B914 46249182 */ mul.d $f6, $f18, $f4 -/* 05C518 8005B918 3C01800E */ lui $at, %hi(D_800E69CC) # $at, 0x800e +/* 05C518 8005B918 3C01800E */ lui $at, %hi(D_800E69C8 + 4) # $at, 0x800e /* 05C51C 8005B91C C42969C8 */ lwc1 $f9, %lo(D_800E69C8)($at) -/* 05C520 8005B920 C42869CC */ lwc1 $f8, %lo(D_800E69CC)($at) -/* 05C524 8005B924 3C01800E */ lui $at, %hi(D_800E69D4) # $at, 0x800e +/* 05C520 8005B920 C42869CC */ lwc1 $f8, %lo(D_800E69C8 + 4)($at) +/* 05C524 8005B924 3C01800E */ lui $at, %hi(D_800E69D0 + 4) # $at, 0x800e /* 05C528 8005B928 C43369D0 */ lwc1 $f19, %lo(D_800E69D0)($at) -/* 05C52C 8005B92C C43269D4 */ lwc1 $f18, %lo(D_800E69D4)($at) +/* 05C52C 8005B92C C43269D4 */ lwc1 $f18, %lo(D_800E69D0 + 4)($at) /* 05C530 8005B930 46283280 */ add.d $f10, $f6, $f8 /* 05C534 8005B934 00000000 */ nop /* 05C538 8005B938 46325103 */ div.d $f4, $f10, $f18 @@ -100,9 +100,9 @@ glabel func_8005B818 /* 05C548 8005B948 46000306 */ mov.s $f12, $f0 /* 05C54C 8005B94C 11C00007 */ beqz $t6, .L8005B96C /* 05C550 8005B950 27A30100 */ addiu $v1, $sp, 0x100 -/* 05C554 8005B954 3C01800E */ lui $at, %hi(D_800E69DC) # $at, 0x800e +/* 05C554 8005B954 3C01800E */ lui $at, %hi(D_800E69D8 + 4) # $at, 0x800e /* 05C558 8005B958 C42969D8 */ lwc1 $f9, %lo(D_800E69D8)($at) -/* 05C55C 8005B95C C42869DC */ lwc1 $f8, %lo(D_800E69DC)($at) +/* 05C55C 8005B95C C42869DC */ lwc1 $f8, %lo(D_800E69D8 + 4)($at) /* 05C560 8005B960 460001A1 */ cvt.d.s $f6, $f0 /* 05C564 8005B964 46283282 */ mul.d $f10, $f6, $f8 /* 05C568 8005B968 46205320 */ cvt.s.d $f12, $f10 @@ -138,10 +138,10 @@ glabel func_8005B818 /* 05C5D0 8005B9D0 00001025 */ move $v0, $zero .L8005B9D4: /* 05C5D4 8005B9D4 44829000 */ mtc1 $v0, $f18 -/* 05C5D8 8005B9D8 3C01800E */ lui $at, %hi(D_800E69E4) # $at, 0x800e +/* 05C5D8 8005B9D8 3C01800E */ lui $at, %hi(D_800E69E0 + 4) # $at, 0x800e /* 05C5DC 8005B9DC 46809120 */ cvt.s.w $f4, $f18 /* 05C5E0 8005B9E0 C42969E0 */ lwc1 $f9, %lo(D_800E69E0)($at) -/* 05C5E4 8005B9E4 C42869E4 */ lwc1 $f8, %lo(D_800E69E4)($at) +/* 05C5E4 8005B9E4 C42869E4 */ lwc1 $f8, %lo(D_800E69E0 + 4)($at) /* 05C5E8 8005B9E8 460021A1 */ cvt.d.s $f6, $f4 /* 05C5EC 8005B9EC 00000000 */ nop /* 05C5F0 8005B9F0 46283283 */ div.d $f10, $f6, $f8 @@ -373,7 +373,7 @@ glabel func_8005B818 /* 05C94C 8005BD4C 461E0303 */ div.s $f12, $f0, $f30 /* 05C950 8005BD50 44809000 */ mtc1 $zero, $f18 /* 05C954 8005BD54 C7A6008C */ lwc1 $f6, 0x8c($sp) -/* 05C958 8005BD58 3C01800E */ lui $at, %hi(D_800E69F4) # $at, 0x800e +/* 05C958 8005BD58 3C01800E */ lui $at, %hi(D_800E69F0 + 4) # $at, 0x800e /* 05C95C 8005BD5C 460C9032 */ c.eq.s $f18, $f12 /* 05C960 8005BD60 00000000 */ nop /* 05C964 8005BD64 45010007 */ bc1t .L8005BD84 @@ -387,7 +387,7 @@ glabel func_8005B818 .L8005BD84: /* 05C984 8005BD84 C63200AC */ lwc1 $f18, 0xac($s1) /* 05C988 8005BD88 C42969F0 */ lwc1 $f9, %lo(D_800E69F0)($at) -/* 05C98C 8005BD8C C42869F4 */ lwc1 $f8, %lo(D_800E69F4)($at) +/* 05C98C 8005BD8C C42869F4 */ lwc1 $f8, %lo(D_800E69F0 + 4)($at) /* 05C990 8005BD90 460091A1 */ cvt.d.s $f6, $f18 /* 05C994 8005BD94 46283100 */ add.d $f4, $f6, $f8 /* 05C998 8005BD98 2410FFFF */ li $s0, -1 @@ -425,9 +425,9 @@ glabel func_8005B818 /* 05CA14 8005BE14 46044300 */ add.s $f12, $f8, $f4 /* 05CA18 8005BE18 00000000 */ nop /* 05CA1C 8005BE1C 461E0303 */ div.s $f12, $f0, $f30 -/* 05CA20 8005BE20 3C01800E */ lui $at, %hi(D_800E69FC) # $at, 0x800e +/* 05CA20 8005BE20 3C01800E */ lui $at, %hi(D_800E69F8 + 4) # $at, 0x800e /* 05CA24 8005BE24 C43169F8 */ lwc1 $f17, %lo(D_800E69F8)($at) -/* 05CA28 8005BE28 C43069FC */ lwc1 $f16, %lo(D_800E69FC)($at) +/* 05CA28 8005BE28 C43069FC */ lwc1 $f16, %lo(D_800E69F8 + 4)($at) /* 05CA2C 8005BE2C C7A30060 */ lwc1 $f3, 0x60($sp) /* 05CA30 8005BE30 C7A20064 */ lwc1 $f2, 0x64($sp) /* 05CA34 8005BE34 00000000 */ nop diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index 7d3bd883..c05bce2c 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -136,10 +136,10 @@ glabel func_8005C364 /* 05D140 8005C540 44816000 */ mtc1 $at, $f12 /* 05D144 8005C544 0C01A7CA */ jal func_80069F28 /* 05D148 8005C548 00000000 */ nop -/* 05D14C 8005C54C 3C01800E */ lui $at, %hi(D_800E6A14) # $at, 0x800e +/* 05D14C 8005C54C 3C01800E */ lui $at, %hi(D_800E6A10 + 4) # $at, 0x800e /* 05D150 8005C550 C604002C */ lwc1 $f4, 0x2c($s0) /* 05D154 8005C554 C4296A10 */ lwc1 $f9, %lo(D_800E6A10)($at) -/* 05D158 8005C558 C4286A14 */ lwc1 $f8, %lo(D_800E6A14)($at) +/* 05D158 8005C558 C4286A14 */ lwc1 $f8, %lo(D_800E6A10 + 4)($at) /* 05D15C 8005C55C 460021A1 */ cvt.d.s $f6, $f4 /* 05D160 8005C560 46283282 */ mul.d $f10, $f6, $f8 /* 05D164 8005C564 44808000 */ mtc1 $zero, $f16 @@ -193,7 +193,7 @@ glabel func_8005C364 /* 05D21C 8005C61C 4624003C */ c.lt.d $f0, $f4 /* 05D220 8005C620 240C0001 */ li $t4, 1 /* 05D224 8005C624 45000010 */ bc1f .L8005C668 -/* 05D228 8005C628 3C01800E */ lui $at, %hi(D_800E6A1C) # $at, 0x800e +/* 05D228 8005C628 3C01800E */ lui $at, %hi(D_800E6A18 + 4) # $at, 0x800e /* 05D22C 8005C62C A22C003B */ sb $t4, 0x3b($s1) /* 05D230 8005C630 C7A8005C */ lwc1 $f8, 0x5c($sp) /* 05D234 8005C634 C606002C */ lwc1 $f6, 0x2c($s0) @@ -211,14 +211,14 @@ glabel func_8005C364 /* 05D264 8005C664 E604000C */ swc1 $f4, 0xc($s0) .L8005C668: /* 05D268 8005C668 C4296A18 */ lwc1 $f9, %lo(D_800E6A18)($at) -/* 05D26C 8005C66C C4286A1C */ lwc1 $f8, %lo(D_800E6A1C)($at) -/* 05D270 8005C670 3C01800E */ lui $at, %hi(D_800E6A24) # $at, 0x800e +/* 05D26C 8005C66C C4286A1C */ lwc1 $f8, %lo(D_800E6A18 + 4)($at) +/* 05D270 8005C670 3C01800E */ lui $at, %hi(D_800E6A20 + 4) # $at, 0x800e /* 05D274 8005C674 4628003C */ c.lt.d $f0, $f8 /* 05D278 8005C678 240D0002 */ li $t5, 2 /* 05D27C 8005C67C 45010008 */ bc1t .L8005C6A0 /* 05D280 8005C680 00000000 */ nop /* 05D284 8005C684 C42B6A20 */ lwc1 $f11, %lo(D_800E6A20)($at) -/* 05D288 8005C688 C42A6A24 */ lwc1 $f10, %lo(D_800E6A24)($at) +/* 05D288 8005C688 C42A6A24 */ lwc1 $f10, %lo(D_800E6A20 + 4)($at) /* 05D28C 8005C68C 00000000 */ nop /* 05D290 8005C690 4620503C */ c.lt.d $f10, $f0 /* 05D294 8005C694 00000000 */ nop @@ -362,9 +362,9 @@ glabel func_8005C364 /* 05D48C 8005C88C 460E7102 */ mul.s $f4, $f14, $f14 /* 05D490 8005C890 0C0326B4 */ jal sqrtf /* 05D494 8005C894 46049300 */ add.s $f12, $f18, $f4 -/* 05D498 8005C898 3C01800E */ lui $at, %hi(D_800E6A2C) # $at, 0x800e +/* 05D498 8005C898 3C01800E */ lui $at, %hi(D_800E6A28 + 4) # $at, 0x800e /* 05D49C 8005C89C C4296A28 */ lwc1 $f9, %lo(D_800E6A28)($at) -/* 05D4A0 8005C8A0 C4286A2C */ lwc1 $f8, %lo(D_800E6A2C)($at) +/* 05D4A0 8005C8A0 C4286A2C */ lwc1 $f8, %lo(D_800E6A28 + 4)($at) /* 05D4A4 8005C8A4 460001A1 */ cvt.d.s $f6, $f0 /* 05D4A8 8005C8A8 4628303C */ c.lt.d $f6, $f8 /* 05D4AC 8005C8AC 8FA50038 */ lw $a1, 0x38($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s index e4eaaede..8836a3c2 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s @@ -143,10 +143,10 @@ glabel func_8005D0D0 /* 05DEC4 8005D2C4 0C01A7CA */ jal func_80069F28 /* 05DEC8 8005D2C8 00000000 */ nop /* 05DECC 8005D2CC A2000187 */ sb $zero, 0x187($s0) -/* 05DED0 8005D2D0 3C01800E */ lui $at, %hi(D_800E6A34) # $at, 0x800e +/* 05DED0 8005D2D0 3C01800E */ lui $at, %hi(D_800E6A30 + 4) # $at, 0x800e /* 05DED4 8005D2D4 C604002C */ lwc1 $f4, 0x2c($s0) /* 05DED8 8005D2D8 C4296A30 */ lwc1 $f9, %lo(D_800E6A30)($at) -/* 05DEDC 8005D2DC C4286A34 */ lwc1 $f8, %lo(D_800E6A34)($at) +/* 05DEDC 8005D2DC C4286A34 */ lwc1 $f8, %lo(D_800E6A30 + 4)($at) /* 05DEE0 8005D2E0 460021A1 */ cvt.d.s $f6, $f4 /* 05DEE4 8005D2E4 46283282 */ mul.d $f10, $f6, $f8 /* 05DEE8 8005D2E8 3C01401E */ li $at, 0x401E0000 # 2.468750 @@ -203,7 +203,7 @@ glabel func_8005D0D0 /* 05DFA8 8005D3A8 44809000 */ mtc1 $zero, $f18 /* 05DFAC 8005D3AC 46005021 */ cvt.d.s $f0, $f10 /* 05DFB0 8005D3B0 4632003C */ c.lt.d $f0, $f18 -/* 05DFB4 8005D3B4 3C01800E */ lui $at, %hi(D_800E6A3C) # $at, 0x800e +/* 05DFB4 8005D3B4 3C01800E */ lui $at, %hi(D_800E6A38 + 4) # $at, 0x800e /* 05DFB8 8005D3B8 45000036 */ bc1f .L8005D494 /* 05DFBC 8005D3BC 00000000 */ nop /* 05DFC0 8005D3C0 10600024 */ beqz $v1, .L8005D454 @@ -265,14 +265,14 @@ glabel func_8005D0D0 /* 05E090 8005D490 E612000C */ swc1 $f18, 0xc($s0) .L8005D494: /* 05E094 8005D494 C4296A38 */ lwc1 $f9, %lo(D_800E6A38)($at) -/* 05E098 8005D498 C4286A3C */ lwc1 $f8, %lo(D_800E6A3C)($at) -/* 05E09C 8005D49C 3C01800E */ lui $at, %hi(D_800E6A44) # $at, 0x800e +/* 05E098 8005D498 C4286A3C */ lwc1 $f8, %lo(D_800E6A38 + 4)($at) +/* 05E09C 8005D49C 3C01800E */ lui $at, %hi(D_800E6A40 + 4) # $at, 0x800e /* 05E0A0 8005D4A0 4628003C */ c.lt.d $f0, $f8 /* 05E0A4 8005D4A4 240F0001 */ li $t7, 1 /* 05E0A8 8005D4A8 45010008 */ bc1t .L8005D4CC /* 05E0AC 8005D4AC 24180001 */ li $t8, 1 /* 05E0B0 8005D4B0 C4276A40 */ lwc1 $f7, %lo(D_800E6A40)($at) -/* 05E0B4 8005D4B4 C4266A44 */ lwc1 $f6, %lo(D_800E6A44)($at) +/* 05E0B4 8005D4B4 C4266A44 */ lwc1 $f6, %lo(D_800E6A40 + 4)($at) /* 05E0B8 8005D4B8 24190002 */ li $t9, 2 /* 05E0BC 8005D4BC 4620303C */ c.lt.d $f6, $f0 /* 05E0C0 8005D4C0 240A0002 */ li $t2, 2 @@ -411,9 +411,9 @@ glabel func_8005D0D0 /* 05E2AC 8005D6AC 460E7102 */ mul.s $f4, $f14, $f14 /* 05E2B0 8005D6B0 0C0326B4 */ jal sqrtf /* 05E2B4 8005D6B4 46049300 */ add.s $f12, $f18, $f4 -/* 05E2B8 8005D6B8 3C01800E */ lui $at, %hi(D_800E6A4C) # $at, 0x800e +/* 05E2B8 8005D6B8 3C01800E */ lui $at, %hi(D_800E6A48 + 4) # $at, 0x800e /* 05E2BC 8005D6BC C4296A48 */ lwc1 $f9, %lo(D_800E6A48)($at) -/* 05E2C0 8005D6C0 C4286A4C */ lwc1 $f8, %lo(D_800E6A4C)($at) +/* 05E2C0 8005D6C0 C4286A4C */ lwc1 $f8, %lo(D_800E6A48 + 4)($at) /* 05E2C4 8005D6C4 460001A1 */ cvt.d.s $f6, $f0 /* 05E2C8 8005D6C8 4628303C */ c.lt.d $f6, $f8 /* 05E2CC 8005D6CC C7AE0050 */ lwc1 $f14, 0x50($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index f523bf35..86307223 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -32,21 +32,21 @@ glabel func_8005D820 /* 05E44C 8005D84C 0C01729E */ jal func_8005CA78 /* 05E450 8005D850 2484CE20 */ addiu $a0, %lo(D_800DCE20) # addiu $a0, $a0, -0x31e0 /* 05E454 8005D854 822E003B */ lb $t6, 0x3b($s1) -/* 05E458 8005D858 3C01800E */ lui $at, %hi(D_800E6A54) # $at, 0x800e +/* 05E458 8005D858 3C01800E */ lui $at, %hi(D_800E6A50 + 4) # $at, 0x800e /* 05E45C 8005D85C A7AE005E */ sh $t6, 0x5e($sp) /* 05E460 8005D860 860F016A */ lh $t7, 0x16a($s0) /* 05E464 8005D864 862A0018 */ lh $t2, 0x18($s1) /* 05E468 8005D868 A7AF005A */ sh $t7, 0x5a($sp) /* 05E46C 8005D86C C604002C */ lwc1 $f4, 0x2c($s0) /* 05E470 8005D870 C4276A50 */ lwc1 $f7, %lo(D_800E6A50)($at) -/* 05E474 8005D874 C4266A54 */ lwc1 $f6, %lo(D_800E6A54)($at) +/* 05E474 8005D874 C4266A54 */ lwc1 $f6, %lo(D_800E6A50 + 4)($at) /* 05E478 8005D878 46002021 */ cvt.d.s $f0, $f4 /* 05E47C 8005D87C 4626003C */ c.lt.d $f0, $f6 /* 05E480 8005D880 00000000 */ nop /* 05E484 8005D884 45000009 */ bc1f .L8005D8AC -/* 05E488 8005D888 3C01800E */ lui $at, %hi(D_800E6A5C) # $at, 0x800e +/* 05E488 8005D888 3C01800E */ lui $at, %hi(D_800E6A58 + 4) # $at, 0x800e /* 05E48C 8005D88C C4296A58 */ lwc1 $f9, %lo(D_800E6A58)($at) -/* 05E490 8005D890 C4286A5C */ lwc1 $f8, %lo(D_800E6A5C)($at) +/* 05E490 8005D890 C4286A5C */ lwc1 $f8, %lo(D_800E6A58 + 4)($at) /* 05E494 8005D894 8FB80074 */ lw $t8, 0x74($sp) /* 05E498 8005D898 4620403C */ c.lt.d $f8, $f0 /* 05E49C 8005D89C 00000000 */ nop @@ -157,10 +157,10 @@ glabel func_8005D820 /* 05E620 8005DA20 44816000 */ mtc1 $at, $f12 /* 05E624 8005DA24 0C01A7CA */ jal func_80069F28 /* 05E628 8005DA28 00000000 */ nop -/* 05E62C 8005DA2C 3C01800E */ lui $at, %hi(D_800E6A64) # $at, 0x800e +/* 05E62C 8005DA2C 3C01800E */ lui $at, %hi(D_800E6A60 + 4) # $at, 0x800e /* 05E630 8005DA30 C62A001C */ lwc1 $f10, 0x1c($s1) /* 05E634 8005DA34 C4216A60 */ lwc1 $f1, %lo(D_800E6A60)($at) -/* 05E638 8005DA38 C4206A64 */ lwc1 $f0, %lo(D_800E6A64)($at) +/* 05E638 8005DA38 C4206A64 */ lwc1 $f0, %lo(D_800E6A60 + 4)($at) /* 05E63C 8005DA3C 460054A1 */ cvt.d.s $f18, $f10 /* 05E640 8005DA40 46209102 */ mul.d $f4, $f18, $f0 /* 05E644 8005DA44 C6280024 */ lwc1 $f8, 0x24($s1) @@ -227,10 +227,10 @@ glabel func_8005D820 /* 05E730 8005DB30 460C3202 */ mul.s $f8, $f6, $f12 /* 05E734 8005DB34 000C6900 */ sll $t5, $t4, 4 /* 05E738 8005DB38 25AEFFEF */ addiu $t6, $t5, -0x11 -/* 05E73C 8005DB3C 3C01800E */ lui $at, %hi(D_800E6A6C) # $at, 0x800e +/* 05E73C 8005DB3C 3C01800E */ lui $at, %hi(D_800E6A68 + 4) # $at, 0x800e /* 05E740 8005DB40 448E2000 */ mtc1 $t6, $f4 /* 05E744 8005DB44 C4336A68 */ lwc1 $f19, %lo(D_800E6A68)($at) -/* 05E748 8005DB48 C4326A6C */ lwc1 $f18, %lo(D_800E6A6C)($at) +/* 05E748 8005DB48 C4326A6C */ lwc1 $f18, %lo(D_800E6A68 + 4)($at) /* 05E74C 8005DB4C 460042A1 */ cvt.d.s $f10, $f8 /* 05E750 8005DB50 46802520 */ cvt.s.w $f20, $f4 /* 05E754 8005DB54 44803000 */ mtc1 $zero, $f6 @@ -444,7 +444,7 @@ glabel L8005DCE8 /* 05EA3C 8005DE3C 4458F800 */ cfc1 $t8, $31 .L8005DE40: /* 05EA40 8005DE40 14C3000B */ bne $a2, $v1, .L8005DE70 -/* 05EA44 8005DE44 3C01800E */ lui $at, %hi(D_800E6A8C) # $at, 0x800e +/* 05EA44 8005DE44 3C01800E */ lui $at, %hi(D_800E6A88 + 4) # $at, 0x800e /* 05EA48 8005DE48 921901CD */ lbu $t9, 0x1cd($s0) /* 05EA4C 8005DE4C 24010004 */ li $at, 4 /* 05EA50 8005DE50 17210003 */ bne $t9, $at, .L8005DE60 @@ -460,14 +460,14 @@ glabel L8005DCE8 .L8005DE70: /* 05EA70 8005DE70 C604002C */ lwc1 $f4, 0x2c($s0) /* 05EA74 8005DE74 C4276A88 */ lwc1 $f7, %lo(D_800E6A88)($at) -/* 05EA78 8005DE78 C4266A8C */ lwc1 $f6, %lo(D_800E6A8C)($at) +/* 05EA78 8005DE78 C4266A8C */ lwc1 $f6, %lo(D_800E6A88 + 4)($at) /* 05EA7C 8005DE7C 46002021 */ cvt.d.s $f0, $f4 /* 05EA80 8005DE80 4620303C */ c.lt.d $f6, $f0 -/* 05EA84 8005DE84 3C01800E */ lui $at, %hi(D_800E6A94) # $at, 0x800e +/* 05EA84 8005DE84 3C01800E */ lui $at, %hi(D_800E6A90 + 4) # $at, 0x800e /* 05EA88 8005DE88 4500001C */ bc1f .L8005DEFC /* 05EA8C 8005DE8C 00000000 */ nop /* 05EA90 8005DE90 C4296A90 */ lwc1 $f9, %lo(D_800E6A90)($at) -/* 05EA94 8005DE94 C4286A94 */ lwc1 $f8, %lo(D_800E6A94)($at) +/* 05EA94 8005DE94 C4286A94 */ lwc1 $f8, %lo(D_800E6A90 + 4)($at) /* 05EA98 8005DE98 00000000 */ nop /* 05EA9C 8005DE9C 4628003C */ c.lt.d $f0, $f8 /* 05EAA0 8005DEA0 00000000 */ nop @@ -613,9 +613,9 @@ glabel L8005DCE8 /* 05ECA8 8005E0A8 460E7202 */ mul.s $f8, $f14, $f14 /* 05ECAC 8005E0AC 0C0326B4 */ jal sqrtf /* 05ECB0 8005E0B0 46082300 */ add.s $f12, $f4, $f8 -/* 05ECB4 8005E0B4 3C01800E */ lui $at, %hi(D_800E6A9C) # $at, 0x800e +/* 05ECB4 8005E0B4 3C01800E */ lui $at, %hi(D_800E6A98 + 4) # $at, 0x800e /* 05ECB8 8005E0B8 C4336A98 */ lwc1 $f19, %lo(D_800E6A98)($at) -/* 05ECBC 8005E0BC C4326A9C */ lwc1 $f18, %lo(D_800E6A9C)($at) +/* 05ECBC 8005E0BC C4326A9C */ lwc1 $f18, %lo(D_800E6A98 + 4)($at) /* 05ECC0 8005E0C0 460002A1 */ cvt.d.s $f10, $f0 /* 05ECC4 8005E0C4 4632503C */ c.lt.d $f10, $f18 /* 05ECC8 8005E0C8 C7AE0050 */ lwc1 $f14, 0x50($sp) diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index 19701edb..8ff41016 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -140,10 +140,10 @@ glabel func_8005E4C0 /* 05F2B8 8005E6B8 44816000 */ mtc1 $at, $f12 /* 05F2BC 8005E6BC 0C01A7CA */ jal func_80069F28 /* 05F2C0 8005E6C0 00000000 */ nop -/* 05F2C4 8005E6C4 3C01800E */ lui $at, %hi(D_800E6AA4) # $at, 0x800e +/* 05F2C4 8005E6C4 3C01800E */ lui $at, %hi(D_800E6AA0 + 4) # $at, 0x800e /* 05F2C8 8005E6C8 C604002C */ lwc1 $f4, 0x2c($s0) /* 05F2CC 8005E6CC C4296AA0 */ lwc1 $f9, %lo(D_800E6AA0)($at) -/* 05F2D0 8005E6D0 C4286AA4 */ lwc1 $f8, %lo(D_800E6AA4)($at) +/* 05F2D0 8005E6D0 C4286AA4 */ lwc1 $f8, %lo(D_800E6AA0 + 4)($at) /* 05F2D4 8005E6D4 460021A1 */ cvt.d.s $f6, $f4 /* 05F2D8 8005E6D8 46283282 */ mul.d $f10, $f6, $f8 /* 05F2DC 8005E6DC 44808000 */ mtc1 $zero, $f16 @@ -305,9 +305,9 @@ glabel func_8005E4C0 /* 05F520 8005E920 460E7282 */ mul.s $f10, $f14, $f14 /* 05F524 8005E924 0C0326B4 */ jal sqrtf /* 05F528 8005E928 460A4300 */ add.s $f12, $f8, $f10 -/* 05F52C 8005E92C 3C01800E */ lui $at, %hi(D_800E6AAC) # $at, 0x800e +/* 05F52C 8005E92C 3C01800E */ lui $at, %hi(D_800E6AA8 + 4) # $at, 0x800e /* 05F530 8005E930 C4256AA8 */ lwc1 $f5, %lo(D_800E6AA8)($at) -/* 05F534 8005E934 C4246AAC */ lwc1 $f4, %lo(D_800E6AAC)($at) +/* 05F534 8005E934 C4246AAC */ lwc1 $f4, %lo(D_800E6AA8 + 4)($at) /* 05F538 8005E938 460004A1 */ cvt.d.s $f18, $f0 /* 05F53C 8005E93C 4624903C */ c.lt.d $f18, $f4 /* 05F540 8005E940 8FA50038 */ lw $a1, 0x38($sp) diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index 11c123e4..1e7f1d55 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -29,13 +29,13 @@ glabel func_8005EA90 /* 05F6B8 8005EAB8 2484CE60 */ addiu $a0, %lo(D_800DCE60) # addiu $a0, $a0, -0x31a0 /* 05F6BC 8005EABC A20001EC */ sb $zero, 0x1ec($s0) /* 05F6C0 8005EAC0 822E003B */ lb $t6, 0x3b($s1) -/* 05F6C4 8005EAC4 3C01800E */ lui $at, %hi(D_800E6AB4) # $at, 0x800e +/* 05F6C4 8005EAC4 3C01800E */ lui $at, %hi(D_800E6AB0 + 4) # $at, 0x800e /* 05F6C8 8005EAC8 A7AE003E */ sh $t6, 0x3e($sp) /* 05F6CC 8005EACC 862F0018 */ lh $t7, 0x18($s1) /* 05F6D0 8005EAD0 C4276AB0 */ lwc1 $f7, %lo(D_800E6AB0)($at) /* 05F6D4 8005EAD4 A7AF003C */ sh $t7, 0x3c($sp) /* 05F6D8 8005EAD8 8618016A */ lh $t8, 0x16a($s0) -/* 05F6DC 8005EADC C4266AB4 */ lwc1 $f6, %lo(D_800E6AB4)($at) +/* 05F6DC 8005EADC C4266AB4 */ lwc1 $f6, %lo(D_800E6AB0 + 4)($at) /* 05F6E0 8005EAE0 A7B8003A */ sh $t8, 0x3a($sp) /* 05F6E4 8005EAE4 C604002C */ lwc1 $f4, 0x2c($s0) /* 05F6E8 8005EAE8 00000000 */ nop @@ -43,9 +43,9 @@ glabel func_8005EA90 /* 05F6F0 8005EAF0 4626003C */ c.lt.d $f0, $f6 /* 05F6F4 8005EAF4 00000000 */ nop /* 05F6F8 8005EAF8 45000009 */ bc1f .L8005EB20 -/* 05F6FC 8005EAFC 3C01800E */ lui $at, %hi(D_800E6ABC) # $at, 0x800e +/* 05F6FC 8005EAFC 3C01800E */ lui $at, %hi(D_800E6AB8 + 4) # $at, 0x800e /* 05F700 8005EB00 C4296AB8 */ lwc1 $f9, %lo(D_800E6AB8)($at) -/* 05F704 8005EB04 C4286ABC */ lwc1 $f8, %lo(D_800E6ABC)($at) +/* 05F704 8005EB04 C4286ABC */ lwc1 $f8, %lo(D_800E6AB8 + 4)($at) /* 05F708 8005EB08 8FB90054 */ lw $t9, 0x54($sp) /* 05F70C 8005EB0C 4620403C */ c.lt.d $f8, $f0 /* 05F710 8005EB10 00000000 */ nop @@ -153,10 +153,10 @@ glabel func_8005EA90 /* 05F890 8005EC90 44816000 */ mtc1 $at, $f12 /* 05F894 8005EC94 0C01A7CA */ jal func_80069F28 /* 05F898 8005EC98 00000000 */ nop -/* 05F89C 8005EC9C 3C01800E */ lui $at, %hi(D_800E6AC4) # $at, 0x800e +/* 05F89C 8005EC9C 3C01800E */ lui $at, %hi(D_800E6AC0 + 4) # $at, 0x800e /* 05F8A0 8005ECA0 C62A001C */ lwc1 $f10, 0x1c($s1) /* 05F8A4 8005ECA4 C4216AC0 */ lwc1 $f1, %lo(D_800E6AC0)($at) -/* 05F8A8 8005ECA8 C4206AC4 */ lwc1 $f0, %lo(D_800E6AC4)($at) +/* 05F8A8 8005ECA8 C4206AC4 */ lwc1 $f0, %lo(D_800E6AC0 + 4)($at) /* 05F8AC 8005ECAC 46005121 */ cvt.d.s $f4, $f10 /* 05F8B0 8005ECB0 46202182 */ mul.d $f6, $f4, $f0 /* 05F8B4 8005ECB4 C62A0024 */ lwc1 $f10, 0x24($s1) @@ -238,13 +238,13 @@ glabel func_8005EA90 /* 05F9D8 8005EDD8 460E3202 */ mul.s $f8, $f6, $f14 /* 05F9DC 8005EDDC 01AE7821 */ addu $t7, $t5, $t6 /* 05F9E0 8005EDE0 8DF80004 */ lw $t8, 4($t7) -/* 05F9E4 8005EDE4 3C01800E */ lui $at, %hi(D_800E6ACC) # $at, 0x800e +/* 05F9E4 8005EDE4 3C01800E */ lui $at, %hi(D_800E6AC8 + 4) # $at, 0x800e /* 05F9E8 8005EDE8 0018C900 */ sll $t9, $t8, 4 /* 05F9EC 8005EDEC 272AFFEF */ addiu $t2, $t9, -0x11 /* 05F9F0 8005EDF0 448A2000 */ mtc1 $t2, $f4 /* 05F9F4 8005EDF4 C4256AC8 */ lwc1 $f5, %lo(D_800E6AC8)($at) /* 05F9F8 8005EDF8 468020A0 */ cvt.s.w $f2, $f4 -/* 05F9FC 8005EDFC C4246ACC */ lwc1 $f4, %lo(D_800E6ACC)($at) +/* 05F9FC 8005EDFC C4246ACC */ lwc1 $f4, %lo(D_800E6AC8 + 4)($at) /* 05FA00 8005EE00 44804800 */ mtc1 $zero, $f9 /* 05FA04 8005EE04 460042A1 */ cvt.d.s $f10, $f8 /* 05FA08 8005EE08 46245182 */ mul.d $f6, $f10, $f4 @@ -446,7 +446,7 @@ glabel L8005EF98 /* 05FCC0 8005F0C0 444EF800 */ cfc1 $t6, $31 .L8005F0C4: /* 05FCC4 8005F0C4 14E3000B */ bne $a3, $v1, .L8005F0F4 -/* 05FCC8 8005F0C8 3C01800E */ lui $at, %hi(D_800E6AEC) # $at, 0x800e +/* 05FCC8 8005F0C8 3C01800E */ lui $at, %hi(D_800E6AE8 + 4) # $at, 0x800e /* 05FCCC 8005F0CC 920B01CD */ lbu $t3, 0x1cd($s0) /* 05FCD0 8005F0D0 24010004 */ li $at, 4 /* 05FCD4 8005F0D4 15610003 */ bne $t3, $at, .L8005F0E4 @@ -462,14 +462,14 @@ glabel L8005EF98 .L8005F0F4: /* 05FCF4 8005F0F4 C608002C */ lwc1 $f8, 0x2c($s0) /* 05FCF8 8005F0F8 C42B6AE8 */ lwc1 $f11, %lo(D_800E6AE8)($at) -/* 05FCFC 8005F0FC C42A6AEC */ lwc1 $f10, %lo(D_800E6AEC)($at) +/* 05FCFC 8005F0FC C42A6AEC */ lwc1 $f10, %lo(D_800E6AE8 + 4)($at) /* 05FD00 8005F100 46004021 */ cvt.d.s $f0, $f8 /* 05FD04 8005F104 4620503C */ c.lt.d $f10, $f0 -/* 05FD08 8005F108 3C01800E */ lui $at, %hi(D_800E6AF4) # $at, 0x800e +/* 05FD08 8005F108 3C01800E */ lui $at, %hi(D_800E6AF0 + 4) # $at, 0x800e /* 05FD0C 8005F10C 4500001C */ bc1f .L8005F180 /* 05FD10 8005F110 00000000 */ nop /* 05FD14 8005F114 C4256AF0 */ lwc1 $f5, %lo(D_800E6AF0)($at) -/* 05FD18 8005F118 C4246AF4 */ lwc1 $f4, %lo(D_800E6AF4)($at) +/* 05FD18 8005F118 C4246AF4 */ lwc1 $f4, %lo(D_800E6AF0 + 4)($at) /* 05FD1C 8005F11C 00000000 */ nop /* 05FD20 8005F120 4624003C */ c.lt.d $f0, $f4 /* 05FD24 8005F124 00000000 */ nop diff --git a/asm/non_matchings/unknown_05F690/func_8005F310.s b/asm/non_matchings/unknown_05F690/func_8005F310.s index 5cf32d49..bc831341 100644 --- a/asm/non_matchings/unknown_05F690/func_8005F310.s +++ b/asm/non_matchings/unknown_05F690/func_8005F310.s @@ -22,7 +22,7 @@ glabel func_8005F310 /* 05FF3C 8005F33C 3C01800E */ lui $at, %hi(D_800E6B00) # $at, 0x800e /* 05FF40 8005F340 A0E001EC */ sb $zero, 0x1ec($a3) /* 05FF44 8005F344 820E003B */ lb $t6, 0x3b($s0) -/* 05FF48 8005F348 C4266B04 */ lwc1 $f6, %lo(D_800E6B04)($at) +/* 05FF48 8005F348 C4266B04 */ lwc1 $f6, %lo(D_800E6B00 + 4)($at) /* 05FF4C 8005F34C A7AE003E */ sh $t6, 0x3e($sp) /* 05FF50 8005F350 860F0018 */ lh $t7, 0x18($s0) /* 05FF54 8005F354 C4276B00 */ lwc1 $f7, %lo(D_800E6B00)($at) @@ -36,9 +36,9 @@ glabel func_8005F310 /* 05FF74 8005F374 4626003C */ c.lt.d $f0, $f6 /* 05FF78 8005F378 00000000 */ nop /* 05FF7C 8005F37C 45000009 */ bc1f .L8005F3A4 -/* 05FF80 8005F380 3C01800E */ lui $at, %hi(D_800E6B0C) # $at, 0x800e +/* 05FF80 8005F380 3C01800E */ lui $at, %hi(D_800E6B08 + 4) # $at, 0x800e /* 05FF84 8005F384 C4296B08 */ lwc1 $f9, %lo(D_800E6B08)($at) -/* 05FF88 8005F388 C4286B0C */ lwc1 $f8, %lo(D_800E6B0C)($at) +/* 05FF88 8005F388 C4286B0C */ lwc1 $f8, %lo(D_800E6B08 + 4)($at) /* 05FF8C 8005F38C 8FB90054 */ lw $t9, 0x54($sp) /* 05FF90 8005F390 4620403C */ c.lt.d $f8, $f0 /* 05FF94 8005F394 00000000 */ nop @@ -153,10 +153,10 @@ glabel func_8005F310 /* 06012C 8005F52C 44816000 */ mtc1 $at, $f12 /* 060130 8005F530 0C01A7CA */ jal func_80069F28 /* 060134 8005F534 00000000 */ nop -/* 060138 8005F538 3C01800E */ lui $at, %hi(D_800E6B14) # $at, 0x800e +/* 060138 8005F538 3C01800E */ lui $at, %hi(D_800E6B10 + 4) # $at, 0x800e /* 06013C 8005F53C C60A001C */ lwc1 $f10, 0x1c($s0) /* 060140 8005F540 C4216B10 */ lwc1 $f1, %lo(D_800E6B10)($at) -/* 060144 8005F544 C4206B14 */ lwc1 $f0, %lo(D_800E6B14)($at) +/* 060144 8005F544 C4206B14 */ lwc1 $f0, %lo(D_800E6B10 + 4)($at) /* 060148 8005F548 46005121 */ cvt.d.s $f4, $f10 /* 06014C 8005F54C 46202182 */ mul.d $f6, $f4, $f0 /* 060150 8005F550 C60A0024 */ lwc1 $f10, 0x24($s0) diff --git a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s index c59c988d..6a10fe67 100644 --- a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s +++ b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s @@ -8,10 +8,10 @@ glabel __timeToSamplesNoRound /* 066358 80065758 44852000 */ mtc1 $a1, $f4 /* 06635C 8006575C 448E4000 */ mtc1 $t6, $f8 /* 066360 80065760 468021A0 */ cvt.s.w $f6, $f4 -/* 066364 80065764 3C01800E */ lui $at, %hi(D_800E6EC4) # $at, 0x800e +/* 066364 80065764 3C01800E */ lui $at, %hi(D_800E6EC0 + 4) # $at, 0x800e /* 066368 80065768 C4256EC0 */ lwc1 $f5, %lo(D_800E6EC0)($at) /* 06636C 8006576C 468042A0 */ cvt.s.w $f10, $f8 -/* 066370 80065770 C4246EC4 */ lwc1 $f4, %lo(D_800E6EC4)($at) +/* 066370 80065770 C4246EC4 */ lwc1 $f4, %lo(D_800E6EC0 + 4)($at) /* 066374 80065774 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 066378 80065778 460A3402 */ mul.s $f16, $f6, $f10 /* 06637C 8006577C 44803000 */ mtc1 $zero, $f6 diff --git a/asm/non_matchings/unknown_072E50/func_80072578.s b/asm/non_matchings/unknown_072E50/func_80072578.s index 2e2f24f5..00a6d20e 100644 --- a/asm/non_matchings/unknown_072E50/func_80072578.s +++ b/asm/non_matchings/unknown_072E50/func_80072578.s @@ -42,10 +42,10 @@ glabel func_80072578 /* 073204 80072604 01F8C824 */ and $t9, $t7, $t8 /* 073208 80072608 A10E0000 */ sb $t6, ($t0) /* 07320C 8007260C A1390000 */ sb $t9, ($t1) -/* 073210 80072610 3C01800E */ lui $at, %hi(D_800E77E4) # $at, 0x800e +/* 073210 80072610 3C01800E */ lui $at, %hi(D_800E77E0 + 4) # $at, 0x800e /* 073214 80072614 468021A1 */ cvt.d.w $f6, $f4 /* 073218 80072618 C42977E0 */ lwc1 $f9, %lo(D_800E77E0)($at) -/* 07321C 8007261C C42877E4 */ lwc1 $f8, %lo(D_800E77E4)($at) +/* 07321C 8007261C C42877E4 */ lwc1 $f8, %lo(D_800E77E0 + 4)($at) /* 073220 80072620 01402025 */ move $a0, $t2 /* 073224 80072624 46283282 */ mul.d $f10, $f6, $f8 /* 073228 80072628 000A5080 */ sll $t2, $t2, 2 diff --git a/asm/non_matchings/unknown_072E50/func_80072718.s b/asm/non_matchings/unknown_072E50/func_80072718.s index 3a54a123..9c920bc7 100644 --- a/asm/non_matchings/unknown_072E50/func_80072718.s +++ b/asm/non_matchings/unknown_072E50/func_80072718.s @@ -125,13 +125,13 @@ glabel func_80072718 /* 0734D0 800728D0 8C84E48C */ lw $a0, %lo(D_800DE48C)($a0) /* 0734D4 800728D4 00000000 */ nop .L800728D8: -/* 0734D8 800728D8 3C01800E */ lui $at, %hi(D_800E77EC) # $at, 0x800e +/* 0734D8 800728D8 3C01800E */ lui $at, %hi(D_800E77E8 + 4) # $at, 0x800e /* 0734DC 800728DC C43777E8 */ lwc1 $f23, %lo(D_800E77E8)($at) -/* 0734E0 800728E0 C43677EC */ lwc1 $f22, %lo(D_800E77EC)($at) -/* 0734E4 800728E4 3C01800E */ lui $at, %hi(D_800E77F4) # $at, 0x800e +/* 0734E0 800728E0 C43677EC */ lwc1 $f22, %lo(D_800E77E8 + 4)($at) +/* 0734E4 800728E4 3C01800E */ lui $at, %hi(D_800E77F0 + 4) # $at, 0x800e /* 0734E8 800728E8 3C108012 */ lui $s0, %hi(D_801241B8) # $s0, 0x8012 /* 0734EC 800728EC C43577F0 */ lwc1 $f21, %lo(D_800E77F0)($at) -/* 0734F0 800728F0 C43477F4 */ lwc1 $f20, %lo(D_800E77F4)($at) +/* 0734F0 800728F0 C43477F4 */ lwc1 $f20, %lo(D_800E77F0 + 4)($at) /* 0734F4 800728F4 261041B8 */ addiu $s0, %lo(D_801241B8) # addiu $s0, $s0, 0x41b8 /* 0734F8 800728F8 00009825 */ move $s3, $zero /* 0734FC 800728FC 24030001 */ li $v1, 1 diff --git a/asm/non_matchings/unknown_072E50/func_80074EB8.s b/asm/non_matchings/unknown_072E50/func_80074EB8.s index a6e39c7c..642c0b0d 100644 --- a/asm/non_matchings/unknown_072E50/func_80074EB8.s +++ b/asm/non_matchings/unknown_072E50/func_80074EB8.s @@ -1,7 +1,8 @@ .rdata glabel D_800E7768 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E7778 +.word 0 .text glabel func_80074EB8 diff --git a/asm/non_matchings/unknown_072E50/func_80075000.s b/asm/non_matchings/unknown_072E50/func_80075000.s index d1da6c0b..f42f161d 100644 --- a/asm/non_matchings/unknown_072E50/func_80075000.s +++ b/asm/non_matchings/unknown_072E50/func_80075000.s @@ -1,10 +1,12 @@ .rdata glabel D_800E777C -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E778C +.word 0 glabel D_800E7790 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77A0 +.word 0 .text glabel func_80075000 diff --git a/asm/non_matchings/unknown_072E50/func_800753D8.s b/asm/non_matchings/unknown_072E50/func_800753D8.s index d6639ec9..60f637b7 100644 --- a/asm/non_matchings/unknown_072E50/func_800753D8.s +++ b/asm/non_matchings/unknown_072E50/func_800753D8.s @@ -1,10 +1,12 @@ .rdata glabel D_800E77A4 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77B4 +.word 0 glabel D_800E77B8 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77C8 +.word 0 .text glabel func_800753D8 diff --git a/asm/non_matchings/unknown_072E50/func_800756D4.s b/asm/non_matchings/unknown_072E50/func_800756D4.s index 48ce3b2f..160caded 100644 --- a/asm/non_matchings/unknown_072E50/func_800756D4.s +++ b/asm/non_matchings/unknown_072E50/func_800756D4.s @@ -1,7 +1,8 @@ .rdata glabel D_800E77CC -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77DC +.word 0 .text glabel func_800756D4 diff --git a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s index 5ac43352..a8cfffc2 100644 --- a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s @@ -137,14 +137,14 @@ glabel MenuLogoScreenLoop /* 083950 80082D50 240400FF */ li $a0, 255 /* 083954 80082D54 44818800 */ mtc1 $at, $f17 /* 083958 80082D58 44808000 */ mtc1 $zero, $f16 -/* 08395C 80082D5C 3C01800F */ lui $at, %hi(D_800E839C) # $at, 0x800f +/* 08395C 80082D5C 3C01800F */ lui $at, %hi(D_800E8398 + 4) # $at, 0x800f /* 083960 80082D60 4620803E */ c.le.d $f16, $f0 /* 083964 80082D64 00000000 */ nop /* 083968 80082D68 45000011 */ bc1f .L80082DB0 /* 08396C 80082D6C 00000000 */ nop /* 083970 80082D70 46206481 */ sub.d $f18, $f12, $f0 /* 083974 80082D74 C4258398 */ lwc1 $f5, %lo(D_800E8398)($at) -/* 083978 80082D78 C424839C */ lwc1 $f4, %lo(D_800E839C)($at) +/* 083978 80082D78 C424839C */ lwc1 $f4, %lo(D_800E8398 + 4)($at) /* 08397C 80082D7C 00000000 */ nop /* 083980 80082D80 46249182 */ mul.d $f6, $f18, $f4 /* 083984 80082D84 444DF800 */ cfc1 $t5, $31 @@ -169,14 +169,14 @@ glabel MenuLogoScreenLoop /* 0839CC 80082DCC 00000000 */ nop /* 0839D0 80082DD0 44811800 */ mtc1 $at, $f3 /* 0839D4 80082DD4 44801000 */ mtc1 $zero, $f2 -/* 0839D8 80082DD8 3C01800F */ lui $at, %hi(D_800E83A4) # $at, 0x800f +/* 0839D8 80082DD8 3C01800F */ lui $at, %hi(D_800E83A0 + 4) # $at, 0x800f /* 0839DC 80082DDC 4620103E */ c.le.d $f2, $f0 /* 0839E0 80082DE0 00000000 */ nop /* 0839E4 80082DE4 45000011 */ bc1f .L80082E2C /* 0839E8 80082DE8 00000000 */ nop /* 0839EC 80082DEC 46220401 */ sub.d $f16, $f0, $f2 /* 0839F0 80082DF0 C43383A0 */ lwc1 $f19, %lo(D_800E83A0)($at) -/* 0839F4 80082DF4 C43283A4 */ lwc1 $f18, %lo(D_800E83A4)($at) +/* 0839F4 80082DF4 C43283A4 */ lwc1 $f18, %lo(D_800E83A0 + 4)($at) /* 0839F8 80082DF8 00000000 */ nop /* 0839FC 80082DFC 46328102 */ mul.d $f4, $f16, $f18 /* 083A00 80082E00 444EF800 */ cfc1 $t6, $31 @@ -252,9 +252,9 @@ glabel MenuLogoScreenLoop /* 083B10 80082F10 3C014021 */ li $at, 0x40210000 # 2.515625 /* 083B14 80082F14 44815800 */ mtc1 $at, $f11 /* 083B18 80082F18 44805000 */ mtc1 $zero, $f10 -/* 083B1C 80082F1C 3C01800F */ lui $at, %hi(D_800E83AC) # $at, 0x800f +/* 083B1C 80082F1C 3C01800F */ lui $at, %hi(D_800E83A8 + 4) # $at, 0x800f /* 083B20 80082F20 C43383A8 */ lwc1 $f19, %lo(D_800E83A8)($at) -/* 083B24 80082F24 C43283AC */ lwc1 $f18, %lo(D_800E83AC)($at) +/* 083B24 80082F24 C43283AC */ lwc1 $f18, %lo(D_800E83A8 + 4)($at) /* 083B28 80082F28 46205401 */ sub.d $f16, $f10, $f0 /* 083B2C 80082F2C 46328102 */ mul.d $f4, $f16, $f18 /* 083B30 80082F30 444BF800 */ cfc1 $t3, $31 diff --git a/asm/non_matchings/unknown_080500/func_8008FA54.s b/asm/non_matchings/unknown_080500/func_8008FA54.s index 4420b1d1..17603d31 100644 --- a/asm/non_matchings/unknown_080500/func_8008FA54.s +++ b/asm/non_matchings/unknown_080500/func_8008FA54.s @@ -138,9 +138,9 @@ glabel func_8008FA54 /* 090844 8008FC44 46006086 */ mov.s $f2, $f12 /* 090848 8008FC48 17200007 */ bnez $t9, .L8008FC68 /* 09084C 8008FC4C 46006006 */ mov.s $f0, $f12 -/* 090850 8008FC50 3C01800F */ lui $at, %hi(D_800E84D4) # $at, 0x800f +/* 090850 8008FC50 3C01800F */ lui $at, %hi(D_800E84D0 + 4) # $at, 0x800f /* 090854 8008FC54 C42784D0 */ lwc1 $f7, %lo(D_800E84D0)($at) -/* 090858 8008FC58 C42684D4 */ lwc1 $f6, %lo(D_800E84D4)($at) +/* 090858 8008FC58 C42684D4 */ lwc1 $f6, %lo(D_800E84D0 + 4)($at) /* 09085C 8008FC5C 46006121 */ cvt.d.s $f4, $f12 /* 090860 8008FC60 46262202 */ mul.d $f8, $f4, $f6 /* 090864 8008FC64 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_080500/func_800904E8.s b/asm/non_matchings/unknown_080500/func_800904E8.s index ebe5599c..276faded 100644 --- a/asm/non_matchings/unknown_080500/func_800904E8.s +++ b/asm/non_matchings/unknown_080500/func_800904E8.s @@ -20,11 +20,11 @@ glabel func_800904E8 /* 091114 80090514 C42E69E8 */ lwc1 $f14, %lo(D_801269E8)($at) /* 091118 80090518 3C018012 */ lui $at, %hi(D_801269EC) # $at, 0x8012 /* 09111C 8009051C C43069EC */ lwc1 $f16, %lo(D_801269EC)($at) -/* 091120 80090520 3C01800F */ lui $at, %hi(D_800E84E4) # $at, 0x800f +/* 091120 80090520 3C01800F */ lui $at, %hi(D_800E84E0 + 4) # $at, 0x800f /* 091124 80090524 3C088012 */ lui $t0, %hi(D_801269E4) # $t0, 0x8012 /* 091128 80090528 3C038012 */ lui $v1, %hi(D_801269DC) # $v1, 0x8012 /* 09112C 8009052C C42184E0 */ lwc1 $f1, %lo(D_800E84E0)($at) -/* 091130 80090530 C42084E4 */ lwc1 $f0, %lo(D_800E84E4)($at) +/* 091130 80090530 C42084E4 */ lwc1 $f0, %lo(D_800E84E0 + 4)($at) /* 091134 80090534 246369DC */ addiu $v1, %lo(D_801269DC) # addiu $v1, $v1, 0x69dc /* 091138 80090538 250869E4 */ addiu $t0, %lo(D_801269E4) # addiu $t0, $t0, 0x69e4 /* 09113C 8009053C C4660000 */ lwc1 $f6, ($v1) @@ -67,9 +67,9 @@ glabel func_800904E8 /* 0911C8 800905C8 E5080000 */ swc1 $f8, ($t0) /* 0911CC 800905CC 1045004D */ beq $v0, $a1, .L80090704 .L800905D0: -/* 0911D0 800905D0 3C01800F */ lui $at, %hi(D_800E84EC) # $at, 0x800f +/* 0911D0 800905D0 3C01800F */ lui $at, %hi(D_800E84E8 + 4) # $at, 0x800f /* 0911D4 800905D4 C42184E8 */ lwc1 $f1, %lo(D_800E84E8)($at) -/* 0911D8 800905D8 C42084EC */ lwc1 $f0, %lo(D_800E84EC)($at) +/* 0911D8 800905D8 C42084EC */ lwc1 $f0, %lo(D_800E84E8 + 4)($at) /* 0911DC 800905DC 3C018012 */ lui $at, %hi(D_801269E8) # $at, 0x8012 /* 0911E0 800905E0 C42E69E8 */ lwc1 $f14, %lo(D_801269E8)($at) /* 0911E4 800905E4 3C018012 */ lui $at, %hi(D_801269EC) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/unknown_09F8F0/func_8009F034.s index 81f7bf5f..7a0cb2dd 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009F034.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009F034.s @@ -181,13 +181,13 @@ glabel func_8009F034 /* 09FE68 8009F268 4481A000 */ mtc1 $at, $f20 /* 09FE6C 8009F26C 3C013FE8 */ li $at, 0x3FE80000 # 1.812500 /* 09FE70 8009F270 44818800 */ mtc1 $at, $f17 -/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86AC) # $at, 0x800f +/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86A8 + 4) # $at, 0x800f /* 09FE78 8009F278 27186CE0 */ addiu $t8, %lo(D_80126CE0) # addiu $t8, $t8, 0x6ce0 /* 09FE7C 8009F27C 3C10800E */ lui $s0, %hi(D_800E25C4) # $s0, 0x800e /* 09FE80 8009F280 3C098012 */ lui $t1, %hi(D_80126CF0) # $t1, 0x8012 /* 09FE84 8009F284 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012 /* 09FE88 8009F288 C42F86A8 */ lwc1 $f15, %lo(D_800E86A8)($at) -/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86AC)($at) +/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86A8 + 4)($at) /* 09FE90 8009F290 44808000 */ mtc1 $zero, $f16 /* 09FE94 8009F294 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc /* 09FE98 8009F298 25296CF0 */ addiu $t1, %lo(D_80126CF0) # addiu $t1, $t1, 0x6cf0 @@ -912,12 +912,12 @@ glabel func_8009F034 /* 0A0924 8009FD24 AFA70090 */ sw $a3, 0x90($sp) /* 0A0928 8009FD28 3C014120 */ li $at, 0x41200000 # 10.000000 /* 0A092C 8009FD2C 44811000 */ mtc1 $at, $f2 -/* 0A0930 8009FD30 3C01800F */ lui $at, %hi(D_800E86EC) # $at, 0x800f +/* 0A0930 8009FD30 3C01800F */ lui $at, %hi(D_800E86E8 + 4) # $at, 0x800f /* 0A0934 8009FD34 C42D86E8 */ lwc1 $f13, %lo(D_800E86E8)($at) -/* 0A0938 8009FD38 C42C86EC */ lwc1 $f12, %lo(D_800E86EC)($at) -/* 0A093C 8009FD3C 3C01800F */ lui $at, %hi(D_800E86F4) # $at, 0x800f +/* 0A0938 8009FD38 C42C86EC */ lwc1 $f12, %lo(D_800E86E8 + 4)($at) +/* 0A093C 8009FD3C 3C01800F */ lui $at, %hi(D_800E86F0 + 4) # $at, 0x800f /* 0A0940 8009FD40 C42F86F0 */ lwc1 $f15, %lo(D_800E86F0)($at) -/* 0A0944 8009FD44 C42E86F4 */ lwc1 $f14, %lo(D_800E86F4)($at) +/* 0A0944 8009FD44 C42E86F4 */ lwc1 $f14, %lo(D_800E86F0 + 4)($at) /* 0A0948 8009FD48 3C013FE8 */ li $at, 0x3FE80000 # 1.812500 /* 0A094C 8009FD4C 44818800 */ mtc1 $at, $f17 /* 0A0950 8009FD50 3C014080 */ li $at, 0x40800000 # 4.000000 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s index 76e44600..3ab4de32 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s @@ -188,11 +188,11 @@ glabel func_800A14F0 /* 0A238C 800A178C 3C01425C */ li $at, 0x425C0000 # 55.000000 /* 0A2390 800A1790 46009124 */ cvt.w.s $f4, $f18 /* 0A2394 800A1794 44811000 */ mtc1 $at, $f2 -/* 0A2398 800A1798 3C01800F */ lui $at, %hi(D_800E8724) # $at, 0x800f +/* 0A2398 800A1798 3C01800F */ lui $at, %hi(D_800E8720 + 4) # $at, 0x800f /* 0A239C 800A179C 44192000 */ mfc1 $t9, $f4 /* 0A23A0 800A17A0 44D8F800 */ ctc1 $t8, $31 /* 0A23A4 800A17A4 C4218720 */ lwc1 $f1, %lo(D_800E8720)($at) -/* 0A23A8 800A17A8 C4208724 */ lwc1 $f0, %lo(D_800E8724)($at) +/* 0A23A8 800A17A8 C4208724 */ lwc1 $f0, %lo(D_800E8720 + 4)($at) /* 0A23AC 800A17AC AFB90038 */ sw $t9, 0x38($sp) /* 0A23B0 800A17B0 46803320 */ cvt.s.w $f12, $f6 .L800A17B4: @@ -216,9 +216,9 @@ glabel func_800A14F0 /* 0A23F4 800A17F4 E7AC0018 */ swc1 $f12, 0x18($sp) /* 0A23F8 800A17F8 0C028669 */ jal func_800A19A4 /* 0A23FC 800A17FC E7AE0020 */ swc1 $f14, 0x20($sp) -/* 0A2400 800A1800 3C01800F */ lui $at, %hi(D_800E872C) # $at, 0x800f +/* 0A2400 800A1800 3C01800F */ lui $at, %hi(D_800E8728 + 4) # $at, 0x800f /* 0A2404 800A1804 C4218728 */ lwc1 $f1, %lo(D_800E8728)($at) -/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E872C)($at) +/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E8728 + 4)($at) /* 0A240C 800A180C 3C01425C */ li $at, 0x425C0000 # 55.000000 /* 0A2410 800A1810 3C038012 */ lui $v1, %hi(D_80126D37) # $v1, 0x8012 /* 0A2414 800A1814 3C068012 */ lui $a2, %hi(D_80126CDC) # $a2, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s index 3d690a9b..25869f4a 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s @@ -58,12 +58,12 @@ glabel func_800A1E48 /* 0A2B0C 800A1F0C 37210003 */ ori $at, $t9, 3 /* 0A2B10 800A1F10 38210002 */ xori $at, $at, 2 /* 0A2B14 800A1F14 44C1F800 */ ctc1 $at, $31 -/* 0A2B18 800A1F18 3C01800F */ lui $at, %hi(D_800E8734) # $at, 0x800f +/* 0A2B18 800A1F18 3C01800F */ lui $at, %hi(D_800E8730 + 4) # $at, 0x800f /* 0A2B1C 800A1F1C 460042A4 */ cvt.w.s $f10, $f8 /* 0A2B20 800A1F20 C4358730 */ lwc1 $f21, %lo(D_800E8730)($at) /* 0A2B24 800A1F24 44D9F800 */ ctc1 $t9, $31 /* 0A2B28 800A1F28 44085000 */ mfc1 $t0, $f10 -/* 0A2B2C 800A1F2C C4348734 */ lwc1 $f20, %lo(D_800E8734)($at) +/* 0A2B2C 800A1F2C C4348734 */ lwc1 $f20, %lo(D_800E8730 + 4)($at) /* 0A2B30 800A1F30 26B56D37 */ addiu $s5, %lo(D_80126D37) # addiu $s5, $s5, 0x6d37 /* 0A2B34 800A1F34 00009025 */ move $s2, $zero /* 0A2B38 800A1F38 241E0002 */ li $fp, 2 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index b0a9a997..f59a9926 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -327,10 +327,10 @@ glabel func_800A277C /* 0A37E0 800A2BE0 17000012 */ bnez $t8, .L800A2C2C /* 0A37E4 800A2BE4 00000000 */ nop /* 0A37E8 800A2BE8 44892000 */ mtc1 $t1, $f4 -/* 0A37EC 800A2BEC 3C01800F */ lui $at, %hi(D_800E873C) # $at, 0x800f +/* 0A37EC 800A2BEC 3C01800F */ lui $at, %hi(D_800E8738 + 4) # $at, 0x800f /* 0A37F0 800A2BF0 468021A0 */ cvt.s.w $f6, $f4 /* 0A37F4 800A2BF4 C42B8738 */ lwc1 $f11, %lo(D_800E8738)($at) -/* 0A37F8 800A2BF8 C42A873C */ lwc1 $f10, %lo(D_800E873C)($at) +/* 0A37F8 800A2BF8 C42A873C */ lwc1 $f10, %lo(D_800E8738 + 4)($at) /* 0A37FC 800A2BFC 46003221 */ cvt.d.s $f8, $f6 /* 0A3800 800A2C00 462A4102 */ mul.d $f4, $f8, $f10 /* 0A3804 800A2C04 444FF800 */ cfc1 $t7, $31 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 7541e545..536068ce 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -247,11 +247,11 @@ glabel L800A63D8 /* 0A71C8 800A65C8 00000000 */ nop /* 0A71CC 800A65CC 8C8E0000 */ lw $t6, ($a0) .L800A65D0: -/* 0A71D0 800A65D0 3C01800F */ lui $at, %hi(D_800E875C) # $at, 0x800f +/* 0A71D0 800A65D0 3C01800F */ lui $at, %hi(D_800E8758 + 4) # $at, 0x800f /* 0A71D4 800A65D4 15C0002D */ bnez $t6, .L800A668C /* 0A71D8 800A65D8 00000000 */ nop /* 0A71DC 800A65DC C4318758 */ lwc1 $f17, %lo(D_800E8758)($at) -/* 0A71E0 800A65E0 C430875C */ lwc1 $f16, %lo(D_800E875C)($at) +/* 0A71E0 800A65E0 C430875C */ lwc1 $f16, %lo(D_800E8758 + 4)($at) /* 0A71E4 800A65E4 46000121 */ cvt.d.s $f4, $f0 /* 0A71E8 800A65E8 46302182 */ mul.d $f6, $f4, $f16 /* 0A71EC 800A65EC 3C014080 */ li $at, 0x40800000 # 4.000000 @@ -346,11 +346,11 @@ glabel L800A63D8 /* 0A7338 800A6738 00000000 */ nop /* 0A733C 800A673C 8C8F0000 */ lw $t7, ($a0) .L800A6740: -/* 0A7340 800A6740 3C01800F */ lui $at, %hi(D_800E8764) # $at, 0x800f +/* 0A7340 800A6740 3C01800F */ lui $at, %hi(D_800E8760 + 4) # $at, 0x800f /* 0A7344 800A6744 15E0002A */ bnez $t7, .L800A67F0 /* 0A7348 800A6748 00000000 */ nop /* 0A734C 800A674C C4318760 */ lwc1 $f17, %lo(D_800E8760)($at) -/* 0A7350 800A6750 C4308764 */ lwc1 $f16, %lo(D_800E8764)($at) +/* 0A7350 800A6750 C4308764 */ lwc1 $f16, %lo(D_800E8760 + 4)($at) /* 0A7354 800A6754 46000221 */ cvt.d.s $f8, $f0 /* 0A7358 800A6758 46304282 */ mul.d $f10, $f8, $f16 /* 0A735C 800A675C 46001121 */ cvt.d.s $f4, $f2 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7520.s b/asm/non_matchings/unknown_09F8F0/func_800A7520.s index cf4681b5..5383658e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A7520.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A7520.s @@ -69,11 +69,11 @@ glabel func_800A7520 /* 0A81F0 800A75F0 00000000 */ nop /* 0A81F4 800A75F4 A4590044 */ sh $t9, 0x44($v0) /* 0A81F8 800A75F8 8D020000 */ lw $v0, ($t0) -/* 0A81FC 800A75FC 3C01800F */ lui $at, %hi(D_800E8784) # $at, 0x800f +/* 0A81FC 800A75FC 3C01800F */ lui $at, %hi(D_800E8780 + 4) # $at, 0x800f /* 0A8200 800A7600 804A005B */ lb $t2, 0x5b($v0) /* 0A8204 800A7604 C4298780 */ lwc1 $f9, %lo(D_800E8780)($at) /* 0A8208 800A7608 448A2000 */ mtc1 $t2, $f4 -/* 0A820C 800A760C C4288784 */ lwc1 $f8, %lo(D_800E8784)($at) +/* 0A820C 800A760C C4288784 */ lwc1 $f8, %lo(D_800E8780 + 4)($at) /* 0A8210 800A7610 468021A1 */ cvt.d.w $f6, $f4 /* 0A8214 800A7614 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 /* 0A8218 800A7618 44818800 */ mtc1 $at, $f17 @@ -132,10 +132,10 @@ glabel func_800A7520 /* 0A82E0 800A76E0 15C0002A */ bnez $t6, .L800A778C /* 0A82E4 800A76E4 00000000 */ nop /* 0A82E8 800A76E8 44834000 */ mtc1 $v1, $f8 -/* 0A82EC 800A76EC 3C01800F */ lui $at, %hi(D_800E878C) # $at, 0x800f +/* 0A82EC 800A76EC 3C01800F */ lui $at, %hi(D_800E8788 + 4) # $at, 0x800f /* 0A82F0 800A76F0 468042A0 */ cvt.s.w $f10, $f8 /* 0A82F4 800A76F4 C4338788 */ lwc1 $f19, %lo(D_800E8788)($at) -/* 0A82F8 800A76F8 C432878C */ lwc1 $f18, %lo(D_800E878C)($at) +/* 0A82F8 800A76F8 C432878C */ lwc1 $f18, %lo(D_800E8788 + 4)($at) /* 0A82FC 800A76FC 46005421 */ cvt.d.s $f16, $f10 /* 0A8300 800A7700 46328102 */ mul.d $f4, $f16, $f18 /* 0A8304 800A7704 3C014010 */ li $at, 0x40100000 # 2.250000 @@ -155,9 +155,9 @@ glabel func_800A7520 /* 0A833C 800A773C 0004C400 */ sll $t8, $a0, 0x10 /* 0A8340 800A7740 0C01C1F1 */ jal func_800707C4 /* 0A8344 800A7744 00182403 */ sra $a0, $t8, 0x10 -/* 0A8348 800A7748 3C01800F */ lui $at, %hi(D_800E8794) # $at, 0x800f +/* 0A8348 800A7748 3C01800F */ lui $at, %hi(D_800E8790 + 4) # $at, 0x800f /* 0A834C 800A774C C4318790 */ lwc1 $f17, %lo(D_800E8790)($at) -/* 0A8350 800A7750 C4308794 */ lwc1 $f16, %lo(D_800E8794)($at) +/* 0A8350 800A7750 C4308794 */ lwc1 $f16, %lo(D_800E8790 + 4)($at) /* 0A8354 800A7754 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012 /* 0A8358 800A7758 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc /* 0A835C 800A775C 460004A1 */ cvt.d.s $f18, $f0 @@ -296,11 +296,11 @@ glabel func_800A7520 /* 0A854C 800A794C 00036B00 */ sll $t5, $v1, 0xc /* 0A8550 800A7950 A44D0044 */ sh $t5, 0x44($v0) /* 0A8554 800A7954 8D020000 */ lw $v0, ($t0) -/* 0A8558 800A7958 3C01800F */ lui $at, %hi(D_800E879C) # $at, 0x800f +/* 0A8558 800A7958 3C01800F */ lui $at, %hi(D_800E8798 + 4) # $at, 0x800f /* 0A855C 800A795C 804E005B */ lb $t6, 0x5b($v0) /* 0A8560 800A7960 C42B8798 */ lwc1 $f11, %lo(D_800E8798)($at) /* 0A8564 800A7964 448E4000 */ mtc1 $t6, $f8 -/* 0A8568 800A7968 C42A879C */ lwc1 $f10, %lo(D_800E879C)($at) +/* 0A8568 800A7968 C42A879C */ lwc1 $f10, %lo(D_800E8798 + 4)($at) /* 0A856C 800A796C 46804121 */ cvt.d.w $f4, $f8 /* 0A8570 800A7970 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 /* 0A8574 800A7974 44818800 */ mtc1 $at, $f17 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 4917c93b..c9775500 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -369,10 +369,10 @@ glabel func_800A8474 /* 0A958C 800A898C 44074000 */ mfc1 $a3, $f8 /* 0A9590 800A8990 44D8F800 */ ctc1 $t8, $31 /* 0A9594 800A8994 15800020 */ bnez $t4, .L800A8A18 -# Used to access D_800E87A0 and D_800E87A4. +# Used to access D_800E87A0 and D_800E87A0 + 4. /* 0A9598 800A8998 3C01800F */ lui $at, %hi(D_800E87A0) # $at, 0x800f /* 0A959C 800A899C C42187A0 */ lwc1 $f1, %lo(D_800E87A0)($at) -/* 0A95A0 800A89A0 C42087A4 */ lwc1 $f0, %lo(D_800E87A4)($at) +/* 0A95A0 800A89A0 C42087A4 */ lwc1 $f0, %lo(D_800E87A0 + 4)($at) /* 0A95A4 800A89A4 8E420000 */ lw $v0, ($s2) /* 0A95A8 800A89A8 3C014080 */ li $at, 0x40800000 # 4.000000 /* 0A95AC 800A89AC 44814000 */ mtc1 $at, $f8 @@ -956,12 +956,12 @@ glabel func_800A8474 /* 0A9E54 800A9254 AFA60054 */ sw $a2, 0x54($sp) /* 0A9E58 800A9258 0C02917C */ jal func_800A45F0 /* 0A9E5C 800A925C AFA300D0 */ sw $v1, 0xd0($sp) -# Used to access D_800E87B8 and D_800E87BC. +# Used to access D_800E87B8 and D_800E87B8 + 4. /* 0A9E60 800A9260 3C01800F */ lui $at, %hi(D_800E87B8) # $at, 0x800f /* 0A9E64 800A9264 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0A9E68 800A9268 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0A9E6C 800A926C C42187B8 */ lwc1 $f1, %lo(D_800E87B8)($at) -/* 0A9E70 800A9270 C42087BC */ lwc1 $f0, %lo(D_800E87BC)($at) +/* 0A9E70 800A9270 C42087BC */ lwc1 $f0, %lo(D_800E87B8 + 4)($at) /* 0A9E74 800A9274 8FA300D0 */ lw $v1, 0xd0($sp) /* 0A9E78 800A9278 8FA60054 */ lw $a2, 0x54($sp) /* 0A9E7C 800A927C 15C00012 */ bnez $t6, .L800A92C8 @@ -1165,10 +1165,10 @@ glabel func_800A8474 /* 0AA160 800A9560 44053000 */ mfc1 $a1, $f6 /* 0AA164 800A9564 44D8F800 */ ctc1 $t8, $31 /* 0AA168 800A9568 1580003C */ bnez $t4, .L800A965C -# Used to access D_800E87C0 and D_800E87C4. +# Used to access D_800E87C0 and D_800E87C0 + 4. /* 0AA16C 800A956C 3C01800F */ lui $at, %hi(D_800E87C0) # $at, 0x800f /* 0AA170 800A9570 C42187C0 */ lwc1 $f1, %lo(D_800E87C0)($at) -/* 0AA174 800A9574 C42087C4 */ lwc1 $f0, %lo(D_800E87C4)($at) +/* 0AA174 800A9574 C42087C4 */ lwc1 $f0, %lo(D_800E87C0 + 4)($at) /* 0AA178 800A9578 8E420000 */ lw $v0, ($s2) /* 0AA17C 800A957C 3C014080 */ li $at, 0x40800000 # 4.000000 /* 0AA180 800A9580 44813000 */ mtc1 $at, $f6 @@ -1570,11 +1570,11 @@ glabel func_800A8474 /* 0AA744 800A9B44 15C00013 */ bnez $t6, .L800A9B94 /* 0AA748 800A9B48 00000000 */ nop /* 0AA74C 800A9B4C 8E180000 */ lw $t8, ($s0) -/* 0AA750 800A9B50 3C01800F */ lui $at, %hi(D_800E87CC) # $at, 0x800f +/* 0AA750 800A9B50 3C01800F */ lui $at, %hi(D_800E87C8 + 4) # $at, 0x800f /* 0AA754 800A9B54 44982000 */ mtc1 $t8, $f4 /* 0AA758 800A9B58 C42B87C8 */ lwc1 $f11, %lo(D_800E87C8)($at) /* 0AA75C 800A9B5C 468021A1 */ cvt.d.w $f6, $f4 -/* 0AA760 800A9B60 C42A87CC */ lwc1 $f10, %lo(D_800E87CC)($at) +/* 0AA760 800A9B60 C42A87CC */ lwc1 $f10, %lo(D_800E87C8 + 4)($at) /* 0AA764 800A9B64 00000000 */ nop /* 0AA768 800A9B68 462A3482 */ mul.d $f18, $f6, $f10 /* 0AA76C 800A9B6C 4459F800 */ cfc1 $t9, $31 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/unknown_09F8F0/func_800AA600.s index 48d40b05..21a51605 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA600.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA600.s @@ -365,10 +365,10 @@ glabel func_800AA600 /* 0AB73C 800AAB3C 01CF0019 */ multu $t6, $t7 /* 0AB740 800AAB40 A7A00076 */ sh $zero, 0x76($sp) /* 0AB744 800AAB44 AFA00078 */ sw $zero, 0x78($sp) -# Used to access D_800E87E0 and D_800E87E4. +# Used to access D_800E87E0 and D_800E87E0 + 4. /* 0AB748 800AAB48 3C01800F */ lui $at, %hi(D_800E87E0) # $at, 0x800f /* 0AB74C 800AAB4C C43387E0 */ lwc1 $f19, %lo(D_800E87E0)($at) -/* 0AB750 800AAB50 C43287E4 */ lwc1 $f18, %lo(D_800E87E4)($at) +/* 0AB750 800AAB50 C43287E4 */ lwc1 $f18, %lo(D_800E87E0 + 4)($at) /* 0AB754 800AAB54 3C18800E */ lui $t8, %hi(D_800E2834) # $t8, 0x800e /* 0AB758 800AAB58 8F182834 */ lw $t8, %lo(D_800E2834)($t8) /* 0AB75C 800AAB5C 240B0001 */ li $t3, 1 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B0010.s b/asm/non_matchings/unknown_0AEE70/func_800B0010.s index ba972710..d4eb9ed1 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B0010.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B0010.s @@ -51,10 +51,10 @@ glabel func_800B0010 /* 0B0CA0 800B00A0 0C01BE53 */ jal func_8006F94C /* 0B0CA4 800B00A4 00052023 */ negu $a0, $a1 /* 0B0CA8 800B00A8 44822000 */ mtc1 $v0, $f4 -/* 0B0CAC 800B00AC 3C01800F */ lui $at, %hi(D_800E8B9C) # $at, 0x800f +/* 0B0CAC 800B00AC 3C01800F */ lui $at, %hi(D_800E8B98 + 4) # $at, 0x800f /* 0B0CB0 800B00B0 468021A0 */ cvt.s.w $f6, $f4 /* 0B0CB4 800B00B4 C42B8B98 */ lwc1 $f11, %lo(D_800E8B98)($at) -/* 0B0CB8 800B00B8 C42A8B9C */ lwc1 $f10, %lo(D_800E8B9C)($at) +/* 0B0CB8 800B00B8 C42A8B9C */ lwc1 $f10, %lo(D_800E8B98 + 4)($at) /* 0B0CBC 800B00BC 46003221 */ cvt.d.s $f8, $f6 /* 0B0CC0 800B00C0 462A4402 */ mul.d $f16, $f8, $f10 /* 0B0CC4 800B00C4 C612001C */ lwc1 $f18, 0x1c($s0) @@ -72,10 +72,10 @@ glabel func_800B0010 /* 0B0CF0 800B00F0 0C01BE53 */ jal func_8006F94C /* 0B0CF4 800B00F4 00052023 */ negu $a0, $a1 /* 0B0CF8 800B00F8 44825000 */ mtc1 $v0, $f10 -/* 0B0CFC 800B00FC 3C01800F */ lui $at, %hi(D_800E8BA4) # $at, 0x800f +/* 0B0CFC 800B00FC 3C01800F */ lui $at, %hi(D_800E8BA0 + 4) # $at, 0x800f /* 0B0D00 800B0100 468054A0 */ cvt.s.w $f18, $f10 /* 0B0D04 800B0104 C4318BA0 */ lwc1 $f17, %lo(D_800E8BA0)($at) -/* 0B0D08 800B0108 C4308BA4 */ lwc1 $f16, %lo(D_800E8BA4)($at) +/* 0B0D08 800B0108 C4308BA4 */ lwc1 $f16, %lo(D_800E8BA0 + 4)($at) /* 0B0D0C 800B010C 46009121 */ cvt.d.s $f4, $f18 /* 0B0D10 800B0110 46302182 */ mul.d $f6, $f4, $f16 /* 0B0D14 800B0114 C6080020 */ lwc1 $f8, 0x20($s0) @@ -92,10 +92,10 @@ glabel func_800B0010 /* 0B0D3C 800B013C 0C01BE53 */ jal func_8006F94C /* 0B0D40 800B0140 00052023 */ negu $a0, $a1 /* 0B0D44 800B0144 44828000 */ mtc1 $v0, $f16 -/* 0B0D48 800B0148 3C01800F */ lui $at, %hi(D_800E8BAC) # $at, 0x800f +/* 0B0D48 800B0148 3C01800F */ lui $at, %hi(D_800E8BA8 + 4) # $at, 0x800f /* 0B0D4C 800B014C 46808220 */ cvt.s.w $f8, $f16 /* 0B0D50 800B0150 C4278BA8 */ lwc1 $f7, %lo(D_800E8BA8)($at) -/* 0B0D54 800B0154 C4268BAC */ lwc1 $f6, %lo(D_800E8BAC)($at) +/* 0B0D54 800B0154 C4268BAC */ lwc1 $f6, %lo(D_800E8BA8 + 4)($at) /* 0B0D58 800B0158 460042A1 */ cvt.d.s $f10, $f8 /* 0B0D5C 800B015C 46265482 */ mul.d $f18, $f10, $f6 /* 0B0D60 800B0160 C6040024 */ lwc1 $f4, 0x24($s0) @@ -181,10 +181,10 @@ glabel func_800B0010 /* 0B0E90 800B0290 0C01BE53 */ jal func_8006F94C /* 0B0E94 800B0294 00052023 */ negu $a0, $a1 /* 0B0E98 800B0298 44828000 */ mtc1 $v0, $f16 -/* 0B0E9C 800B029C 3C01800F */ lui $at, %hi(D_800E8BB4) # $at, 0x800f +/* 0B0E9C 800B029C 3C01800F */ lui $at, %hi(D_800E8BB0 + 4) # $at, 0x800f /* 0B0EA0 800B02A0 468084A0 */ cvt.s.w $f18, $f16 /* 0B0EA4 800B02A4 C42B8BB0 */ lwc1 $f11, %lo(D_800E8BB0)($at) -/* 0B0EA8 800B02A8 C42A8BB4 */ lwc1 $f10, %lo(D_800E8BB4)($at) +/* 0B0EA8 800B02A8 C42A8BB4 */ lwc1 $f10, %lo(D_800E8BB0 + 4)($at) /* 0B0EAC 800B02AC 46009221 */ cvt.d.s $f8, $f18 /* 0B0EB0 800B02B0 462A4182 */ mul.d $f6, $f8, $f10 /* 0B0EB4 800B02B4 C7A40038 */ lwc1 $f4, 0x38($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s index 60a68c6a..28eda078 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s @@ -42,10 +42,10 @@ glabel func_800B03C0 /* 0B1044 800B0444 0C01BE53 */ jal func_8006F94C /* 0B1048 800B0448 00052023 */ negu $a0, $a1 /* 0B104C 800B044C 44823000 */ mtc1 $v0, $f6 -/* 0B1050 800B0450 3C01800F */ lui $at, %hi(D_800E8BBC) # $at, 0x800f +/* 0B1050 800B0450 3C01800F */ lui $at, %hi(D_800E8BB8 + 4) # $at, 0x800f /* 0B1054 800B0454 46803220 */ cvt.s.w $f8, $f6 /* 0B1058 800B0458 C4318BB8 */ lwc1 $f17, %lo(D_800E8BB8)($at) -/* 0B105C 800B045C C4308BBC */ lwc1 $f16, %lo(D_800E8BBC)($at) +/* 0B105C 800B045C C4308BBC */ lwc1 $f16, %lo(D_800E8BB8 + 4)($at) /* 0B1060 800B0460 460042A1 */ cvt.d.s $f10, $f8 /* 0B1064 800B0464 46305482 */ mul.d $f18, $f10, $f16 /* 0B1068 800B0468 C6040058 */ lwc1 $f4, 0x58($s0) @@ -81,10 +81,10 @@ glabel func_800B03C0 /* 0B10DC 800B04DC 0C01BE53 */ jal func_8006F94C /* 0B10E0 800B04E0 00052023 */ negu $a0, $a1 /* 0B10E4 800B04E4 44823000 */ mtc1 $v0, $f6 -/* 0B10E8 800B04E8 3C01800F */ lui $at, %hi(D_800E8BC4) # $at, 0x800f +/* 0B10E8 800B04E8 3C01800F */ lui $at, %hi(D_800E8BC0 + 4) # $at, 0x800f /* 0B10EC 800B04EC 468034A0 */ cvt.s.w $f18, $f6 /* 0B10F0 800B04F0 C42B8BC0 */ lwc1 $f11, %lo(D_800E8BC0)($at) -/* 0B10F4 800B04F4 C42A8BC4 */ lwc1 $f10, %lo(D_800E8BC4)($at) +/* 0B10F4 800B04F4 C42A8BC4 */ lwc1 $f10, %lo(D_800E8BC0 + 4)($at) /* 0B10F8 800B04F8 46009221 */ cvt.d.s $f8, $f18 /* 0B10FC 800B04FC 462A4402 */ mul.d $f16, $f8, $f10 /* 0B1100 800B0500 C7A40038 */ lwc1 $f4, 0x38($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1130.s b/asm/non_matchings/unknown_0AEE70/func_800B1130.s index 59eb5756..8ec0b69c 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1130.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1130.s @@ -91,10 +91,10 @@ glabel func_800B1130 /* 0B1E5C 800B125C 0C01BE53 */ jal func_8006F94C /* 0B1E60 800B1260 00052023 */ negu $a0, $a1 /* 0B1E64 800B1264 44829000 */ mtc1 $v0, $f18 -/* 0B1E68 800B1268 3C01800F */ lui $at, %hi(D_800E8BCC) # $at, 0x800f +/* 0B1E68 800B1268 3C01800F */ lui $at, %hi(D_800E8BC8 + 4) # $at, 0x800f /* 0B1E6C 800B126C 46809120 */ cvt.s.w $f4, $f18 /* 0B1E70 800B1270 C4298BC8 */ lwc1 $f9, %lo(D_800E8BC8)($at) -/* 0B1E74 800B1274 C4288BCC */ lwc1 $f8, %lo(D_800E8BCC)($at) +/* 0B1E74 800B1274 C4288BCC */ lwc1 $f8, %lo(D_800E8BC8 + 4)($at) /* 0B1E78 800B1278 460021A1 */ cvt.d.s $f6, $f4 /* 0B1E7C 800B127C 46283282 */ mul.d $f10, $f6, $f8 /* 0B1E80 800B1280 C7B00024 */ lwc1 $f16, 0x24($sp) @@ -121,10 +121,10 @@ glabel func_800B1130 /* 0B1ED0 800B12D0 0C01BE53 */ jal func_8006F94C /* 0B1ED4 800B12D4 00052023 */ negu $a0, $a1 /* 0B1ED8 800B12D8 44829000 */ mtc1 $v0, $f18 -/* 0B1EDC 800B12DC 3C01800F */ lui $at, %hi(D_800E8BD4) # $at, 0x800f +/* 0B1EDC 800B12DC 3C01800F */ lui $at, %hi(D_800E8BD0 + 4) # $at, 0x800f /* 0B1EE0 800B12E0 468092A0 */ cvt.s.w $f10, $f18 /* 0B1EE4 800B12E4 C4278BD0 */ lwc1 $f7, %lo(D_800E8BD0)($at) -/* 0B1EE8 800B12E8 C4268BD4 */ lwc1 $f6, %lo(D_800E8BD4)($at) +/* 0B1EE8 800B12E8 C4268BD4 */ lwc1 $f6, %lo(D_800E8BD0 + 4)($at) /* 0B1EEC 800B12EC 46005121 */ cvt.d.s $f4, $f10 /* 0B1EF0 800B12F0 46262202 */ mul.d $f8, $f4, $f6 /* 0B1EF4 800B12F4 C7B00024 */ lwc1 $f16, 0x24($sp) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s index e054b24f..74dac3d5 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s @@ -82,10 +82,10 @@ glabel func_800CB2D4 /* 0CBFF4 800CB3F4 448B8000 */ mtc1 $t3, $f16 /* 0CBFF8 800CB3F8 C7AA0004 */ lwc1 $f10, 4($sp) /* 0CBFFC 800CB3FC 468084A0 */ cvt.s.w $f18, $f16 -/* 0CC000 800CB400 3C01800F */ lui $at, %hi(D_800E95FC) # $at, 0x800f +/* 0CC000 800CB400 3C01800F */ lui $at, %hi(D_800E95F8 + 4) # $at, 0x800f /* 0CC004 800CB404 C42595F8 */ lwc1 $f5, %lo(D_800E95F8)($at) /* 0CC008 800CB408 460091A1 */ cvt.d.s $f6, $f18 -/* 0CC00C 800CB40C C42495FC */ lwc1 $f4, %lo(D_800E95FC)($at) +/* 0CC00C 800CB40C C42495FC */ lwc1 $f4, %lo(D_800E95F8 + 4)($at) /* 0CC010 800CB410 46265201 */ sub.d $f8, $f10, $f6 /* 0CC014 800CB414 8FB80024 */ lw $t8, 0x24($sp) /* 0CC018 800CB418 46244402 */ mul.d $f16, $f8, $f4 diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 6c4e397e..71c10ac7 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -47,7 +47,7 @@ const char D_800E49BC[] = "Invalid midi sequence index\n"; /************ .bss ************/ -extern u8 D_800EBF60; +u8 D_800EBF60; extern ALHeap gALHeap; /* Unknown size */ diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 693f5141..5fbdc27f 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -45,7 +45,8 @@ const char D_800E7700[] = "WARNING : No Eprom\n"; const char D_800E7714[] = "WARNING : No Eprom\n"; const char D_800E7728[] = "WARNING : No Eprom\n"; -const char D_800E773C[] = "DKRACING-GHOSTS\0"; +const char D_800E773C[] = "DKRACING-GHOSTS"; // Used in func_80074B34 +const u8 D_800E774C[4] = { 0, 0, 0, 0 }; // Used in func_80074B34, but I'm confused to what this is for. const char D_800E7750[] = "warning: corrupt ghost\n"; /*********************************/ diff --git a/src/unknown_0B7A50.c b/src/unknown_0B7A50.c index 4b0f9649..deab665b 100644 --- a/src/unknown_0B7A50.c +++ b/src/unknown_0B7A50.c @@ -9,9 +9,12 @@ const char D_800E8E70[] = "\nAssertion failed: '%s' in file %s, line %d\n"; const char D_800E8EA0[] = "\nAssertion failed: '%s' in file %s, line %d\n"; const char D_800E8ED0[] = ">fault< "; -const char D_800E8EDC[] = "CORE\0\0\0\0"; -const char D_800E8EE8[] = "CORE\0\0\0\0"; -const char D_800E8EF4[] = "CORE\0\0\0\0"; +const char D_800E8EDC[] = "CORE"; +const u8 D_800E8EE4[4] = { 0, 0, 0, 0 }; +const char D_800E8EE8[] = "CORE"; +const u8 D_800E8EF0[4] = { 0, 0, 0, 0 }; +const char D_800E8EF4[] = "CORE"; +const u8 D_800E8EFC[4] = { 0, 0, 0, 0 }; /*********************************/ diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 9e32a4c0..8f3a4c70 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -51,6 +51,7 @@ class GenerateLD: self.gen_data_section() self.gen_rodata_section() self.gen_ucode_data_section() + self.gen_bss_section() self.gen_assets_section() self.gen_discard() self.gen_close_block() @@ -115,6 +116,17 @@ class GenerateLD: self.gen_line('romPos += SIZEOF(.rodata);') self.gen_newline() + def gen_bss_section(self): + self.gen_line('.bss.noload (NOLOAD):') + self.gen_open_block() + for file in self.files: + if file[0] not in LATE_DATA_FILES: + self.gen_line(file[0] + '(.bss);') + for file in LATE_DATA_FILES: + self.gen_line(file + '(.bss);') + self.gen_close_block() + self.gen_newline() + def gen_ucode_data_section(self): self.gen_line('.ucodeData . : AT(romPos)') self.gen_open_block() diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py index 7ca2234d..cae892c0 100644 --- a/tools/python/undefined_sym_fix.py +++ b/tools/python/undefined_sym_fix.py @@ -32,24 +32,27 @@ def check_is_double(symbol, address): outLines = command.stdout.decode("utf-8").split('\n') for outLine in outLines: if 'lwc1' in outLine: - newSym = hex(address - 4)[2:].upper() + '+4' + newSym = 'D_' + hex(address - 4)[2:].upper() + ' + 4' subprocess.run(['./rename_sym.sh', symbol, newSym]) return True return False def fixDoubleLoads(): syms = load_syms() - for i in range(0, len(syms)): + target = len(syms) + i = 0 + while i < target: sym = syms[i] - if not sym.startswith('D_'): - continue - symSplit = sym.split(' = ') - symbol = symSplit[0] - address = int(symSplit[1][2:-1], 16) - if address >= 0x800E4BFC and address < 0x800E9BA0 and (address & 4 == 4): - if check_is_double(symbol, address): - syms.pop(i) - i -= 1 + if sym.startswith('D_'): + symSplit = sym.split(' = ') + symbol = symSplit[0] + address = int(symSplit[1][2:-1], 16) + if address >= 0x800E4BFC and address < 0x800E9BA0 and ((address & 4) != 0): + if check_is_double(symbol, address): + syms.pop(i) + target -= 1 + continue + i += 1 save_syms(syms) #fixBadLabel() diff --git a/undefined_syms.txt b/undefined_syms.txt index 59ca3a06..6d5c0064 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,319 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_800E4BFC = 0x800E4BFC; -D_800E4C0C = 0x800E4C0C; -D_800E4C14 = 0x800E4C14; -D_800E4C1C = 0x800E4C1C; -D_800E4C24 = 0x800E4C24; -D_800E4C2C = 0x800E4C2C; -D_800E4C34 = 0x800E4C34; -D_800E4C44 = 0x800E4C44; -D_800E4C4C = 0x800E4C4C; -D_800E4C54 = 0x800E4C54; -D_800E4C5C = 0x800E4C5C; -D_800E4C64 = 0x800E4C64; -D_800E4C6C = 0x800E4C6C; -D_800E4C84 = 0x800E4C84; -D_800E4C8C = 0x800E4C8C; -D_800E4C94 = 0x800E4C94; -D_800E4CA4 = 0x800E4CA4; -D_800E4CAC = 0x800E4CAC; -D_800E4CBC = 0x800E4CBC; -D_800E4CCC = 0x800E4CCC; -D_800E4CDC = 0x800E4CDC; -D_800E4CEC = 0x800E4CEC; -D_800E4CFC = 0x800E4CFC; -D_800E4F1C = 0x800E4F1C; -D_800E4F24 = 0x800E4F24; -D_800E553C = 0x800E553C; -D_800E5544 = 0x800E5544; -D_800E554C = 0x800E554C; -D_800E557C = 0x800E557C; -D_800E55BC = 0x800E55BC; -D_800E55C4 = 0x800E55C4; -D_800E55CC = 0x800E55CC; -D_800E55D4 = 0x800E55D4; -D_800E55DC = 0x800E55DC; -D_800E55E4 = 0x800E55E4; -D_800E55EC = 0x800E55EC; -D_800E55F4 = 0x800E55F4; -D_800E55FC = 0x800E55FC; -D_800E5604 = 0x800E5604; -D_800E560C = 0x800E560C; -D_800E5614 = 0x800E5614; -D_800E561C = 0x800E561C; -D_800E5624 = 0x800E5624; -D_800E562C = 0x800E562C; -D_800E5634 = 0x800E5634; -D_800E564C = 0x800E564C; -D_800E565C = 0x800E565C; -D_800E566C = 0x800E566C; -D_800E5674 = 0x800E5674; -D_800E5684 = 0x800E5684; -D_800E5E64 = 0x800E5E64; -D_800E5E6C = 0x800E5E6C; -D_800E5E74 = 0x800E5E74; -D_800E5E7C = 0x800E5E7C; -D_800E5E84 = 0x800E5E84; -D_800E5E8C = 0x800E5E8C; -D_800E5E94 = 0x800E5E94; -D_800E5E9C = 0x800E5E9C; -D_800E5EA4 = 0x800E5EA4; -D_800E5EAC = 0x800E5EAC; -D_800E5EB4 = 0x800E5EB4; -D_800E5EBC = 0x800E5EBC; -D_800E5F44 = 0x800E5F44; -D_800E5FE4 = 0x800E5FE4; -D_800E5FEC = 0x800E5FEC; -D_800E5FF4 = 0x800E5FF4; -D_800E5FFC = 0x800E5FFC; -D_800E6014 = 0x800E6014; -D_800E601C = 0x800E601C; -D_800E6024 = 0x800E6024; -D_800E602C = 0x800E602C; -D_800E6034 = 0x800E6034; -D_800E603C = 0x800E603C; -D_800E6044 = 0x800E6044; -D_800E6054 = 0x800E6054; -D_800E605C = 0x800E605C; -D_800E6064 = 0x800E6064; -D_800E606C = 0x800E606C; -D_800E6144 = 0x800E6144; -D_800E6154 = 0x800E6154; -D_800E615C = 0x800E615C; -D_800E6164 = 0x800E6164; -D_800E616C = 0x800E616C; -D_800E6174 = 0x800E6174; -D_800E617C = 0x800E617C; -D_800E618C = 0x800E618C; -D_800E6194 = 0x800E6194; -D_800E619C = 0x800E619C; -D_800E61AC = 0x800E61AC; -D_800E61BC = 0x800E61BC; -D_800E61F4 = 0x800E61F4; -D_800E61FC = 0x800E61FC; -D_800E6204 = 0x800E6204; -D_800E6254 = 0x800E6254; -D_800E62AC = 0x800E62AC; -D_800E62B4 = 0x800E62B4; -D_800E62BC = 0x800E62BC; -D_800E62C4 = 0x800E62C4; -D_800E62CC = 0x800E62CC; -D_800E62D4 = 0x800E62D4; -D_800E62DC = 0x800E62DC; -D_800E62E4 = 0x800E62E4; -D_800E62EC = 0x800E62EC; -D_800E62F4 = 0x800E62F4; -D_800E62FC = 0x800E62FC; -D_800E6304 = 0x800E6304; -D_800E630C = 0x800E630C; -D_800E6314 = 0x800E6314; -D_800E6354 = 0x800E6354; -D_800E63A4 = 0x800E63A4; -D_800E63AC = 0x800E63AC; -D_800E63B4 = 0x800E63B4; -D_800E63BC = 0x800E63BC; -D_800E63C4 = 0x800E63C4; -D_800E63CC = 0x800E63CC; -D_800E63D4 = 0x800E63D4; -D_800E63E4 = 0x800E63E4; -D_800E63EC = 0x800E63EC; -D_800E63FC = 0x800E63FC; -D_800E6404 = 0x800E6404; -D_800E640C = 0x800E640C; -D_800E6414 = 0x800E6414; -D_800E641C = 0x800E641C; -D_800E6424 = 0x800E6424; -D_800E642C = 0x800E642C; -D_800E6434 = 0x800E6434; -D_800E643C = 0x800E643C; -D_800E6444 = 0x800E6444; -D_800E644C = 0x800E644C; -D_800E645C = 0x800E645C; -D_800E6464 = 0x800E6464; -D_800E648C = 0x800E648C; -D_800E6494 = 0x800E6494; -D_800E649C = 0x800E649C; -D_800E64A4 = 0x800E64A4; -D_800E64AC = 0x800E64AC; -D_800E64B4 = 0x800E64B4; -D_800E64BC = 0x800E64BC; -D_800E64C4 = 0x800E64C4; -D_800E64CC = 0x800E64CC; -D_800E64D4 = 0x800E64D4; -D_800E64E4 = 0x800E64E4; -D_800E64FC = 0x800E64FC; -D_800E6504 = 0x800E6504; -D_800E6514 = 0x800E6514; -D_800E651C = 0x800E651C; -D_800E6524 = 0x800E6524; -D_800E6534 = 0x800E6534; -D_800E653C = 0x800E653C; -D_800E6544 = 0x800E6544; -D_800E654C = 0x800E654C; -D_800E6554 = 0x800E6554; -D_800E655C = 0x800E655C; -D_800E6564 = 0x800E6564; -D_800E6574 = 0x800E6574; -D_800E657C = 0x800E657C; -D_800E6594 = 0x800E6594; -D_800E659C = 0x800E659C; -D_800E65FC = 0x800E65FC; -D_800E6604 = 0x800E6604; -D_800E660C = 0x800E660C; -D_800E6614 = 0x800E6614; -D_800E661C = 0x800E661C; -D_800E6624 = 0x800E6624; -D_800E662C = 0x800E662C; -D_800E6634 = 0x800E6634; -D_800E663C = 0x800E663C; -D_800E6644 = 0x800E6644; -D_800E664C = 0x800E664C; -D_800E6654 = 0x800E6654; -D_800E665C = 0x800E665C; -D_800E666C = 0x800E666C; -D_800E6674 = 0x800E6674; -D_800E667C = 0x800E667C; -D_800E6684 = 0x800E6684; -D_800E668C = 0x800E668C; -D_800E6694 = 0x800E6694; -D_800E669C = 0x800E669C; -D_800E66A4 = 0x800E66A4; -D_800E66AC = 0x800E66AC; -D_800E66B4 = 0x800E66B4; -D_800E66BC = 0x800E66BC; -D_800E66CC = 0x800E66CC; -D_800E66F4 = 0x800E66F4; -D_800E66FC = 0x800E66FC; -D_800E6704 = 0x800E6704; -D_800E670C = 0x800E670C; -D_800E6714 = 0x800E6714; -D_800E671C = 0x800E671C; -D_800E672C = 0x800E672C; -D_800E6734 = 0x800E6734; -D_800E673C = 0x800E673C; -D_800E6744 = 0x800E6744; -D_800E674C = 0x800E674C; -D_800E6754 = 0x800E6754; -D_800E6764 = 0x800E6764; -D_800E678C = 0x800E678C; -D_800E6794 = 0x800E6794; -D_800E679C = 0x800E679C; -D_800E67C4 = 0x800E67C4; -D_800E67CC = 0x800E67CC; -D_800E67D4 = 0x800E67D4; -D_800E67DC = 0x800E67DC; -D_800E67E4 = 0x800E67E4; -D_800E67EC = 0x800E67EC; -D_800E67F4 = 0x800E67F4; -D_800E67FC = 0x800E67FC; -D_800E680C = 0x800E680C; -D_800E6814 = 0x800E6814; -D_800E681C = 0x800E681C; -D_800E6824 = 0x800E6824; -D_800E682C = 0x800E682C; -D_800E6834 = 0x800E6834; -D_800E683C = 0x800E683C; -D_800E6844 = 0x800E6844; -D_800E684C = 0x800E684C; -D_800E68F4 = 0x800E68F4; -D_800E68FC = 0x800E68FC; -D_800E6904 = 0x800E6904; -D_800E690C = 0x800E690C; -D_800E6914 = 0x800E6914; -D_800E691C = 0x800E691C; -D_800E6924 = 0x800E6924; -D_800E692C = 0x800E692C; -D_800E6934 = 0x800E6934; -D_800E693C = 0x800E693C; -D_800E6944 = 0x800E6944; -D_800E6954 = 0x800E6954; -D_800E6964 = 0x800E6964; -D_800E69A4 = 0x800E69A4; -D_800E69BC = 0x800E69BC; -D_800E69C4 = 0x800E69C4; -D_800E69CC = 0x800E69CC; -D_800E69D4 = 0x800E69D4; -D_800E69DC = 0x800E69DC; -D_800E69E4 = 0x800E69E4; -D_800E69F4 = 0x800E69F4; -D_800E69FC = 0x800E69FC; -D_800E6A14 = 0x800E6A14; -D_800E6A1C = 0x800E6A1C; -D_800E6A24 = 0x800E6A24; -D_800E6A2C = 0x800E6A2C; -D_800E6A34 = 0x800E6A34; -D_800E6A3C = 0x800E6A3C; -D_800E6A44 = 0x800E6A44; -D_800E6A4C = 0x800E6A4C; -D_800E6A54 = 0x800E6A54; -D_800E6A5C = 0x800E6A5C; -D_800E6A64 = 0x800E6A64; -D_800E6A6C = 0x800E6A6C; -D_800E6A8C = 0x800E6A8C; -D_800E6A94 = 0x800E6A94; -D_800E6A9C = 0x800E6A9C; -D_800E6AA4 = 0x800E6AA4; -D_800E6AAC = 0x800E6AAC; -D_800E6AB4 = 0x800E6AB4; -D_800E6ABC = 0x800E6ABC; -D_800E6AC4 = 0x800E6AC4; -D_800E6ACC = 0x800E6ACC; -D_800E6AEC = 0x800E6AEC; -D_800E6AF4 = 0x800E6AF4; -D_800E6B04 = 0x800E6B04; -D_800E6B0C = 0x800E6B0C; -D_800E6B14 = 0x800E6B14; -D_800E6EC4 = 0x800E6EC4; -D_800E774C = 0x800E774C; -D_800E7778 = 0x800E7778; -D_800E778C = 0x800E778C; -D_800E77A0 = 0x800E77A0; -D_800E77B4 = 0x800E77B4; -D_800E77C8 = 0x800E77C8; -D_800E77DC = 0x800E77DC; -D_800E77E4 = 0x800E77E4; -D_800E77EC = 0x800E77EC; -D_800E77F4 = 0x800E77F4; -D_800E839C = 0x800E839C; -D_800E83A4 = 0x800E83A4; -D_800E83AC = 0x800E83AC; -D_800E84D4 = 0x800E84D4; -D_800E84E4 = 0x800E84E4; -D_800E84EC = 0x800E84EC; -D_800E86AC = 0x800E86AC; -D_800E86EC = 0x800E86EC; -D_800E86F4 = 0x800E86F4; -D_800E8724 = 0x800E8724; -D_800E872C = 0x800E872C; -D_800E8734 = 0x800E8734; -D_800E873C = 0x800E873C; -D_800E875C = 0x800E875C; -D_800E8764 = 0x800E8764; -D_800E8784 = 0x800E8784; -D_800E878C = 0x800E878C; -D_800E8794 = 0x800E8794; -D_800E879C = 0x800E879C; -D_800E87A4 = 0x800E87A4; -D_800E87BC = 0x800E87BC; -D_800E87C4 = 0x800E87C4; -D_800E87CC = 0x800E87CC; -D_800E87E4 = 0x800E87E4; -D_800E8B9C = 0x800E8B9C; -D_800E8BA4 = 0x800E8BA4; -D_800E8BAC = 0x800E8BAC; -D_800E8BB4 = 0x800E8BB4; -D_800E8BBC = 0x800E8BBC; -D_800E8BC4 = 0x800E8BC4; -D_800E8BCC = 0x800E8BCC; -D_800E8BD4 = 0x800E8BD4; -D_800E8EE4 = 0x800E8EE4; -D_800E8EF0 = 0x800E8EF0; -D_800E8EFC = 0x800E8EFC; -D_800E95FC = 0x800E95FC; - -D_800EBF60 = 0x800EBF60; gALHeap = 0x80115CE8; ALSeqFile_80115CF8 = 0x80115CF8; D_80115CFC = 0x80115CFC; From cbee999eb206430aaef5fa0f071be19ade089976 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 15:44:39 -0500 Subject: [PATCH 07/39] Added bss for unknown_001050, unknown_003260, and unknown_005740 --- asm/entrypoint.s | 12 +- .../unknown_003260/audioNewThread.s | 8 +- bss.txt | 1165 +++++++++++++++++ src/unknown_001050.c | 74 +- src/unknown_003260.c | 38 +- src/unknown_005740.c | 22 + tools/python/generate_ld.py | 20 +- tools/python/undefined_sym_fix.py | 54 +- undefined_syms.txt | 145 +- 9 files changed, 1397 insertions(+), 141 deletions(-) create mode 100644 bss.txt diff --git a/asm/entrypoint.s b/asm/entrypoint.s index 1adf1b38..0e10d93f 100644 --- a/asm/entrypoint.s +++ b/asm/entrypoint.s @@ -8,11 +8,15 @@ .set noreorder # dont insert nops after branches .set gp=64 # 64-bit instructions are used +.section .text + +# .word __BSS_SECTION_SIZE # Should equal 0x41490 + glabel entrypoint -/* 001000 80000400 3C08800F */ lui $t0, %hi(D_800EBF60) # $t0, 0x800f -/* 001004 80000404 3C090004 */ lui $t1, (0x00041490 >> 16) # lui $t1, 4 -/* 001008 80000408 2508BF60 */ addiu $t0, %lo(D_800EBF60) # addiu $t0, $t0, -0x40a0 -/* 00100C 8000040C 35291490 */ ori $t1, (0x00041490 & 0xFFFF) # ori $t1, $t1, 0x1490 +/* 001000 80000400 3C08800F */ lui $t0, %hi(gBssSectionStart) # $t0, 0x800f +/* 001004 80000404 3C090004 */ lui $t1, (0x41490 >> 16) # lui $t1, 4 +/* 001008 80000408 2508BF60 */ addiu $t0, %lo(gBssSectionStart) # addiu $t0, $t0, -0x40a0 +/* 00100C 8000040C 35291490 */ ori $t1, (0x41490 & 0xFFFF) # ori $t1, $t1, 0x1490 .L80000410: /* 001010 80000410 2129FFF8 */ addi $t1, $t1, -8 /* 001014 80000414 AD000000 */ sw $zero, ($t0) diff --git a/asm/non_matchings/unknown_003260/audioNewThread.s b/asm/non_matchings/unknown_003260/audioNewThread.s index f9c51000..1713d444 100644 --- a/asm/non_matchings/unknown_003260/audioNewThread.s +++ b/asm/non_matchings/unknown_003260/audioNewThread.s @@ -109,10 +109,10 @@ glabel audioNewThread /* 0033F8 800027F8 3C028012 */ lui $v0, %hi(D_80119240) # $v0, 0x8012 /* 0033FC 800027FC 24429240 */ addiu $v0, %lo(D_80119240) # addiu $v0, $v0, -0x6dc0 /* 003400 80002800 3C128012 */ lui $s2, %hi(D_80119240) # $s2, 0x8012 -/* 003404 80002804 3C108012 */ lui $s0, %hi(D_80119254) # $s0, 0x8012 +/* 003404 80002804 3C108012 */ lui $s0, %hi(D_80119240+20) # $s0, 0x8012 /* 003408 80002808 AC400004 */ sw $zero, 4($v0) /* 00340C 8000280C AC400000 */ sw $zero, ($v0) -/* 003410 80002810 26109254 */ addiu $s0, %lo(D_80119254) # addiu $s0, $s0, -0x6dac +/* 003410 80002810 26109254 */ addiu $s0, %lo(D_80119240+20) # addiu $s0, $s0, -0x6dac /* 003414 80002814 26529240 */ addiu $s2, %lo(D_80119240) # addiu $s2, $s2, -0x6dc0 /* 003418 80002818 00008825 */ move $s1, $zero .L8000281C: @@ -203,9 +203,9 @@ glabel audioNewThread /* 00355C 8000295C 0C01C3BE */ jal func_80070EF8 /* 003560 80002960 00801025 */ move $v0, $a0 /* 003564 80002964 3C108011 */ lui $s0, %hi(D_80115F98) # $s0, 0x8011 -/* 003568 80002968 3C118011 */ lui $s1, %hi(D_80115FA4) # $s1, 0x8011 +/* 003568 80002968 3C118011 */ lui $s1, %hi(D_80115FA0+4) # $s1, 0x8011 /* 00356C 8000296C 00401825 */ move $v1, $v0 -/* 003570 80002970 26315FA4 */ addiu $s1, %lo(D_80115FA4) # addiu $s1, $s1, 0x5fa4 +/* 003570 80002970 26315FA4 */ addiu $s1, %lo(D_80115FA0+4) # addiu $s1, $s1, 0x5fa4 /* 003574 80002974 26105F98 */ addiu $s0, %lo(D_80115F98) # addiu $s0, $s0, 0x5f98 .L80002978: /* 003578 80002978 8E660014 */ lw $a2, 0x14($s3) diff --git a/bss.txt b/bss.txt new file mode 100644 index 00000000..3d486755 --- /dev/null +++ b/bss.txt @@ -0,0 +1,1165 @@ +unknown_001050 + + +unknown_003260 + + +unknown_005740 + + +unknown_00BC20 +D_8011AD20; +D_8011AD21; +D_8011AD22; +D_8011AD24; +D_8011AD25; +D_8011AD26; +D_8011AD28; +D_8011AD30; +D_8011AD34; +D_8011AD38; +D_8011AD3C; +D_8011AD3D; +D_8011AD3E; +D_8011AD40; +D_8011AD44; +D_8011AD45; +D_8011AD46; +D_8011AD48; +D_8011AD4A; +D_8011AD4C; +D_8011AD4E; +D_8011AD50; +D_8011AD51; +D_8011AD52; +D_8011AD53; +D_8011AD58; +D_8011AD5C; +D_8011AD60; +D_8011AD64; +D_8011AD68; +D_8011AD6C; +D_8011AD70; +D_8011AD78; +D_8011ADA0; +D_8011ADA4; +D_8011ADA8; +D_8011ADAC; +D_8011ADB0; +D_8011ADB4; +D_8011ADB8; +D_8011ADBC; +D_8011ADC0; +D_8011ADC4; +D_8011ADC5; +D_8011ADC8; +D_8011ADCC; +D_8011ADD0; +D_8011ADD4; +D_8011ADD5; +D_8011ADD8; +D_8011AE00; +D_8011AE01; +D_8011AE02; +D_8011AE03; +D_8011AE08; +D_8011AE48; +D_8011AE4C; +D_8011AE50; +D_8011AE54; +objPtrList; +objCount; +D_8011AE60; +D_8011AE64; +D_8011AE68; +D_8011AE6C; +D_8011AE70; +D_8011AE74; +D_8011AE78; +D_8011AE7A; +D_8011AE7C; +D_8011AE7E; +D_8011AE80; +D_8011AE82; +D_8011AE84; +D_8011AE88; +D_8011AE8C; +D_8011AE90; +D_8011AE94; +D_8011AE98; +D_8011AEA0; +D_8011AEA4; +D_8011AEA8; +D_8011AEB0; +D_8011AEB8; +D_8011AEBC; +D_8011AEC0; +particlePtrList; +particleCount; +D_8011AECC; +D_8011AED0; +D_8011AED4; +D_8011AED8; +D_8011AEDC; +D_8011AEE0; +playerStructArray_Ptr; +D_8011AEE8; +D_8011AEEC; +playerCount; +D_8011AEF4; +D_8011AEF5; +D_8011AEF6; +D_8011AEF7; +D_8011AEF8; +D_8011AEFC; +D_8011AF00; +D_8011AF04; +D_8011AF08; +D_8011AF10; +D_8011AF18; +D_8011AF2C; +D_8011AF30; +D_8011AF60; +D_8011AF68; +D_8011AFE8; +D_8011AFEE; +D_8011AFF4; +D_8011AFF8; +D_8011AFFC; +D_8011B000; +D_8011B004; +D_8011B008; +D_8011B010; +D_8011B020; +D_8011B048; +D_8011B058; +D_8011B068; +D_8011B078; +D_8011B07B; + + +unknown_0255E0 +D_8011B0A0; +D_8011B0A4; +D_8011B0A8; +D_8011B0AC; +D_8011B0B0; +D_8011B0B4; +D_8011B0B8; +D_8011B0BC; +D_8011B0C0; +D_8011B0C4; +D_8011B0C8; +D_8011B0CC; +D_8011B0D0; +D_8011B0D4; +D_8011B0DC; +D_8011B0E0; +D_8011B0E1; +D_8011B0E2; +D_8011B0E3; +D_8011B0E4; +D_8011B0E8; +D_8011B0EC; +D_8011B0F0; +D_8011B0F4; +D_8011B0F8; +D_8011B0FC; +D_8011B100; +D_8011B104; +D_8011B108; +D_8011B10C; +D_8011B110; +D_8011B114; +D_8011B118; +D_8011B120; +D_8011B320; +D_8011B330; +D_8011C230; +D_8011C238; +D_8011C3B8; +D_8011C8B8; +D_8011D0B8; +D_8011D0BC; +D_8011D0C0; +D_8011D0C4; +D_8011D0C8; +D_8011D0CC; +D_8011D0CE; +D_8011D0D0; +D_8011D0D4; +D_8011D0D8; +D_8011D0DC; +D_8011D0E0; +D_8011D0E4; +D_8011D0E8; +D_8011D0EC; +D_8011D0F0; +D_8011D0F4; +D_8011D0F8; +D_8011D128; +D_8011D164; +D_8011D2B8; +D_8011D308; +D_8011D30C; +D_8011D310; +D_8011D314; +D_8011D318; +D_8011D31C; +D_8011D320; +D_8011D330; +D_8011D338; +D_8011D348; +D_8011D350; +D_8011D360; +D_8011D364; +D_8011D368; +D_8011D36C; +D_8011D370; +D_8011D374; +D_8011D378; +D_8011D37C; +D_8011D380; +D_8011D384; +D_8011D388; +D_8011D468; +D_8011D474; +D_8011D478; +D_8011D47C; +D_8011D480; +D_8011D488; +D_8011D490; +D_8011D498; +D_8011D49C; +D_8011D49E; +D_8011D4A0; +D_8011D4A4; +D_8011D4A8; +D_8011D4AC; +D_8011D4B0; +D_8011D4B4; +D_8011D4B6; +D_8011D4B8; +D_8011D4BA; +D_8011D4BC; + + +unknown_032760 +D_8011D4C0; +D_8011D4C4; +D_8011D4C8; +D_8011D4CC; +D_8011D4D0; + + +unknown_0348C0 +D_8011D4D4; +D_8011D4D8; +D_8011D4DC; +D_8011D4E0; +D_8011D4E2; + + +unknown_043920 +D_8011D4F0; +D_8011D4F8; +D_8011D504; +D_8011D508; +D_8011D510; +D_8011D528; +D_8011D52C; +D_8011D530; +D_8011D534; +D_8011D538; +D_8011D53C; +D_8011D540; +D_8011D544; +D_8011D548; +D_8011D54C; +D_8011D550; +D_8011D552; +D_8011D553; +D_8011D554; +D_8011D558; +D_8011D55C; +D_8011D560; +D_8011D564; +D_8011D568; +D_8011D56C; +D_8011D570; +D_8011D574; +D_8011D578; +D_8011D57C; +D_8011D580; +D_8011D581; +D_8011D582; +D_8011D583; +D_8011D584; +D_8011D585; +D_8011D586; +D_8011D588; +D_8011D589; +D_8011D58A; +D_8011D58B; +D_8011D58C; +D_8011D58D; +D_8011D58E; +D_8011D58F; +D_8011D590; +D_8011D598; +D_8011D59C; +D_8011D59D; +D_8011D59E; +D_8011D5A0; +D_8011D5A4; +D_8011D5A8; +D_8011D5AC; +D_8011D5AE; +D_8011D5B0; +D_8011D5B4; +D_8011D5B8; +D_8011D5BA; +D_8011D5BB; +D_8011D5BC; + + +unknown_05CEF0 +D_8011D5C0; +D_8011D5C4; +D_8011D5C8; +D_8011D5CC; + + +unknown_05DCD0 +D_8011D5D0; +D_8011D5D1; +D_8011D5E0; +D_8011D5E1; + + +unknown_05F0C0 +D_8011D5F0; +D_8011D5F1; + + +unknown_05F690 +D_8011D600; +D_8011D601; +D_8011D610; +D_8011D611; +D_8011D620; +D_8011D624; +D_8011D628; +D_8011D62C; +D_8011D630; +D_8011D634; +D_8011D638; +D_8011D63C; +D_8011D640; +D_8011D644; + + +unknown_0667D0 +D_8011D750; +D_8011D758; +D_8011F758; +D_8011F760; +D_8011F910; +D_8011FFF0; +D_80120001; + + +unknown_080500 +D_80120004; + + +unknown_00BC20 +D_80120010; + + +unknown_09F8F0 +D_8012004B; +D_80120AC0; + + +unknown_066AA0 +D_80120AC4; +D_80120AF4; +D_80120BD0; +D_80120BD4; +D_80120CE0; +D_80120CE4; +D_80120CE8; +D_80120CF0; +D_80120D08; +D_80120D0C; +D_80120D10; +D_80120D14; +D_80120D15; +D_80120D18; +D_80120D1C; +D_80120D20; +D_80120D28; +D_80120D40; +D_80120D58; +D_80120D6C; +D_80120D70; +D_80120D74; +D_80120D88; +D_80120DA0; +D_80120EE0; +D_80120F20; +D_80120F60; +D_80120FA0; +D_80120FE0; +D_80121020; +D_80121060; +D_801210A0; +D_801210E0; +D_801210F8; +D_801210FC; +D_80121100; +D_80121103; +D_80121110; +D_80121128; +D_80121140; +D_80121148; +D_80121150; +D_80121151; +D_80121152; +D_80121153; +D_80121160; +D_80121164; +D_80121168; +D_8012116C; +D_80121170; +D_80121174; +D_80121178; +D_8012117C; +D_80121180; +D_801211C0; + + +unknown_06B2B0 +D_801211C8; +D_801211F0; +D_801211F8; +D_80121200; +D_80121204; +D_80121208; +D_80121210; +D_80121214; +D_80121218; +D_80121220; +D_80121224; +D_80121228; +D_80121250; +D_80121260; +D_801234E8; +D_801234EC; +D_801234F0; +D_801234F4; +D_801234F8; +D_801234FC; +D_80123500; +D_80123504; +D_80123508; +D_8012350C; +gSettingsPtr; +D_80123514; +gIsPaused; +D_80123516; +D_80123518; +D_8012351C; +D_80123520; +D_80123524; +D_80123525; +D_80123526; +D_80123528; +D_8012352C; +D_80123530; +D_80123534; +D_80123538; +D_80123544; +D_80123548; +D_80123560; + + +unknown_071730 +D_80123580; +D_80123588; +D_801235C0; +D_801235C8; +D_80123DC8; +D_80123DCC; +D_80123DD0; +D_80123ED0; +D_80123FD0; +D_80123FF0; + + +unknown_072E50 +D_80124010; +D_80124018; +D_801241B8; +D_801241E0; +D_801241E4; +D_801241E5; +D_801241E6; +D_801241E7; +D_801241E8; +D_801241EC; +D_801241F0; +D_801241F4; + + +unknown_0777A0 +D_80124200; +D_80124218; +D_80124220; +D_80124238; +D_80124278; +D_80124290; + + +unknown_078050 +D_801242A0; +D_801246A0; +D_80125EA0; +D_80125EB8; +D_80125EC0; +D_80125ED8; +D_80125EF0; +D_80125F10; +D_80125F30; +D_80125F31; +D_80125F32; +D_80125F33; +D_80125F34; +D_80125F35; +D_80125F36; +D_80125F37; +D_80125F38; +D_80125F3C; +D_80125F40; +D_80126020; +D_80126100; + + +unknown_079F50 +D_80126110; +D_80126114; +D_80126118; +D_8012611C; +D_80126120; +D_80126124; +D_80126170; +D_80126174; + + +unknown_07AF10 +D_80126178; +D_80126180; +D_801261A0; +D_80126260; +D_801262B0; +D_801262B8; +D_801262C0; +D_801262C8; +D_801262CC; +D_801262D0; +D_801262D4; +D_801262D8; +D_801262DC; +D_801262E0; +D_801262E4; +D_80126308; +D_80126309; +D_80126310; + + +unknown_07B870 +D_80126320; +D_80126328; +D_8012632C; +D_80126330; +D_80126338; +D_8012633C; +D_80126340; +D_80126344; +D_80126348; +D_8012634C; +D_80126350; +D_80126354; +D_80126358; +D_8012635C; +D_80126360; +D_80126364; +D_80126368; +D_8012636C; +D_80126370; +D_80126374; +D_80126378; +D_8012637C; +D_80126380; +D_80126382; +D_80126384; + + +unknown_080500 +D_80126390; +D_80126394; +D_80126398; +D_8012639C; +D_801263A0; +D_801263A4; +D_801263A8; +D_801263AC; +D_801263B0; +D_801263B4; +D_801263B8; +D_801263BC; +D_801263C0; +D_801263C4; +D_801263C8; +D_801263CC; +D_801263D0; +D_801263D4; +D_801263D5; +D_801263D6; +D_801263D7; +D_801263D8; +D_801263DC; +D_801263E0; +players_character_array; +D_801263F0; +D_801263F8; +D_80126418; +D_80126420; +D_80126428; +D_80126430; +D_80126431; +D_80126438; +D_80126448; +D_8012644C; +D_80126450; +D_80126454; +D_80126458; +D_8012645C; +D_8012645D; +D_80126460; +D_80126464; +D_80126465; +D_80126468; +D_8012646C; +D_80126470; +D_80126474; +D_80126478; +D_8012647C; +D_80126480; +D_80126484; +D_80126488; +D_8012648C; +D_80126490; +D_80126494; +D_80126498; +D_801264A0; +D_801264D0; +D_801264D4; +D_801264D8; +D_801264DC; +D_801264E2; +D_801264E4; +D_801264EC; +D_801264F8; +D_80126504; +D_80126508; +D_8012650E; +D_80126510; +D_80126516; +D_80126518; +D_80126520; +D_80126530; +D_80126534; +D_80126538; +D_8012653C; +D_80126540; +D_80126541; +D_80126548; +D_80126550; +D_8012665C; +D_80126660; +D_80126664; +D_80126750; +D_801267D0; +D_801267D8; +D_801267E4; +D_801267E8; +D_801267EC; +D_801267F0; +D_80126804; +D_80126808; +D_8012680C; +D_80126810; +D_80126814; +D_80126818; +D_80126820; +D_80126824; +D_80126828; +D_80126830; +D_80126838; +D_8012683A; +D_8012683C; +D_80126840; +D_80126844; +D_80126848; +D_8012684C; +D_80126850; +D_80126854; +D_80126858; +D_8012685C; +D_80126860; +D_80126864; +D_80126868; +D_8012686C; +D_80126870; +D_80126874; +D_80126878; +D_801268D8; +D_801268DC; +D_801268E0; +D_801268E8; +D_80126918; +D_80126924; +D_80126928; +D_8012692C; +D_80126930; +p1_vehicle; +p2_vehicle; +D_801269C4; +D_801269C8; +D_801269CC; +D_801269D0; +D_801269DC; +D_801269E0; +D_801269E4; +D_801269E8; +D_801269EC; +D_801269F0; +D_801269F4; +D_801269F8; +D_801269FC; +D_80126A00; +D_80126A04; +D_80126A08; +D_80126A0C; +D_80126A10; +D_80126A14; +D_80126A18; +D_80126A1C; +D_80126A20; +D_80126A30; +D_80126A34; +D_80126A38; +D_80126A3C; +D_80126A40; +D_80126A60; +D_80126A64; +D_80126A68; +D_80126A6C; +D_80126A70; +D_80126A74; +D_80126A78; +D_80126A80; +D_80126A90; +D_80126A94; +D_80126A98; +D_80126AA0; +D_80126AE0; +D_80126B20; +D_80126B60; +D_80126B70; +D_80126BB0; +D_80126BB4; +D_80126BB8; +D_80126BBC; +D_80126BC0; +D_80126BC4; +D_80126BC8; +D_80126BCC; +D_80126BD0; +D_80126BD4; +D_80126BD8; +D_80126BDC; +D_80126BE0; +D_80126BE4; +D_80126BE8; +D_80126BEC; +D_80126BF0; +D_80126C10; +D_80126C14; +D_80126C18; +D_80126C1C; +D_80126C20; +D_80126C24; +D_80126C28; +D_80126C2C; +D_80126C30; +D_80126C34; +D_80126C38; +D_80126C3C; +D_80126C40; +D_80126C42; +D_80126C44; +D_80126C46; +D_80126C48; +D_80126C4C; +D_80126C50; +D_80126C54; +D_80126C57; +D_80126C58; +D_80126C6C; +D_80126C70; +D_80126C74; +D_80126C78; +D_80126C80; +D_80126CC0; + + +unknown_09F8F0 +D_80126CD0; +D_80126CD1; +D_80126CD2; +D_80126CD3; +D_80126CD4; +D_80126CD5; +D_80126CD8; +D_80126CDC; +D_80126CE0; +D_80126CEC; +D_80126CF0; +D_80126CF4; +D_80126CF8; +D_80126CFC; +D_80126D00; +D_80126D04; +D_80126D08; +D_80126D0C; +D_80126D10; +D_80126D14; +D_80126D18; +D_80126D1C; +D_80126D20; +D_80126D24; +D_80126D28; +D_80126D2C; +D_80126D30; +D_80126D34; +D_80126D35; +D_80126D36; +D_80126D37; +D_80126D38; +D_80126D3C; +D_80126D40; +D_80126D44; +D_80126D48; +D_80126D4C; +D_80126D50; +D_80126D54; +D_80126D55; +D_80126D56; +D_80126D58; +D_80126D5C; +D_80126D60; +D_80126D64; +D_80126D65; +D_80126D66; +D_80126D67; +D_80126D68; +D_80126D69; +D_80126D6C; +D_80126D70; +D_80126D71; +D_80126D74; +D_80126D78; +D_80126D7C; +D_80126D80; +D_80127180; +D_80127184; +D_80127188; +D_80127189; +D_8012718A; +D_8012718B; +D_8012718C; +D_80127190; +D_80127194; + + +unknown_078050 +D_801271B0; + + +unknown_09F8F0 +D_80127BB0; +D_80127BB4; +D_80127BB8; +D_80127BF8; +D_80127C00; +D_80127C04; +D_80127C08; +D_80127C0C; +D_80127C10; +D_80127C14; +D_80127C18; +D_80127C1C; +D_80127C20; +D_80127C24; +D_80127C28; +D_80127C2C; +D_80127C30; +D_80127C40; +D_80127C80; + + +unknown_0AEE70 +D_80127C88; +D_80127CA0; +D_80127CA4; +D_80127CA8; +D_80127CAC; +D_80127CAE; +D_80127CB0; +D_80127CB2; +D_80127CB4; +D_80127CB8; +D_80127CBC; +D_80127CC0; +D_80127CC4; +D_80127CC8; +D_80127CCC; +D_80127CD0; +D_80127CD2; +D_80127CD8; +D_801285D8; +D_801295E0; +D_80129790; +D_801297A8; +D_801297C8; +D_801297E8; +D_80129800; +D_80129824; +D_8012982C; +D_80129834; +D_8012983C; +D_80129844; +D_8012984C; +D_80129854; +D_8012985C; +D_80129864; +D_8012986C; +D_80129874; +D_8012987C; +D_80129884; +D_8012988C; +D_80129894; +D_8012989C; +D_801298A4; +D_801298AC; +D_801298B4; +D_801298BC; +D_801298C4; +D_801298CC; +D_801298D4; +D_801298DC; +D_801298E4; +D_801298EC; +D_801298F4; +D_801298FC; +D_80129904; +D_80129918; +D_8012991C; +D_80129920; +D_80129924; +D_801299B0; + + +unknown_0C4800 +piThreadStack; +D_80129BB0; +D_80129FB0; +D_80129FBC; + + +unknown_0B8920 +D_80129FC0; +D_80129FC4; +D_80129FC8; +D_80129FCC; +D_80129FE8; +D_80129FF0; +D_8012A008; +D_8012A00C; +D_8012A018; +D_8012A01C; +D_8012A020; +D_8012A028; +D_8012A078; +D_8012A07C; +D_8012A080; +D_8012A084; +D_8012A088; +D_8012A08C; +D_8012A090; +D_8012A094; +D_8012A098; +D_8012A09C; +D_8012A0A0; +D_8012A0A4; +D_8012A0A8; +D_8012A0AC; +D_8012A0B0; +D_8012A0B4; +D_8012A0B8; +D_8012A0BC; +D_8012A0C0; +D_8012A0C4; +D_8012A0C8; +D_8012A0CC; +D_8012A0D0; +D_8012A0D4; +D_8012A0D8; +D_8012A0DC; +D_8012A0E0; +D_8012A0E8; +D_8012A1E8; +D_8012A5E8; +D_8012A5F4; +D_8012A600; +D_8012A720; +D_8012A724; +D_8012A728; +D_8012A730; +D_8012A734; +D_8012A735; +D_8012A736; +D_8012A737; +D_8012A738; +D_8012A73C; +D_8012A740; +D_8012A744; +D_8012A748; +D_8012A74C; +D_8012A750; +D_8012A754; +D_8012A758; +D_8012A75C; +D_8012A760; +D_8012A764; +D_8012A768; +D_8012A76C; +D_8012A770; +D_8012A774; +D_8012A778; +D_8012A77C; +D_8012A780; +D_8012A784; +D_8012A785; +D_8012A786; +D_8012A787; +D_8012A788; +D_8012A789; +D_8012A78A; +D_8012A78C; +D_8012A78E; +D_8012A790; +D_8012A798; +D_8012A7A0; +D_8012A7A4; +D_8012A7A8; +D_8012A7AA; +D_8012A7AC; +D_8012A7AE; +D_8012A7B0; +D_8012A7B2; +D_8012A7B4; +D_8012A7B6; +D_8012A7B8; +D_8012A7BA; +D_8012A7C0; +D_8012A7C8; +D_8012A7D0; +D_8012A7D4; +D_8012A7E0; +D_8012A7E4; +D_8012A7E8; +D_8012A7EC; +D_8012A7F0; +D_8012A7F4; + + +unknown_0C4800 +piThread; +piEventQueue; +piEventBuf; +gzip_bit_buffer; +gzip_num_bits; +D_8012AAD8; +D_8012AAE0; + + +unknown_0C7F50 +D_8012AAF0; +D_8012ACA0; +D_8012ACB8; + + +osViMgr +viThreadStack; +D_8012CCC0; +__osEventStateTab; + + +unknown_0CD820 +D_8012CD50; +D_8012CD8C; +D_8012CD90; +__osMaxControllers; +D_8012CDB8; +D_8012CDD0; +__osPfsPifRam; +D_8012CE1C; + + +unknown_0CE200 +D_8012CE20; +D_8012CE28; +D_8012CE40; +D_8012CE7C; + + +osViMgr +viThread; +viEventQueue; +viEventBuf; +viRetraceMsg; +viCounterMsg; +D_8012D190; + + +unknown_0D29F0 +D_8012D1A0; + + +unknown_0D3020 +D_8012D1E0; +piAccessQueue; +__osCurrentTime; +D_8012D224; +__osBaseCounter; +D_8012D22C; +D_8012D230; +D_8012D240; + + +unknown_071730 +D_8012D3F0; \ No newline at end of file diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 71c10ac7..ffd51ba1 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -47,8 +47,12 @@ const char D_800E49BC[] = "Invalid midi sequence index\n"; /************ .bss ************/ -u8 D_800EBF60; -extern ALHeap gALHeap; +#define AUDIO_HEAP_SIZE 0x29D88 + +// The audio heap is located at the start of the BSS section. +u8 gBssSectionStart[AUDIO_HEAP_SIZE]; + +ALHeap gALHeap; /* Unknown size */ typedef struct unk80115CF8 { @@ -56,16 +60,16 @@ typedef struct unk80115CF8 { s16 unk2; } unk80115CF8; -extern ALSeqFile *ALSeqFile_80115CF8; -extern void *D_80115CFC; +ALSeqFile *ALSeqFile_80115CF8; +void *D_80115CFC; -extern u8 D_80115D04; -extern u8 D_80115D05; -extern s32 musicTempo; - -extern ALBankFile *ALBankFile_80115D10; - -extern ALBankFile *ALBankFile_80115D14; +void *D_80115D00; +u8 D_80115D04; +u8 D_80115D05; +s32 musicTempo; +u32 *D_80115D0C; +ALBankFile *ALBankFile_80115D10; +ALBankFile *ALBankFile_80115D14; /* Size: 0x0A bytes */ typedef struct unk80115D18 { @@ -74,7 +78,7 @@ typedef struct unk80115D18 { u8 pad8[2]; } unk80115D18; -extern unk80115D18* D_80115D18; +unk80115D18 *D_80115D18; /* Size: 3 bytes */ typedef struct unk80115D1C { @@ -82,26 +86,27 @@ typedef struct unk80115D1C { u8 unk1; u8 unk2; } unk80115D1C; -extern void *D_80115D00; -extern u32 *D_80115D0C; -extern unk80115D1C* D_80115D1C; -extern s32 D_80115D20; -extern s32 D_80115D24; -extern u32 D_80115D28; -extern u32 D_80115D2C; -extern s16 D_80115D30; -extern s32 D_80115D38; -extern s32 D_80115D3C; -extern u8 D_80115D40; -extern u8 D_80115D41; -extern unk80115D48 D_80115D48[8]; -extern ALCSeq D_80115D88; -extern ALCSeq D_80115E80; -extern u8 D_80115F78; -extern u8 D_80115F79; -extern s32 D_80115F7C; -extern u32 D_80115F84; -extern u32 D_80115F88; +unk80115D1C* D_80115D1C; + +s32 D_80115D20; +s32 D_80115D24; +u32 D_80115D28; +u32 D_80115D2C; +s16 D_80115D30; +f32 D_80115D34; +s32 D_80115D38; +s32 D_80115D3C; +u8 D_80115D40; +u8 D_80115D41; +unk80115D48 D_80115D48[8]; +ALCSeq D_80115D88; +ALCSeq D_80115E80; +u8 D_80115F78; +u8 D_80115F79; +s32 D_80115F7C; +s32 D_80115F80; +u32 D_80115F84; +u32 D_80115F88; /******************************/ @@ -130,7 +135,7 @@ void audio_init(u32 arg0){ audioMgrConfig audConfig; seq_max_len = 0; - alHeapInit(&gALHeap, &D_800EBF60, 0x00029D88); + alHeapInit(&gALHeap, gBssSectionStart, 0x00029D88); reg_s2 = func_80076C58(38); ALBankFile_80115D14 = (ALBankFile*) func_80070C9C(reg_s2[2] - reg_s2[1], 0x00FFFFFF); @@ -557,9 +562,6 @@ u8 musicIsPlaying(void) { return (alCSPGetState(gMusicPlayer) == AL_PLAYING); } - -extern f32 D_80115D34; - #if 1 GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800015F8.s") #else diff --git a/src/unknown_003260.c b/src/unknown_003260.c index 9df9b310..75b3cce6 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -50,6 +50,7 @@ typedef struct unk800DC6BC { ALMicroTime curTime; } unk800DC6BC; //ALSndPlayer +/* Size: 0x14 bytes */ typedef struct unk80119240 { ALLink node; @@ -117,20 +118,29 @@ const char D_800E4B80[] = "WARNING: Attempt to stop NULL sound aborted\n"; /************ .bss ************/ -extern s32 D_80115F90; -extern ALHeap* D_80115F94; -extern OSThread audioThread; -extern OSMesgQueue OSMesgQueue_80116160; -extern OSMesg D_80116178; -extern OSMesgQueue D_80116198; -extern OSMesg D_801161B0; -extern ALGlobals ALGlobals_801161D0; -extern s32 D_80119230; -extern unk80119240 D_80119240[0x31]; -extern s32 D_8011962C; -extern OSMesgQueue D_80119AF0; -extern OSMesg D_80119B08; -extern u16* D_80119C28; +s32 D_80115F90; +ALHeap* D_80115F94; +s32 D_80115F98[2]; +s32 D_80115FA0[3]; +OSThread audioThread; +OSMesgQueue OSMesgQueue_80116160; +OSMesg D_80116178[8]; +OSMesgQueue D_80116198; +OSMesg D_801161B0[8]; +ALGlobals ALGlobals_801161D0; +s32 D_80116220[3076]; +s32 D_80119230[3]; +unk80119240 D_80119240[50]; +s32 D_80119628; +s32 D_8011962C; +s32 D_80119630; +s32 D_80119634; +s32 D_80119638[2]; +s32 D_80119640[300]; +OSMesgQueue D_80119AF0; +OSMesg D_80119B08[72]; +u16* D_80119C28; + extern f32 D_80126170; /******************************/ diff --git a/src/unknown_005740.c b/src/unknown_005740.c index 822e6f36..b4746cb1 100644 --- a/src/unknown_005740.c +++ b/src/unknown_005740.c @@ -12,6 +12,28 @@ s32 D_800DC6D8 = 1; // Currently unknown, might be a different type. /*******************************/ +/************ .bss ************/ + +s32 D_80119C30[2]; +s32 D_80119C38; +s32 D_80119C3C; +s32 D_80119C40; +s32 D_80119C44; +s32 D_80119C48; +s32 D_80119C4C; +s32 D_80119C50[2]; +s32 D_80119C58; +s32 D_80119C5C; +s32 D_80119C60[670]; +s32 D_8011A6D8; +s32 D_8011A6DC; +s32 D_8011A6E0[334]; +s32 D_8011AC18; +s32 D_8011AC1C; +s32 D_8011AC20[64]; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80004B40.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_800050D0.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80005254.s") diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 8f3a4c70..4c67e61a 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -116,8 +116,18 @@ class GenerateLD: self.gen_line('romPos += SIZEOF(.rodata);') self.gen_newline() + def gen_ucode_data_section(self): + self.gen_line('.ucodeData . : AT(romPos)') + self.gen_open_block() + self.gen_line(BUILD_DIR + '/asm/assets/ucode_data.o(.text);') + self.gen_close_block() + self.gen_line('romPos += SIZEOF(.ucodeData);') + self.gen_newline() + def gen_bss_section(self): - self.gen_line('.bss.noload (NOLOAD):') + self.gen_line('__BSS_SECTION_SIZE = SIZEOF(.bss.noload);') + self.gen_newline() + self.gen_line('.bss.noload . (NOLOAD): SUBALIGN(4)') self.gen_open_block() for file in self.files: if file[0] not in LATE_DATA_FILES: @@ -127,14 +137,6 @@ class GenerateLD: self.gen_close_block() self.gen_newline() - def gen_ucode_data_section(self): - self.gen_line('.ucodeData . : AT(romPos)') - self.gen_open_block() - self.gen_line(BUILD_DIR + '/asm/assets/ucode_data.o(.text);') - self.gen_close_block() - self.gen_line('romPos += SIZEOF(.ucodeData);') - self.gen_newline() - def gen_assets_section(self): self.gen_line('__ASSETS_LUT_START = romPos;'); self.gen_line('__ASSETS_LUT_END = __ASSETS_LUT_START + ' + hex((((self.assets.numAssets + 2) * 4) + 15) & 0xFFFFFFF0) + ';'); diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py index cae892c0..a7b4047b 100644 --- a/tools/python/undefined_sym_fix.py +++ b/tools/python/undefined_sym_fix.py @@ -1,5 +1,6 @@ import subprocess import sys +import re import subprocess import argparse @@ -55,6 +56,55 @@ def fixDoubleLoads(): i += 1 save_syms(syms) -#fixBadLabel() -fixDoubleLoads() +def getMatches(string, regex): + out = [] + matches = re.finditer(regex, string, re.MULTILINE) + for matchNum, match in enumerate(matches, start=1): + start = match.start() + end = match.end() + out.append((string[start:end], match.groups(), (start, end))) + return out + +FILE_REGEX = r"(?:lib/)?(?:(?:src/)|(?:asm/non_matchings/))([^/.]*)" +def getFiles(symbol): + command = subprocess.run(['fgrep', '-ri', symbol], capture_output=True) + outLines = command.stdout.decode("utf-8").split('\n') + fileNames = [] + for outLine in outLines: + if 'src' in outLine or 'asm' in outLine: + match = getMatches(outLine, FILE_REGEX)[0][1][0] + if match not in fileNames: + fileNames.append(match) + return fileNames + +def getBss(): + currentFile = '' + out = [] + syms = load_syms() + for sym in syms: + if ' = ' in sym: + symSplit = sym.split(' = ') + symbol = symSplit[0] + address = int(symSplit[1][2:-1], 16) + if address >= 0x80115CE8 and address <= 0x8012D3F0: + try: + files = getFiles(symbol) + if currentFile not in files: + if len(files) == 1: + if currentFile != '': + out.append('\n') + currentFile = files[0] + out.append(currentFile) + else: + print(symbol, files, 'Cannot tell which file to use!') + except IndexError: + print('Error with symbol: ' + symbol) + out.append(sym) + with open('bss.txt', 'w') as outFile: + outFile.write('\n'.join(out)) + + +fixBadLabel() +#fixDoubleLoads() +#getBss() diff --git a/undefined_syms.txt b/undefined_syms.txt index 6d5c0064..d622687f 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,78 +25,79 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -gALHeap = 0x80115CE8; -ALSeqFile_80115CF8 = 0x80115CF8; -D_80115CFC = 0x80115CFC; -D_80115D00 = 0x80115D00; -D_80115D04 = 0x80115D04; -D_80115D05 = 0x80115D05; -musicTempo = 0x80115D08; -D_80115D0C = 0x80115D0C; -ALBankFile_80115D10 = 0x80115D10; -ALBankFile_80115D14 = 0x80115D14; -D_80115D18 = 0x80115D18; -D_80115D1C = 0x80115D1C; -D_80115D20 = 0x80115D20; -D_80115D24 = 0x80115D24; -D_80115D28 = 0x80115D28; -D_80115D2C = 0x80115D2C; -D_80115D30 = 0x80115D30; -D_80115D34 = 0x80115D34; -D_80115D38 = 0x80115D38; -D_80115D3C = 0x80115D3C; -D_80115D40 = 0x80115D40; -D_80115D41 = 0x80115D41; -D_80115D48 = 0x80115D48; -D_80115D88 = 0x80115D88; -D_80115E80 = 0x80115E80; -D_80115F78 = 0x80115F78; -D_80115F79 = 0x80115F79; -D_80115F7C = 0x80115F7C; -D_80115F80 = 0x80115F80; -D_80115F84 = 0x80115F84; -D_80115F88 = 0x80115F88; -D_80115F90 = 0x80115F90; -D_80115F94 = 0x80115F94; -D_80115F98 = 0x80115F98; -D_80115FA0 = 0x80115FA0; -D_80115FA4 = 0x80115FA4; -audioThread = 0x80115FB0; -OSMesgQueue_80116160 = 0x80116160; -D_80116178 = 0x80116178; -D_80116198 = 0x80116198; -D_801161B0 = 0x801161B0; -ALGlobals_801161D0 = 0x801161D0; -D_80116220 = 0x80116220; -D_80119230 = 0x80119230; -D_80119240 = 0x80119240; -D_80119254 = 0x80119254; -D_80119628 = 0x80119628; -D_8011962C = 0x8011962C; -D_80119630 = 0x80119630; -D_80119634 = 0x80119634; -D_80119638 = 0x80119638; -D_80119640 = 0x80119640; -D_80119AF0 = 0x80119AF0; -D_80119B08 = 0x80119B08; -D_80119C28 = 0x80119C28; -D_80119C30 = 0x80119C30; -D_80119C38 = 0x80119C38; -D_80119C3C = 0x80119C3C; -D_80119C40 = 0x80119C40; -D_80119C44 = 0x80119C44; -D_80119C48 = 0x80119C48; -D_80119C4C = 0x80119C4C; -D_80119C50 = 0x80119C50; -D_80119C58 = 0x80119C58; -D_80119C5C = 0x80119C5C; -D_80119C60 = 0x80119C60; -D_8011A6D8 = 0x8011A6D8; -D_8011A6DC = 0x8011A6DC; -D_8011A6E0 = 0x8011A6E0; -D_8011AC18 = 0x8011AC18; -D_8011AC1C = 0x8011AC1C; -D_8011AC20 = 0x8011AC20; +/gALHeap = 0x80115CE8; +/ALSeqFile_80115CF8 = 0x80115CF8; +/D_80115CFC = 0x80115CFC; +/D_80115D00 = 0x80115D00; +/D_80115D04 = 0x80115D04; +/D_80115D05 = 0x80115D05; +/musicTempo = 0x80115D08; +/D_80115D0C = 0x80115D0C; +/ALBankFile_80115D10 = 0x80115D10; +/ALBankFile_80115D14 = 0x80115D14; +/D_80115D18 = 0x80115D18; +/D_80115D1C = 0x80115D1C; +/D_80115D20 = 0x80115D20; +/D_80115D24 = 0x80115D24; +/D_80115D28 = 0x80115D28; +/D_80115D2C = 0x80115D2C; +/D_80115D30 = 0x80115D30; +/D_80115D34 = 0x80115D34; +/D_80115D38 = 0x80115D38; +/D_80115D3C = 0x80115D3C; +/D_80115D40 = 0x80115D40; +/D_80115D41 = 0x80115D41; +/D_80115D48 = 0x80115D48; +/D_80115D88 = 0x80115D88; +/D_80115E80 = 0x80115E80; +/D_80115F78 = 0x80115F78; +/D_80115F79 = 0x80115F79; +/D_80115F7C = 0x80115F7C; +/D_80115F80 = 0x80115F80; +/D_80115F84 = 0x80115F84; +/D_80115F88 = 0x80115F88; + +/D_80115F90 = 0x80115F90; +/D_80115F94 = 0x80115F94; +/D_80115F98 = 0x80115F98; +/D_80115FA0 = 0x80115FA0; +/audioThread = 0x80115FB0; +/OSMesgQueue_80116160 = 0x80116160; +/D_80116178 = 0x80116178; +/D_80116198 = 0x80116198; +/D_801161B0 = 0x801161B0; +/ALGlobals_801161D0 = 0x801161D0; +/D_80116220 = 0x80116220; +/D_80119230 = 0x80119230; +/D_80119240 = 0x80119240; +/D_80119628 = 0x80119628; +/D_8011962C = 0x8011962C; +/D_80119630 = 0x80119630; +/D_80119634 = 0x80119634; +/D_80119638 = 0x80119638; +/D_80119640 = 0x80119640; +/D_80119AF0 = 0x80119AF0; +/D_80119B08 = 0x80119B08; +/D_80119C28 = 0x80119C28; + +/D_80119C30 = 0x80119C30; +/D_80119C38 = 0x80119C38; +/D_80119C3C = 0x80119C3C; +/D_80119C40 = 0x80119C40; +/D_80119C44 = 0x80119C44; +/D_80119C48 = 0x80119C48; +/D_80119C4C = 0x80119C4C; +/D_80119C50 = 0x80119C50; +/D_80119C58 = 0x80119C58; +/D_80119C5C = 0x80119C5C; +/D_80119C60 = 0x80119C60; +/D_8011A6D8 = 0x8011A6D8; +/D_8011A6DC = 0x8011A6DC; +/D_8011A6E0 = 0x8011A6E0; +/D_8011AC18 = 0x8011AC18; +/D_8011AC1C = 0x8011AC1C; +/D_8011AC20 = 0x8011AC20; + D_8011AD20 = 0x8011AD20; D_8011AD21 = 0x8011AD21; D_8011AD22 = 0x8011AD22; From fdb473110dca1a35685c21f1f2dedff15ab8299a Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 19:05:13 -0500 Subject: [PATCH 08/39] Added bss for unknown_00BC20, unknown_0255E0 --- .../unknown_00BC20/func_8000CC7C.s | 12 +- .../unknown_00BC20/func_80010994.s | 4 +- .../unknown_00BC20/func_8002125C.s | 4 +- bss.txt | 231 --------- src/unknown_005740.c | 2 +- src/unknown_00BC20.c | 251 ++++++---- src/unknown_0255E0.c | 140 ++++-- undefined_syms.txt | 468 +++++++++--------- 8 files changed, 505 insertions(+), 607 deletions(-) diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index c9a79bab..8a24cf2f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -556,10 +556,10 @@ glabel func_8000CC7C /* 00E01C 8000D41C 8FB80078 */ lw $t8, 0x78($sp) /* 00E020 8000D420 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) /* 00E024 8000D424 830D00B8 */ lb $t5, 0xb8($t8) -/* 00E028 8000D428 3C018012 */ lui $at, %hi(D_8011AD25) # $at, 0x8012 +/* 00E028 8000D428 3C018012 */ lui $at, %hi(D_8011AD24+1) # $at, 0x8012 /* 00E02C 8000D42C A3B90127 */ sb $t9, 0x127($sp) /* 00E030 8000D430 1860015E */ blez $v1, .L8000D9AC -/* 00E034 8000D434 A02DAD25 */ sb $t5, %lo(D_8011AD25)($at) +/* 00E034 8000D434 A02DAD25 */ sb $t5, %lo(D_8011AD24+1)($at) /* 00E038 8000D438 8FA40068 */ lw $a0, 0x68($sp) /* 00E03C 8000D43C 24020005 */ li $v0, 5 .L8000D440: @@ -625,9 +625,9 @@ glabel func_8000CC7C /* 00E114 8000D514 14410012 */ bne $v0, $at, .L8000D560 /* 00E118 8000D518 24110001 */ li $s1, 1 /* 00E11C 8000D51C 16000009 */ bnez $s0, .L8000D544 -/* 00E120 8000D520 3C188012 */ lui $t8, %hi(D_8011AD25) # $t8, 0x8012 -/* 00E124 8000D524 3C0E8012 */ lui $t6, %hi(D_8011AD25) # $t6, 0x8012 -/* 00E128 8000D528 81CEAD25 */ lb $t6, %lo(D_8011AD25)($t6) +/* 00E120 8000D520 3C188012 */ lui $t8, %hi(D_8011AD24+1) # $t8, 0x8012 +/* 00E124 8000D524 3C0E8012 */ lui $t6, %hi(D_8011AD24+1) # $t6, 0x8012 +/* 00E128 8000D528 81CEAD25 */ lb $t6, %lo(D_8011AD24+1)($t6) # Indexing into D_800DC820 only reading the MSB? /* 00E12C 8000D52C 3C1E800E */ lui $fp, %hi(D_800DC820) # $fp, 0x800e /* 00E130 8000D530 000E7840 */ sll $t7, $t6, 1 @@ -636,7 +636,7 @@ glabel func_8000CC7C /* 00E13C 8000D53C 10000028 */ b .L8000D5E0 /* 00E140 8000D540 00000000 */ nop .L8000D544: -/* 00E144 8000D544 8318AD25 */ lb $t8, %lo(D_8011AD25)($t8) +/* 00E144 8000D544 8318AD25 */ lb $t8, %lo(D_8011AD24+1)($t8) # Indexing into D_800DC820 only reading the LSB? /* 00E148 8000D548 3C1E800E */ lui $fp, %hi(D_800DC820) # $fp, 0x800e /* 00E14C 8000D54C 00186840 */ sll $t5, $t8, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index e78f8db6..8ca113fe 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -43,9 +43,9 @@ glabel func_80010994 /* 011630 80010A30 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 011634 80010A34 AC20ADB0 */ sw $zero, %lo(D_8011ADB0)($at) .L80010A38: -/* 011638 80010A38 3C028012 */ lui $v0, %hi(D_8011AD21) # $v0, 0x8012 +/* 011638 80010A38 3C028012 */ lui $v0, %hi(D_8011AD20+1) # $v0, 0x8012 /* 01163C 80010A3C 3C018012 */ lui $at, %hi(D_8011AD3D) # $at, 0x8012 -/* 011640 80010A40 2442AD21 */ addiu $v0, %lo(D_8011AD21) # addiu $v0, $v0, -0x52df +/* 011640 80010A40 2442AD21 */ addiu $v0, %lo(D_8011AD20+1) # addiu $v0, $v0, -0x52df /* 011644 80010A44 A020AD3D */ sb $zero, %lo(D_8011AD3D)($at) /* 011648 80010A48 80480000 */ lb $t0, ($v0) /* 01164C 80010A4C 24090001 */ li $t1, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_8002125C.s b/asm/non_matchings/unknown_00BC20/func_8002125C.s index e08fde9d..f10a0435 100644 --- a/asm/non_matchings/unknown_00BC20/func_8002125C.s +++ b/asm/non_matchings/unknown_00BC20/func_8002125C.s @@ -96,10 +96,10 @@ glabel func_8002125C /* 021FC0 800213C0 00000000 */ nop .L800213C4: /* 021FC4 800213C4 80B90028 */ lb $t9, 0x28($a1) -/* 021FC8 800213C8 3C088012 */ lui $t0, %hi(D_8011AD21) # $t0, 0x8012 +/* 021FC8 800213C8 3C088012 */ lui $t0, %hi(D_8011AD20+1) # $t0, 0x8012 /* 021FCC 800213CC 07200008 */ bltz $t9, .L800213F0 /* 021FD0 800213D0 3C098012 */ lui $t1, %hi(D_8011AD22) # $t1, 0x8012 -/* 021FD4 800213D4 8108AD21 */ lb $t0, %lo(D_8011AD21)($t0) +/* 021FD4 800213D4 8108AD21 */ lb $t0, %lo(D_8011AD20+1)($t0) /* 021FD8 800213D8 2529AD22 */ addiu $t1, %lo(D_8011AD22) # addiu $t1, $t1, -0x52de /* 021FDC 800213DC 01091021 */ addu $v0, $t0, $t1 /* 021FE0 800213E0 804A0000 */ lb $t2, ($v0) diff --git a/bss.txt b/bss.txt index 3d486755..9733b080 100644 --- a/bss.txt +++ b/bss.txt @@ -8,240 +8,9 @@ unknown_005740 unknown_00BC20 -D_8011AD20; -D_8011AD21; -D_8011AD22; -D_8011AD24; -D_8011AD25; -D_8011AD26; -D_8011AD28; -D_8011AD30; -D_8011AD34; -D_8011AD38; -D_8011AD3C; -D_8011AD3D; -D_8011AD3E; -D_8011AD40; -D_8011AD44; -D_8011AD45; -D_8011AD46; -D_8011AD48; -D_8011AD4A; -D_8011AD4C; -D_8011AD4E; -D_8011AD50; -D_8011AD51; -D_8011AD52; -D_8011AD53; -D_8011AD58; -D_8011AD5C; -D_8011AD60; -D_8011AD64; -D_8011AD68; -D_8011AD6C; -D_8011AD70; -D_8011AD78; -D_8011ADA0; -D_8011ADA4; -D_8011ADA8; -D_8011ADAC; -D_8011ADB0; -D_8011ADB4; -D_8011ADB8; -D_8011ADBC; -D_8011ADC0; -D_8011ADC4; -D_8011ADC5; -D_8011ADC8; -D_8011ADCC; -D_8011ADD0; -D_8011ADD4; -D_8011ADD5; -D_8011ADD8; -D_8011AE00; -D_8011AE01; -D_8011AE02; -D_8011AE03; -D_8011AE08; -D_8011AE48; -D_8011AE4C; -D_8011AE50; -D_8011AE54; -objPtrList; -objCount; -D_8011AE60; -D_8011AE64; -D_8011AE68; -D_8011AE6C; -D_8011AE70; -D_8011AE74; -D_8011AE78; -D_8011AE7A; -D_8011AE7C; -D_8011AE7E; -D_8011AE80; -D_8011AE82; -D_8011AE84; -D_8011AE88; -D_8011AE8C; -D_8011AE90; -D_8011AE94; -D_8011AE98; -D_8011AEA0; -D_8011AEA4; -D_8011AEA8; -D_8011AEB0; -D_8011AEB8; -D_8011AEBC; -D_8011AEC0; -particlePtrList; -particleCount; -D_8011AECC; -D_8011AED0; -D_8011AED4; -D_8011AED8; -D_8011AEDC; -D_8011AEE0; -playerStructArray_Ptr; -D_8011AEE8; -D_8011AEEC; -playerCount; -D_8011AEF4; -D_8011AEF5; -D_8011AEF6; -D_8011AEF7; -D_8011AEF8; -D_8011AEFC; -D_8011AF00; -D_8011AF04; -D_8011AF08; -D_8011AF10; -D_8011AF18; -D_8011AF2C; -D_8011AF30; -D_8011AF60; -D_8011AF68; -D_8011AFE8; -D_8011AFEE; -D_8011AFF4; -D_8011AFF8; -D_8011AFFC; -D_8011B000; -D_8011B004; -D_8011B008; -D_8011B010; -D_8011B020; -D_8011B048; -D_8011B058; -D_8011B068; -D_8011B078; -D_8011B07B; unknown_0255E0 -D_8011B0A0; -D_8011B0A4; -D_8011B0A8; -D_8011B0AC; -D_8011B0B0; -D_8011B0B4; -D_8011B0B8; -D_8011B0BC; -D_8011B0C0; -D_8011B0C4; -D_8011B0C8; -D_8011B0CC; -D_8011B0D0; -D_8011B0D4; -D_8011B0DC; -D_8011B0E0; -D_8011B0E1; -D_8011B0E2; -D_8011B0E3; -D_8011B0E4; -D_8011B0E8; -D_8011B0EC; -D_8011B0F0; -D_8011B0F4; -D_8011B0F8; -D_8011B0FC; -D_8011B100; -D_8011B104; -D_8011B108; -D_8011B10C; -D_8011B110; -D_8011B114; -D_8011B118; -D_8011B120; -D_8011B320; -D_8011B330; -D_8011C230; -D_8011C238; -D_8011C3B8; -D_8011C8B8; -D_8011D0B8; -D_8011D0BC; -D_8011D0C0; -D_8011D0C4; -D_8011D0C8; -D_8011D0CC; -D_8011D0CE; -D_8011D0D0; -D_8011D0D4; -D_8011D0D8; -D_8011D0DC; -D_8011D0E0; -D_8011D0E4; -D_8011D0E8; -D_8011D0EC; -D_8011D0F0; -D_8011D0F4; -D_8011D0F8; -D_8011D128; -D_8011D164; -D_8011D2B8; -D_8011D308; -D_8011D30C; -D_8011D310; -D_8011D314; -D_8011D318; -D_8011D31C; -D_8011D320; -D_8011D330; -D_8011D338; -D_8011D348; -D_8011D350; -D_8011D360; -D_8011D364; -D_8011D368; -D_8011D36C; -D_8011D370; -D_8011D374; -D_8011D378; -D_8011D37C; -D_8011D380; -D_8011D384; -D_8011D388; -D_8011D468; -D_8011D474; -D_8011D478; -D_8011D47C; -D_8011D480; -D_8011D488; -D_8011D490; -D_8011D498; -D_8011D49C; -D_8011D49E; -D_8011D4A0; -D_8011D4A4; -D_8011D4A8; -D_8011D4AC; -D_8011D4B0; -D_8011D4B4; -D_8011D4B6; -D_8011D4B8; -D_8011D4BA; -D_8011D4BC; unknown_032760 diff --git a/src/unknown_005740.c b/src/unknown_005740.c index b4746cb1..1c90b591 100644 --- a/src/unknown_005740.c +++ b/src/unknown_005740.c @@ -30,7 +30,7 @@ s32 D_8011A6DC; s32 D_8011A6E0[334]; s32 D_8011AC18; s32 D_8011AC1C; -s32 D_8011AC20[64]; +s16 D_8011AC20[128]; /******************************/ diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 8546900e..eaadb65c 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -121,80 +121,98 @@ const char D_800E5120[] = "ARGHHHHHHHHH\n"; /************ .bss ************/ -extern s16 D_8011AC20[12]; -extern s16 D_8011AD4E; -extern s8 D_8011AD20[4]; -extern s8 D_8011AD21; -extern s8 D_8011AD22[2]; -extern s8 D_8011AD25; -extern s8 D_8011AD26; -extern s32 D_8011AD34; -extern s8 D_8011AD3C; -extern s8 D_8011AD3D; +// Currently defined in unknown_005740. Might need to be defined here. +extern s16 D_8011AC20[128]; - -extern Player *D_8011AD40; -extern s8 D_8011AD44; -extern s8 D_8011AD45; -extern s16 D_8011AD46; -extern s16 D_8011AD48; -extern s16 D_8011AD4A; -extern s16 D_8011AD4C; -extern s8 D_8011AD50; -extern s8 D_8011AD51; -extern s8 D_8011AD52; -extern s8 D_8011AD53; -extern s32 *D_8011AD58; -extern s32 D_8011AD5C; -extern s32 D_8011AD60; -extern s32 *D_8011AD64; -extern s32 D_8011AD68; -extern s32 *D_8011AD6C; -extern s32 *D_8011AD70; -extern Gfx *D_8011AD78[9]; -extern s32 D_8011ADA0; -extern s16 D_8011ADA4; -extern f32 D_8011ADA8; -extern s32 D_8011ADAC; - -extern s32 D_8011ADB0; -extern s32 D_8011ADB8; -extern s32 D_8011ADBC; -extern u8 D_8011ADC4; -extern s32 D_8011ADC8; -extern s8 (*D_8011ADCC)[8]; -extern f32 D_8011ADD0; -extern s8 D_8011ADD4; -extern s8 D_8011ADD5; -extern s8 D_8011AE00; -extern s8 D_8011AE01; -extern s8 D_8011AE02; -extern s8 D_8011AE03; -extern u32 *D_8011AE08[16]; -extern s32 (*D_8011AE48)[8]; // Unknown number of entries. -extern u8 (*D_8011AE4C)[8]; // Unknown number of entries. -extern Player **objPtrList; // Not sure about the number of elements -extern s32 objCount; -extern s32 D_8011AE60; -extern s32 D_8011AE64; -extern s32 *D_8011AE68; -extern s32 *D_8011AE6C; -extern s32 D_8011AE70; -extern s32 *D_8011AE74; -extern s16 D_8011AE78; -extern s16 D_8011AE7A; -extern s16 D_8011AE7C; -extern s8 D_8011AE7E; -extern s16 D_8011AE82; -extern s32 D_8011AE88; -extern u32 D_8011AE8C; -extern u32 D_8011AE90; -extern u32 D_8011AE94; -extern s32 D_8011AEB0[2]; -extern s16 *D_8011AEB8; -extern s32 D_8011AEBC; -extern Player **particlePtrList; -extern s32 particleCount; +s8 D_8011AD20[2]; +s8 D_8011AD22[2]; +s8 D_8011AD24[2]; +s8 D_8011AD26[2]; +f32 D_8011AD28; +s32 D_8011AD2C; +f32 D_8011AD30; +s32 D_8011AD34; +s32 D_8011AD38; +s8 D_8011AD3C; +s8 D_8011AD3D; +s8 D_8011AD3E; +Player *D_8011AD40; +s8 D_8011AD44; +s8 D_8011AD45; +s16 D_8011AD46; +s16 D_8011AD48; +s16 D_8011AD4A; +s16 D_8011AD4C; +s16 D_8011AD4E; +s8 D_8011AD50; +s8 D_8011AD51; +s8 D_8011AD52; +s8 D_8011AD53; +s32 D_8011AD54; +s32 *D_8011AD58; +s32 D_8011AD5C; +s32 D_8011AD60; +s32 *D_8011AD64; +s32 D_8011AD68; +s32 *D_8011AD6C; +s32 *D_8011AD70; +s32 D_8011AD74; +Gfx *D_8011AD78[10]; +s32 D_8011ADA0; +s16 D_8011ADA4; +f32 D_8011ADA8; +s32 D_8011ADAC; +s32 D_8011ADB0; +s32 D_8011ADB4; +s32 D_8011ADB8; +s32 D_8011ADBC; +s32 D_8011ADC0; +u8 D_8011ADC4; +u8 D_8011ADC5; +s32 D_8011ADC8; +s8 (*D_8011ADCC)[8]; +f32 D_8011ADD0; +s8 D_8011ADD4; +s8 D_8011ADD5; +s32 D_8011ADD8[10]; +s8 D_8011AE00; +s8 D_8011AE01; +s8 D_8011AE02; +s8 D_8011AE03; +u32 *D_8011AE08[16]; +s32 (*D_8011AE48)[8]; // Unknown number of entries. +u8 (*D_8011AE4C)[8]; // Unknown number of entries. +s32 D_8011AE50; +s32 D_8011AE54; +Player **objPtrList; // Not sure about the number of elements +s32 objCount; +s32 D_8011AE60; +s32 D_8011AE64; +s32 *D_8011AE68; +s32 *D_8011AE6C; +s32 D_8011AE70; +s32 *D_8011AE74; +s16 D_8011AE78; +s16 D_8011AE7A; +s16 D_8011AE7C; +s8 D_8011AE7E; +s16 D_8011AE80; +s16 D_8011AE82; +s32 D_8011AE84; +s32 D_8011AE88; +u32 D_8011AE8C; +u32 D_8011AE90; +u32 D_8011AE94; +s32 D_8011AE98[2]; +s32 D_8011AEA0; +s32 D_8011AEA4; +s32 D_8011AEA8[2]; +s32 D_8011AEB0[2]; +s16 *D_8011AEB8; +s32 D_8011AEBC; +s32 D_8011AEC0; +Player **particlePtrList; +s32 particleCount; /* Size: 0x3C bytes */ typedef struct unknown8011AECC { @@ -202,26 +220,31 @@ typedef struct unknown8011AECC { s8 unk3A; s8 unk3B; } unknown8011AECC; -extern unknown8011AECC* D_8011AECC; // Array of structs, unknown number of members - -extern s32 D_8011AED0; -extern s32 D_8011AED4; -extern s16 D_8011AED8; -extern u32 (*D_8011AEDC)[64]; // Not sure about the number of elements -extern s32 D_8011AEE0; -extern Player *(*playerStructArray_Ptr)[8]; -extern s32 *D_8011AEE8; -extern s32 *D_8011AEEC; -extern s32 playerCount; -extern u8 D_8011AEF4; -extern u8 D_8011AEF5; -extern u8 D_8011AEF6; -extern u8 D_8011AEF7; -extern u32 (*D_8011AF04)[64]; // Not sure about the number of elements -extern s32 D_8011AF08[2]; -extern s32 D_8011AF10; -extern s32 D_8011AF60; - +unknown8011AECC* D_8011AECC; // Array of structs, unknown number of members +s32 D_8011AED0; +s32 D_8011AED4; +s16 D_8011AED8; +u32 (*D_8011AEDC)[64]; // Not sure about the number of elements +s32 D_8011AEE0; +Player *(*playerStructArray_Ptr)[8]; +s32 *D_8011AEE8; +s32 *D_8011AEEC; +s32 playerCount; +u8 D_8011AEF4; +u8 D_8011AEF5; +u8 D_8011AEF6; +u8 D_8011AEF7; +s32 D_8011AEF8; +s32 D_8011AEFC; +s32 D_8011AF00; +u32 (*D_8011AF04)[64]; // Not sure about the number of elements +s32 D_8011AF08[2]; +s32 D_8011AF10[2]; +s32 D_8011AF18[5]; +s32 D_8011AF2C; +s32 D_8011AF30[12]; +s32 D_8011AF60[2]; +s32 D_8011AF68[32]; /* Size: 0x40 bytes */ typedef struct unk800179D0 { @@ -234,12 +257,28 @@ typedef struct unk800179D0 { /* Unknown Size */ typedef struct unk800179D0_2 { - unk800179D0* unk0; s32 unk04; } unk800179D0_2; -extern unk800179D0_2 D_8011AFF4; -extern u32* D_8011B020[10]; +s32 D_8011AFE8; +s16 D_8011AFEC; +s16 D_8011AFEE; +s32 D_8011AFF0; +unk800179D0* D_8011AFF4; +s32 D_8011AFF8; +s32 D_8011AFFC; +s32 D_8011B000; +s32 D_8011B004; +s32 D_8011B008; +s32 D_8011B010[4]; +u32* D_8011B020[10]; +s32 D_8011B048[4]; +s32 D_8011B058[4]; +s32 D_8011B068[4]; +s8 D_8011B078[3]; +s8 D_8011B07B; +s32 D_8011B07C; +s32 D_8011B080[7]; extern s16 D_8011D5AC; @@ -329,7 +368,7 @@ void func_8000BF8C(void) { D_8011AEE8 = (s32*)func_80070C9C(0x28, 0xFFFF); D_8011AF04 = (s32*)func_80070C9C(0x200, 0xFFFF); D_8011ADCC = (s32*)func_80070C9C(8, 0xFFFF); - D_8011AFF4.unk0 = (s32*)func_80070C9C(0x400, 0xFFFF); + D_8011AFF4 = (s32*)func_80070C9C(0x400, 0xFFFF); D_8011AEB8 = (s32*)func_80076C58(0x23); D_8011AEBC = (func_80076F30(0x23) >> 1) - 1; while (D_8011AEB8[D_8011AEBC] == 0) { @@ -394,7 +433,7 @@ void func_8000C2D8(u8 *arg0, s32 length) { void func_8000C460(void) { s32 i; - D_8011AD26 = 1; + D_8011AD26[0] = 1; D_8011AD5C = 0; D_8011AD60 = 0; particleCount = 0; @@ -403,7 +442,7 @@ void func_8000C460(void) { D_8011AED4 = 0; playerCount = 0; D_8011AE78 = 0; - D_8011AD21 = 0; + D_8011AD20[1] = 0; D_8011AD22[0] = 0; D_8011AD22[1] = 0; @@ -414,7 +453,7 @@ void func_8000C460(void) { (*D_8011ADCC)[i] = 0; } for (i = 0; i < 0x10; i++) { - D_8011AFF4.unk0[i].unk0 = 0; + D_8011AFF4[i].unk0 = 0; } D_8011AF08[0] = 0xFF; @@ -430,7 +469,7 @@ void func_8000C460(void) { D_8011AD44 = 0; D_8011AEF6 = 0; D_8011AEF7 = 0; - D_8011AF60 = 0; + D_8011AF60[0] = 0; D_8011AE00 = 0; D_8011AE01 = 1; D_8011AD53 = 0; @@ -1103,7 +1142,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80017978.s") u32 func_800179D0(void) { s16 i = 0; while(i < 16) { - unk800179D0* temp = &D_8011AFF4.unk0[i]; + unk800179D0* temp = &D_8011AFF4[i]; if (temp->unk0 != 0) { temp->unk0--; } @@ -1281,7 +1320,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001CC48.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001CD28.s") void func_8001D1AC(void) { - D_8011AF10 = 1; + D_8011AF10[0] = 1; } void func_8001D1BC(s32 arg0) { @@ -1425,7 +1464,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8002125C.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80021400.s") s8 func_800214C4(void) { - return D_8011AD20[3 - D_8011AD21]; + return D_8011AD22[1 - D_8011AD20[1]]; } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800214E4.s") @@ -1515,9 +1554,9 @@ Player* func_8002342C(f32 x, f32 z){ s32 func_80023568(void) { if (D_8011AD3C != 0) { - return D_8011AD25 + 1; + return D_8011AD24[1] + 1; } else if (func_8006BD98() == 8) { - return D_8011AD25 + 1; + return D_8011AD24[1] + 1; } return 0; } diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index efbade6a..012f5af3 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -134,44 +134,128 @@ const char D_800E5E10[] = "TrackGetHeight() - Overflow!!!\n"; /************ .bss ************/ -extern s32 D_8011D37C; -extern s32 D_8011D474; - -extern s32 D_8011B0A0; -extern s32 D_8011B0A4; -extern s32 D_8011B0A8; - -typedef struct{ - Player * unk00; -} unk8011B0B8; - -extern unk8011B0B8 D_8011B0B8; - -extern s32 D_8011B0DC; -extern s32 D_8011B0F0; -extern s32 D_8011B0F4; -extern s32 D_8011B0FC; - -extern f32 D_8011B0E4; -extern f32 D_8011B0E8; -extern f32 D_8011B0EC; +s32 D_8011B0A0; +s32 D_8011B0A4; +s32 D_8011B0A8; +s32 D_8011B0AC; typedef struct{ s16 unk00; s16 unk02; s16 unk04; }unk8011B0B0; - unk8011B0B0 *D_8011B0B0; +s32 D_8011B0B4; +Player *D_8011B0B8; +s32 D_8011B0BC; +s32 D_8011B0C0; +s32 D_8011B0C4; +s32 D_8011B0C8; +s32 D_8011B0CC; +s32 D_8011B0D0; +s32 D_8011B0D4; +s32 D_8011B0D8; +s32 D_8011B0DC; +s8 D_8011B0E0; +s8 D_8011B0E1; +s8 D_8011B0E2; +s8 D_8011B0E3; +f32 D_8011B0E4; +f32 D_8011B0E8; +f32 D_8011B0EC; +s32 D_8011B0F0; +s32 D_8011B0F4; +s32 D_8011B0F8; +s32 D_8011B0FC; +s32 D_8011B100; +s32 D_8011B104; +s32 D_8011B108; +s32 D_8011B10C; +s32 D_8011B110; +s32 D_8011B114; +s32 D_8011B118; +s32 D_8011B11C; +s32 D_8011B120[128]; +s32 D_8011B320[4]; +s32 D_8011B330[960]; +s32 D_8011C230[2]; +s32 D_8011C238[96]; +s32 D_8011C3B8[320]; +s32 D_8011C8B8[512]; +s32 D_8011D0B8; +s32 D_8011D0BC; +s32 D_8011D0C0; +s32 D_8011D0C4; +s32 D_8011D0C8; +s16 D_8011D0CC; +s16 D_8011D0CE; +s32 D_8011D0D0; +s32 D_8011D0D4; +s32 D_8011D0D8; +s32 D_8011D0DC; +s32 D_8011D0E0; +s32 D_8011D0E4; +s32 D_8011D0E8; +s32 D_8011D0EC; +s32 D_8011D0F0; +s32 D_8011D0F4; +s32 D_8011D0F8[12]; +s32 D_8011D128[15]; +s32 D_8011D164; +s32 D_8011D168[84]; +s32 D_8011D2B8[20]; +s32 D_8011D308; +s32 D_8011D30C; +s32 D_8011D310; +s32 D_8011D314; +s32 D_8011D318; +s32 D_8011D31C; +s32 D_8011D320[4]; +s32 D_8011D330[2]; +s32 D_8011D338[4]; +s32 D_8011D348[2]; +s32 D_8011D350[4]; +s32 D_8011D360; +s32 D_8011D364; +s32 D_8011D368; +s32 D_8011D36C; +s32 D_8011D370; +s32 D_8011D374; +s32 D_8011D378; +s32 D_8011D37C; +s32 D_8011D380; +s32 D_8011D384; +s32 D_8011D388[56]; + typedef struct{ s32 unk00; s32 unk04; s32 unk08; }unk8011D468; - unk8011D468 D_8011D468; +s32 D_8011D474; +s32 D_8011D478; +s32 D_8011D47C; +s32 D_8011D480[2]; +s32 D_8011D488[2]; +s32 D_8011D490[2]; +s32 D_8011D498; +s16 D_8011D49C; +s16 D_8011D49E; +s32 D_8011D4A0; +s32 D_8011D4A4; +s32 D_8011D4A8; +s32 D_8011D4AC; +s32 D_8011D4B0; +s16 D_8011D4B4; +s16 D_8011D4B6; +s16 D_8011D4B8; +s16 D_8011D4BA; +s32 D_8011D4BC; + + /******************************/ extern void func_8006F64C(void*, f32, f32, f32, f32*, f32*, f32*); @@ -349,19 +433,19 @@ void func_800289B8(void){ void func_80028C10(void){ unk80120AC0 * v0_some_struct; - if(D_8011B0B8.unk00 == NULL) + if(D_8011B0B8 == NULL) return; v0_some_struct = func_80069D20(); if(D_800DC91C->unk49 == 0){ - D_8011B0B8.unk00->x_position = v0_some_struct->x_position; - D_8011B0B8.unk00->y_position = v0_some_struct->y_position; - D_8011B0B8.unk00->z_position = v0_some_struct->z_position; + D_8011B0B8->x_position = v0_some_struct->x_position; + D_8011B0B8->y_position = v0_some_struct->y_position; + D_8011B0B8->z_position = v0_some_struct->z_position; } func_80068408(&D_8011B0A0, &D_8011B0A4); if(D_8011B0DC){ - func_80012D5C(&D_8011B0A0, &D_8011B0A4, &D_8011B0A8, D_8011B0B8.unk00); + func_80012D5C(&D_8011B0A0, &D_8011B0A4, &D_8011B0A8, D_8011B0B8); } } #if 1 diff --git a/undefined_syms.txt b/undefined_syms.txt index d622687f..ed8ceeeb 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -98,237 +98,243 @@ eqpower = 0x800E37A0; /D_8011AC1C = 0x8011AC1C; /D_8011AC20 = 0x8011AC20; -D_8011AD20 = 0x8011AD20; -D_8011AD21 = 0x8011AD21; -D_8011AD22 = 0x8011AD22; -D_8011AD24 = 0x8011AD24; -D_8011AD25 = 0x8011AD25; -D_8011AD26 = 0x8011AD26; -D_8011AD28 = 0x8011AD28; -D_8011AD30 = 0x8011AD30; -D_8011AD34 = 0x8011AD34; -D_8011AD38 = 0x8011AD38; -D_8011AD3C = 0x8011AD3C; -D_8011AD3D = 0x8011AD3D; -D_8011AD3E = 0x8011AD3E; -D_8011AD40 = 0x8011AD40; -D_8011AD44 = 0x8011AD44; -D_8011AD45 = 0x8011AD45; -D_8011AD46 = 0x8011AD46; -D_8011AD48 = 0x8011AD48; -D_8011AD4A = 0x8011AD4A; -D_8011AD4C = 0x8011AD4C; -D_8011AD4E = 0x8011AD4E; -D_8011AD50 = 0x8011AD50; -D_8011AD51 = 0x8011AD51; -D_8011AD52 = 0x8011AD52; -D_8011AD53 = 0x8011AD53; -D_8011AD58 = 0x8011AD58; -D_8011AD5C = 0x8011AD5C; -D_8011AD60 = 0x8011AD60; -D_8011AD64 = 0x8011AD64; -D_8011AD68 = 0x8011AD68; -D_8011AD6C = 0x8011AD6C; -D_8011AD70 = 0x8011AD70; -D_8011AD78 = 0x8011AD78; -D_8011ADA0 = 0x8011ADA0; -D_8011ADA4 = 0x8011ADA4; -D_8011ADA8 = 0x8011ADA8; -D_8011ADAC = 0x8011ADAC; -D_8011ADB0 = 0x8011ADB0; -D_8011ADB4 = 0x8011ADB4; -D_8011ADB8 = 0x8011ADB8; -D_8011ADBC = 0x8011ADBC; -D_8011ADC0 = 0x8011ADC0; -D_8011ADC4 = 0x8011ADC4; -D_8011ADC5 = 0x8011ADC5; -D_8011ADC8 = 0x8011ADC8; -D_8011ADCC = 0x8011ADCC; -D_8011ADD0 = 0x8011ADD0; -D_8011ADD4 = 0x8011ADD4; -D_8011ADD5 = 0x8011ADD5; -D_8011ADD8 = 0x8011ADD8; -D_8011AE00 = 0x8011AE00; -D_8011AE01 = 0x8011AE01; -D_8011AE02 = 0x8011AE02; -D_8011AE03 = 0x8011AE03; -D_8011AE08 = 0x8011AE08; -D_8011AE48 = 0x8011AE48; -D_8011AE4C = 0x8011AE4C; -D_8011AE50 = 0x8011AE50; -D_8011AE54 = 0x8011AE54; -objPtrList = 0x8011AE58; -objCount = 0x8011AE5C; -D_8011AE60 = 0x8011AE60; -D_8011AE64 = 0x8011AE64; -D_8011AE68 = 0x8011AE68; -D_8011AE6C = 0x8011AE6C; -D_8011AE70 = 0x8011AE70; -D_8011AE74 = 0x8011AE74; -D_8011AE78 = 0x8011AE78; -D_8011AE7A = 0x8011AE7A; -D_8011AE7C = 0x8011AE7C; -D_8011AE7E = 0x8011AE7E; -D_8011AE80 = 0x8011AE80; -D_8011AE82 = 0x8011AE82; -D_8011AE84 = 0x8011AE84; -D_8011AE88 = 0x8011AE88; -D_8011AE8C = 0x8011AE8C; -D_8011AE90 = 0x8011AE90; -D_8011AE94 = 0x8011AE94; -D_8011AE98 = 0x8011AE98; -D_8011AEA0 = 0x8011AEA0; -D_8011AEA4 = 0x8011AEA4; -D_8011AEA8 = 0x8011AEA8; -D_8011AEB0 = 0x8011AEB0; -D_8011AEB8 = 0x8011AEB8; -D_8011AEBC = 0x8011AEBC; -D_8011AEC0 = 0x8011AEC0; -particlePtrList = 0x8011AEC4; -particleCount = 0x8011AEC8; -D_8011AECC = 0x8011AECC; -D_8011AED0 = 0x8011AED0; -D_8011AED4 = 0x8011AED4; -D_8011AED8 = 0x8011AED8; -D_8011AEDC = 0x8011AEDC; -D_8011AEE0 = 0x8011AEE0; -playerStructArray_Ptr = 0x8011AEE4; -D_8011AEE8 = 0x8011AEE8; -D_8011AEEC = 0x8011AEEC; -playerCount = 0x8011AEF0; -D_8011AEF4 = 0x8011AEF4; -D_8011AEF5 = 0x8011AEF5; -D_8011AEF6 = 0x8011AEF6; -D_8011AEF7 = 0x8011AEF7; -D_8011AEF8 = 0x8011AEF8; -D_8011AEFC = 0x8011AEFC; -D_8011AF00 = 0x8011AF00; -D_8011AF04 = 0x8011AF04; -D_8011AF08 = 0x8011AF08; -D_8011AF10 = 0x8011AF10; -D_8011AF18 = 0x8011AF18; -D_8011AF2C = 0x8011AF2C; -D_8011AF30 = 0x8011AF30; -D_8011AF60 = 0x8011AF60; -D_8011AF68 = 0x8011AF68; -D_8011AFE8 = 0x8011AFE8; -D_8011AFEE = 0x8011AFEE; -D_8011AFF4 = 0x8011AFF4; -D_8011AFF8 = 0x8011AFF8; -D_8011AFFC = 0x8011AFFC; -D_8011B000 = 0x8011B000; -D_8011B004 = 0x8011B004; -D_8011B008 = 0x8011B008; -D_8011B010 = 0x8011B010; -D_8011B020 = 0x8011B020; -D_8011B048 = 0x8011B048; -D_8011B058 = 0x8011B058; -D_8011B068 = 0x8011B068; -D_8011B078 = 0x8011B078; -D_8011B07B = 0x8011B07B; -D_8011B0A0 = 0x8011B0A0; -D_8011B0A4 = 0x8011B0A4; -D_8011B0A8 = 0x8011B0A8; -D_8011B0AC = 0x8011B0AC; -D_8011B0B0 = 0x8011B0B0; -D_8011B0B4 = 0x8011B0B4; -D_8011B0B8 = 0x8011B0B8; -D_8011B0BC = 0x8011B0BC; -D_8011B0C0 = 0x8011B0C0; -D_8011B0C4 = 0x8011B0C4; -D_8011B0C8 = 0x8011B0C8; -D_8011B0CC = 0x8011B0CC; -D_8011B0D0 = 0x8011B0D0; -D_8011B0D4 = 0x8011B0D4; -D_8011B0DC = 0x8011B0DC; -D_8011B0E0 = 0x8011B0E0; -D_8011B0E1 = 0x8011B0E1; -D_8011B0E2 = 0x8011B0E2; -D_8011B0E3 = 0x8011B0E3; -D_8011B0E4 = 0x8011B0E4; -D_8011B0E8 = 0x8011B0E8; -D_8011B0EC = 0x8011B0EC; -D_8011B0F0 = 0x8011B0F0; -D_8011B0F4 = 0x8011B0F4; -D_8011B0F8 = 0x8011B0F8; -D_8011B0FC = 0x8011B0FC; -D_8011B100 = 0x8011B100; -D_8011B104 = 0x8011B104; -D_8011B108 = 0x8011B108; -D_8011B10C = 0x8011B10C; -D_8011B110 = 0x8011B110; -D_8011B114 = 0x8011B114; -D_8011B118 = 0x8011B118; -D_8011B120 = 0x8011B120; -D_8011B320 = 0x8011B320; -D_8011B330 = 0x8011B330; -D_8011C230 = 0x8011C230; -D_8011C238 = 0x8011C238; -D_8011C3B8 = 0x8011C3B8; -D_8011C8B8 = 0x8011C8B8; -D_8011D0B8 = 0x8011D0B8; -D_8011D0BC = 0x8011D0BC; -D_8011D0C0 = 0x8011D0C0; -D_8011D0C4 = 0x8011D0C4; -D_8011D0C8 = 0x8011D0C8; -D_8011D0CC = 0x8011D0CC; -D_8011D0CE = 0x8011D0CE; -D_8011D0D0 = 0x8011D0D0; -D_8011D0D4 = 0x8011D0D4; -D_8011D0D8 = 0x8011D0D8; -D_8011D0DC = 0x8011D0DC; -D_8011D0E0 = 0x8011D0E0; -D_8011D0E4 = 0x8011D0E4; -D_8011D0E8 = 0x8011D0E8; -D_8011D0EC = 0x8011D0EC; -D_8011D0F0 = 0x8011D0F0; -D_8011D0F4 = 0x8011D0F4; -D_8011D0F8 = 0x8011D0F8; -D_8011D128 = 0x8011D128; -D_8011D164 = 0x8011D164; -D_8011D2B8 = 0x8011D2B8; -D_8011D308 = 0x8011D308; -D_8011D30C = 0x8011D30C; -D_8011D310 = 0x8011D310; -D_8011D314 = 0x8011D314; -D_8011D318 = 0x8011D318; -D_8011D31C = 0x8011D31C; -D_8011D320 = 0x8011D320; -D_8011D330 = 0x8011D330; -D_8011D338 = 0x8011D338; -D_8011D348 = 0x8011D348; -D_8011D350 = 0x8011D350; -D_8011D360 = 0x8011D360; -D_8011D364 = 0x8011D364; -D_8011D368 = 0x8011D368; -D_8011D36C = 0x8011D36C; -D_8011D370 = 0x8011D370; -D_8011D374 = 0x8011D374; -D_8011D378 = 0x8011D378; -D_8011D37C = 0x8011D37C; -D_8011D380 = 0x8011D380; -D_8011D384 = 0x8011D384; -D_8011D388 = 0x8011D388; -D_8011D468 = 0x8011D468; -D_8011D474 = 0x8011D474; -D_8011D478 = 0x8011D478; -D_8011D47C = 0x8011D47C; -D_8011D480 = 0x8011D480; -D_8011D488 = 0x8011D488; -D_8011D490 = 0x8011D490; -D_8011D498 = 0x8011D498; -D_8011D49C = 0x8011D49C; -D_8011D49E = 0x8011D49E; -D_8011D4A0 = 0x8011D4A0; -D_8011D4A4 = 0x8011D4A4; -D_8011D4A8 = 0x8011D4A8; -D_8011D4AC = 0x8011D4AC; -D_8011D4B0 = 0x8011D4B0; -D_8011D4B4 = 0x8011D4B4; -D_8011D4B6 = 0x8011D4B6; -D_8011D4B8 = 0x8011D4B8; -D_8011D4BA = 0x8011D4BA; -D_8011D4BC = 0x8011D4BC; +/D_8011AD20 = 0x8011AD20; +/D_8011AD21 = 0x8011AD21; +/D_8011AD22 = 0x8011AD22; +/D_8011AD24 = 0x8011AD24; +/D_8011AD25 = 0x8011AD25; +/D_8011AD26 = 0x8011AD26; +/D_8011AD28 = 0x8011AD28; +/D_8011AD30 = 0x8011AD30; +/D_8011AD34 = 0x8011AD34; +/D_8011AD38 = 0x8011AD38; +/D_8011AD3C = 0x8011AD3C; +/D_8011AD3D = 0x8011AD3D; +/D_8011AD3E = 0x8011AD3E; +/D_8011AD40 = 0x8011AD40; +/D_8011AD44 = 0x8011AD44; +/D_8011AD45 = 0x8011AD45; +/D_8011AD46 = 0x8011AD46; +/D_8011AD48 = 0x8011AD48; +/D_8011AD4A = 0x8011AD4A; +/D_8011AD4C = 0x8011AD4C; +/D_8011AD4E = 0x8011AD4E; +/D_8011AD50 = 0x8011AD50; +/D_8011AD51 = 0x8011AD51; +/D_8011AD52 = 0x8011AD52; +/D_8011AD53 = 0x8011AD53; +/D_8011AD58 = 0x8011AD58; +/D_8011AD5C = 0x8011AD5C; +/D_8011AD60 = 0x8011AD60; +/D_8011AD64 = 0x8011AD64; +/D_8011AD68 = 0x8011AD68; +/D_8011AD6C = 0x8011AD6C; +/D_8011AD70 = 0x8011AD70; +/D_8011AD78 = 0x8011AD78; +/D_8011ADA0 = 0x8011ADA0; +/D_8011ADA4 = 0x8011ADA4; +/D_8011ADA8 = 0x8011ADA8; +/D_8011ADAC = 0x8011ADAC; + + +/D_8011ADB0 = 0x8011ADB0; +/D_8011ADB4 = 0x8011ADB4; +/D_8011ADB8 = 0x8011ADB8; +/D_8011ADBC = 0x8011ADBC; +/D_8011ADC0 = 0x8011ADC0; +/D_8011ADC4 = 0x8011ADC4; +/D_8011ADC5 = 0x8011ADC5; +/D_8011ADC8 = 0x8011ADC8; +/D_8011ADCC = 0x8011ADCC; +/D_8011ADD0 = 0x8011ADD0; +/D_8011ADD4 = 0x8011ADD4; +/D_8011ADD5 = 0x8011ADD5; +/D_8011ADD8 = 0x8011ADD8; +/D_8011AE00 = 0x8011AE00; +/D_8011AE01 = 0x8011AE01; +/D_8011AE02 = 0x8011AE02; +/D_8011AE03 = 0x8011AE03; +/D_8011AE08 = 0x8011AE08; +/D_8011AE48 = 0x8011AE48; +/D_8011AE4C = 0x8011AE4C; +/D_8011AE50 = 0x8011AE50; +/D_8011AE54 = 0x8011AE54; +/objPtrList = 0x8011AE58; +/objCount = 0x8011AE5C; +/D_8011AE60 = 0x8011AE60; +/D_8011AE64 = 0x8011AE64; +/D_8011AE68 = 0x8011AE68; +/D_8011AE6C = 0x8011AE6C; +/D_8011AE70 = 0x8011AE70; +/D_8011AE74 = 0x8011AE74; +/D_8011AE78 = 0x8011AE78; +/D_8011AE7A = 0x8011AE7A; +/D_8011AE7C = 0x8011AE7C; +/D_8011AE7E = 0x8011AE7E; +/D_8011AE80 = 0x8011AE80; +/D_8011AE82 = 0x8011AE82; +/D_8011AE84 = 0x8011AE84; +/D_8011AE88 = 0x8011AE88; +/D_8011AE8C = 0x8011AE8C; +/D_8011AE90 = 0x8011AE90; +/D_8011AE94 = 0x8011AE94; +/D_8011AE98 = 0x8011AE98; +/D_8011AEA0 = 0x8011AEA0; +/D_8011AEA4 = 0x8011AEA4; +/D_8011AEA8 = 0x8011AEA8; +/D_8011AEB0 = 0x8011AEB0; +/D_8011AEB8 = 0x8011AEB8; +/D_8011AEBC = 0x8011AEBC; +/D_8011AEC0 = 0x8011AEC0; +/particlePtrList = 0x8011AEC4; +/particleCount = 0x8011AEC8; + +/D_8011AECC = 0x8011AECC; +/D_8011AED0 = 0x8011AED0; +/D_8011AED4 = 0x8011AED4; +/D_8011AED8 = 0x8011AED8; +/D_8011AEDC = 0x8011AEDC; +/D_8011AEE0 = 0x8011AEE0; +/playerStructArray_Ptr = 0x8011AEE4; +/D_8011AEE8 = 0x8011AEE8; +/D_8011AEEC = 0x8011AEEC; +/playerCount = 0x8011AEF0; +/D_8011AEF4 = 0x8011AEF4; +/D_8011AEF5 = 0x8011AEF5; +/D_8011AEF6 = 0x8011AEF6; +/D_8011AEF7 = 0x8011AEF7; +/D_8011AEF8 = 0x8011AEF8; +/D_8011AEFC = 0x8011AEFC; +/D_8011AF00 = 0x8011AF00; +/D_8011AF04 = 0x8011AF04; +/D_8011AF08 = 0x8011AF08; +/D_8011AF10 = 0x8011AF10; +/D_8011AF18 = 0x8011AF18; +/D_8011AF2C = 0x8011AF2C; +/D_8011AF30 = 0x8011AF30; +/D_8011AF60 = 0x8011AF60; +/D_8011AF68 = 0x8011AF68; + +/D_8011AFE8 = 0x8011AFE8; +/D_8011AFEE = 0x8011AFEE; +/D_8011AFF4 = 0x8011AFF4; +/D_8011AFF8 = 0x8011AFF8; +/D_8011AFFC = 0x8011AFFC; +/D_8011B000 = 0x8011B000; +/D_8011B004 = 0x8011B004; +/D_8011B008 = 0x8011B008; +/D_8011B010 = 0x8011B010; +/D_8011B020 = 0x8011B020; +/D_8011B048 = 0x8011B048; +/D_8011B058 = 0x8011B058; +/D_8011B068 = 0x8011B068; +/D_8011B078 = 0x8011B078; +/D_8011B07B = 0x8011B07B; + +/D_8011B0A0 = 0x8011B0A0; +/D_8011B0A4 = 0x8011B0A4; +/D_8011B0A8 = 0x8011B0A8; +/D_8011B0AC = 0x8011B0AC; +/D_8011B0B0 = 0x8011B0B0; +/D_8011B0B4 = 0x8011B0B4; +/D_8011B0B8 = 0x8011B0B8; +/D_8011B0BC = 0x8011B0BC; +/D_8011B0C0 = 0x8011B0C0; +/D_8011B0C4 = 0x8011B0C4; +/D_8011B0C8 = 0x8011B0C8; +/D_8011B0CC = 0x8011B0CC; +/D_8011B0D0 = 0x8011B0D0; +/D_8011B0D4 = 0x8011B0D4; +/D_8011B0DC = 0x8011B0DC; +/D_8011B0E0 = 0x8011B0E0; +/D_8011B0E1 = 0x8011B0E1; +/D_8011B0E2 = 0x8011B0E2; +/D_8011B0E3 = 0x8011B0E3; +/D_8011B0E4 = 0x8011B0E4; +/D_8011B0E8 = 0x8011B0E8; +/D_8011B0EC = 0x8011B0EC; +/D_8011B0F0 = 0x8011B0F0; +/D_8011B0F4 = 0x8011B0F4; +/D_8011B0F8 = 0x8011B0F8; +/D_8011B0FC = 0x8011B0FC; +/D_8011B100 = 0x8011B100; +/D_8011B104 = 0x8011B104; +/D_8011B108 = 0x8011B108; +/D_8011B10C = 0x8011B10C; +/D_8011B110 = 0x8011B110; +/D_8011B114 = 0x8011B114; +/D_8011B118 = 0x8011B118; +/D_8011B120 = 0x8011B120; +/D_8011B320 = 0x8011B320; +/D_8011B330 = 0x8011B330; +/D_8011C230 = 0x8011C230; +/D_8011C238 = 0x8011C238; +/D_8011C3B8 = 0x8011C3B8; +/D_8011C8B8 = 0x8011C8B8; +/D_8011D0B8 = 0x8011D0B8; +/D_8011D0BC = 0x8011D0BC; +/D_8011D0C0 = 0x8011D0C0; +/D_8011D0C4 = 0x8011D0C4; +/D_8011D0C8 = 0x8011D0C8; +/D_8011D0CC = 0x8011D0CC; +/D_8011D0CE = 0x8011D0CE; +/D_8011D0D0 = 0x8011D0D0; +/D_8011D0D4 = 0x8011D0D4; +/D_8011D0D8 = 0x8011D0D8; +/D_8011D0DC = 0x8011D0DC; +/D_8011D0E0 = 0x8011D0E0; +/D_8011D0E4 = 0x8011D0E4; +/D_8011D0E8 = 0x8011D0E8; +/D_8011D0EC = 0x8011D0EC; +/D_8011D0F0 = 0x8011D0F0; +/D_8011D0F4 = 0x8011D0F4; +/D_8011D0F8 = 0x8011D0F8; +/D_8011D128 = 0x8011D128; +/D_8011D164 = 0x8011D164; +/D_8011D2B8 = 0x8011D2B8; +/D_8011D308 = 0x8011D308; +/D_8011D30C = 0x8011D30C; +/D_8011D310 = 0x8011D310; +/D_8011D314 = 0x8011D314; +/D_8011D318 = 0x8011D318; +/D_8011D31C = 0x8011D31C; +/D_8011D320 = 0x8011D320; +/D_8011D330 = 0x8011D330; +/D_8011D338 = 0x8011D338; +/D_8011D348 = 0x8011D348; +/D_8011D350 = 0x8011D350; +/D_8011D360 = 0x8011D360; +/D_8011D364 = 0x8011D364; +/D_8011D368 = 0x8011D368; +/D_8011D36C = 0x8011D36C; +/D_8011D370 = 0x8011D370; +/D_8011D374 = 0x8011D374; +/D_8011D378 = 0x8011D378; +/D_8011D37C = 0x8011D37C; +/D_8011D380 = 0x8011D380; +/D_8011D384 = 0x8011D384; +/D_8011D388 = 0x8011D388; +/D_8011D468 = 0x8011D468; +/D_8011D474 = 0x8011D474; +/D_8011D478 = 0x8011D478; +/D_8011D47C = 0x8011D47C; +/D_8011D480 = 0x8011D480; +/D_8011D488 = 0x8011D488; +/D_8011D490 = 0x8011D490; +/D_8011D498 = 0x8011D498; +/D_8011D49C = 0x8011D49C; +/D_8011D49E = 0x8011D49E; +/D_8011D4A0 = 0x8011D4A0; +/D_8011D4A4 = 0x8011D4A4; +/D_8011D4A8 = 0x8011D4A8; +/D_8011D4AC = 0x8011D4AC; +/D_8011D4B0 = 0x8011D4B0; +/D_8011D4B4 = 0x8011D4B4; +/D_8011D4B6 = 0x8011D4B6; +/D_8011D4B8 = 0x8011D4B8; +/D_8011D4BA = 0x8011D4BA; +/D_8011D4BC = 0x8011D4BC; + D_8011D4C0 = 0x8011D4C0; D_8011D4C4 = 0x8011D4C4; D_8011D4C8 = 0x8011D4C8; From 8b76d36a2cf5d03b62d95317280dc3839ff32fb7 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 19:12:06 -0500 Subject: [PATCH 09/39] Added bss for unknown_032760, unknown_0348C0 --- bss.txt | 10 ---------- src/unknown_032760.c | 9 +++++++++ src/unknown_0348C0.c | 11 ++++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bss.txt b/bss.txt index 9733b080..fb04cfc9 100644 --- a/bss.txt +++ b/bss.txt @@ -14,19 +14,9 @@ unknown_0255E0 unknown_032760 -D_8011D4C0; -D_8011D4C4; -D_8011D4C8; -D_8011D4CC; -D_8011D4D0; unknown_0348C0 -D_8011D4D4; -D_8011D4D8; -D_8011D4DC; -D_8011D4E0; -D_8011D4E2; unknown_043920 diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 41d60444..69d8084c 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -17,6 +17,15 @@ s32 D_800DC968 = 0; // Currently unknown, might be a different type. /*******************************/ +/************ .bss ************/ + +s32 D_8011D4C0; +s32 D_8011D4C4; +s32 D_8011D4C8; +s32 D_8011D4CC; + +/*******************************/ + void func_80031B60(void) { if (D_800DC950 != 0) { func_80071140(D_800DC950); diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index c1cab8ca..f906eab9 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -104,11 +104,12 @@ u16 D_800DCB28[20] = { /************ .bss ************/ -extern f32 D_8011D4D0; -extern s32 D_8011D4D4; -extern s32 D_8011D4D8; -extern s32 D_8011D4DC; -extern s16 D_8011D4E2; +f32 D_8011D4D0; +s32 D_8011D4D4; +s32 D_8011D4D8; +s32 D_8011D4DC; +s16 D_8011D4E0; +s16 D_8011D4E2; /******************************/ From adf30a33235da2bb215f7a8516dc8d4c5679671e Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 19:51:50 -0500 Subject: [PATCH 10/39] Added bss for unknown_043920, _05CEF0, and _05DCD0 --- bss.txt | 68 -------- src/unknown_043920.c | 100 ++++++++--- src/unknown_05CEF0.c | 9 + src/unknown_05DCD0.c | 15 ++ undefined_syms.txt | 388 ------------------------------------------- 5 files changed, 100 insertions(+), 480 deletions(-) diff --git a/bss.txt b/bss.txt index fb04cfc9..8455e0b1 100644 --- a/bss.txt +++ b/bss.txt @@ -20,80 +20,12 @@ unknown_0348C0 unknown_043920 -D_8011D4F0; -D_8011D4F8; -D_8011D504; -D_8011D508; -D_8011D510; -D_8011D528; -D_8011D52C; -D_8011D530; -D_8011D534; -D_8011D538; -D_8011D53C; -D_8011D540; -D_8011D544; -D_8011D548; -D_8011D54C; -D_8011D550; -D_8011D552; -D_8011D553; -D_8011D554; -D_8011D558; -D_8011D55C; -D_8011D560; -D_8011D564; -D_8011D568; -D_8011D56C; -D_8011D570; -D_8011D574; -D_8011D578; -D_8011D57C; -D_8011D580; -D_8011D581; -D_8011D582; -D_8011D583; -D_8011D584; -D_8011D585; -D_8011D586; -D_8011D588; -D_8011D589; -D_8011D58A; -D_8011D58B; -D_8011D58C; -D_8011D58D; -D_8011D58E; -D_8011D58F; -D_8011D590; -D_8011D598; -D_8011D59C; -D_8011D59D; -D_8011D59E; -D_8011D5A0; -D_8011D5A4; -D_8011D5A8; -D_8011D5AC; -D_8011D5AE; -D_8011D5B0; -D_8011D5B4; -D_8011D5B8; -D_8011D5BA; -D_8011D5BB; -D_8011D5BC; unknown_05CEF0 -D_8011D5C0; -D_8011D5C4; -D_8011D5C8; -D_8011D5CC; unknown_05DCD0 -D_8011D5D0; -D_8011D5D1; -D_8011D5E0; -D_8011D5E1; unknown_05F0C0 diff --git a/src/unknown_043920.c b/src/unknown_043920.c index a6853a55..4e70eed4 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -116,19 +116,82 @@ const char D_800E62A0[] = "Back\n"; /************ .bss ************/ -extern s32 D_8011D528; -extern s32 D_8011D55C; -extern s8 D_8011D582; -extern s8 D_8011D583; -extern s8 D_8011D584; -extern s32 D_8011D598; -extern s8 D_8011D59C; -extern s8 D_8011D59D; -extern s16 D_8011D59E; -extern u32 D_8011D590[]; -extern s16 D_8011D5A0[]; -extern s16 D_8011D5A8[]; -extern s16 D_8011D5AC; +s32 D_8011D4F0[2]; +s32 D_8011D4F8[3]; +s32 D_8011D504; +s32 D_8011D508[2]; + +/* Size: 0x18 bytes */ +typedef struct unk8011D510 { + s16 unk0; + s16 unk2; + s16 unk4; + u16 unk6; + f32 unk8; + f32 unkC; + f32 unk10; + f32 unk14; +} unk8011D510; +unk8011D510 D_8011D510; + +s32 D_8011D528; +s32 D_8011D52C; +s32 D_8011D530; +s32 D_8011D534; +s32 D_8011D538; +s32 D_8011D53C; +s32 D_8011D540; +s32 D_8011D544; +s32 D_8011D548; +s32 D_8011D54C; +s16 D_8011D550; +s8 D_8011D552; +s8 D_8011D553; +s32 D_8011D554; +s32 D_8011D558; +s32 D_8011D55C; +s32 D_8011D560; +s32 D_8011D564; +s32 D_8011D568; +s32 D_8011D56C; +s32 D_8011D570; +s32 D_8011D574; +s32 D_8011D578; +s32 D_8011D57C; +s8 D_8011D580; +s8 D_8011D581; +s8 D_8011D582; +s8 D_8011D583; +s8 D_8011D584; +s8 D_8011D585; +s8 D_8011D586; +s8 D_8011D587; +s8 D_8011D588; +s8 D_8011D589; +s8 D_8011D58A; +s8 D_8011D58B; +s8 D_8011D58C; +s8 D_8011D58D; +s8 D_8011D58E; +s8 D_8011D58F; +u32 D_8011D590[2]; +s32 D_8011D598; +s8 D_8011D59C; +s8 D_8011D59D; +s16 D_8011D59E; +s16 D_8011D5A0[2]; +s32 D_8011D5A4; +s16 D_8011D5A8[2]; +s16 D_8011D5AC; +s16 D_8011D5AE; +s32 D_8011D5B0; +s32 D_8011D5B4; +s16 D_8011D5B8; +s8 D_8011D5BA; +s8 D_8011D5BB; +s8 D_8011D5BC; + +/******************************/ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80042D20.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80043ECC.s") @@ -284,17 +347,6 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80052B64.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80052D7C.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80053478.s") -/* Unknown Size */ -typedef struct unk8011D510 { - s16 unk0; - s16 unk2; - s16 unk4; - u16 unk6; - f32 unk8; - f32 unkC; - f32 unk10; - f32 unk14; -} unk8011D510; extern unk8011D510 D_8011D510; diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index d9f998b9..ed3f0e57 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -15,6 +15,15 @@ s16 D_800DCDE0[16] = { /*******************************/ +/************ .bss ************/ + +s32 D_8011D5C0; +s32 D_8011D5C4; +s32 D_8011D5C8; +s32 D_8011D5CC; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C2F0.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C364.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005CA78.s") diff --git a/src/unknown_05DCD0.c b/src/unknown_05DCD0.c index 64c60118..7c10024d 100644 --- a/src/unknown_05DCD0.c +++ b/src/unknown_05DCD0.c @@ -22,6 +22,21 @@ s16 D_800DCE20[16] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D5D0; +s8 D_8011D5D1; + +// These 3 might be a file boundary. +s32 D_8011D5D4; +s32 D_8011D5D8; +s32 D_8011D5DC; + +s8 D_8011D5E0; +s8 D_8011D5E1; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D0D0.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D820.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005E204.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index ed8ceeeb..360b2931 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,394 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/gALHeap = 0x80115CE8; -/ALSeqFile_80115CF8 = 0x80115CF8; -/D_80115CFC = 0x80115CFC; -/D_80115D00 = 0x80115D00; -/D_80115D04 = 0x80115D04; -/D_80115D05 = 0x80115D05; -/musicTempo = 0x80115D08; -/D_80115D0C = 0x80115D0C; -/ALBankFile_80115D10 = 0x80115D10; -/ALBankFile_80115D14 = 0x80115D14; -/D_80115D18 = 0x80115D18; -/D_80115D1C = 0x80115D1C; -/D_80115D20 = 0x80115D20; -/D_80115D24 = 0x80115D24; -/D_80115D28 = 0x80115D28; -/D_80115D2C = 0x80115D2C; -/D_80115D30 = 0x80115D30; -/D_80115D34 = 0x80115D34; -/D_80115D38 = 0x80115D38; -/D_80115D3C = 0x80115D3C; -/D_80115D40 = 0x80115D40; -/D_80115D41 = 0x80115D41; -/D_80115D48 = 0x80115D48; -/D_80115D88 = 0x80115D88; -/D_80115E80 = 0x80115E80; -/D_80115F78 = 0x80115F78; -/D_80115F79 = 0x80115F79; -/D_80115F7C = 0x80115F7C; -/D_80115F80 = 0x80115F80; -/D_80115F84 = 0x80115F84; -/D_80115F88 = 0x80115F88; - -/D_80115F90 = 0x80115F90; -/D_80115F94 = 0x80115F94; -/D_80115F98 = 0x80115F98; -/D_80115FA0 = 0x80115FA0; -/audioThread = 0x80115FB0; -/OSMesgQueue_80116160 = 0x80116160; -/D_80116178 = 0x80116178; -/D_80116198 = 0x80116198; -/D_801161B0 = 0x801161B0; -/ALGlobals_801161D0 = 0x801161D0; -/D_80116220 = 0x80116220; -/D_80119230 = 0x80119230; -/D_80119240 = 0x80119240; -/D_80119628 = 0x80119628; -/D_8011962C = 0x8011962C; -/D_80119630 = 0x80119630; -/D_80119634 = 0x80119634; -/D_80119638 = 0x80119638; -/D_80119640 = 0x80119640; -/D_80119AF0 = 0x80119AF0; -/D_80119B08 = 0x80119B08; -/D_80119C28 = 0x80119C28; - -/D_80119C30 = 0x80119C30; -/D_80119C38 = 0x80119C38; -/D_80119C3C = 0x80119C3C; -/D_80119C40 = 0x80119C40; -/D_80119C44 = 0x80119C44; -/D_80119C48 = 0x80119C48; -/D_80119C4C = 0x80119C4C; -/D_80119C50 = 0x80119C50; -/D_80119C58 = 0x80119C58; -/D_80119C5C = 0x80119C5C; -/D_80119C60 = 0x80119C60; -/D_8011A6D8 = 0x8011A6D8; -/D_8011A6DC = 0x8011A6DC; -/D_8011A6E0 = 0x8011A6E0; -/D_8011AC18 = 0x8011AC18; -/D_8011AC1C = 0x8011AC1C; -/D_8011AC20 = 0x8011AC20; - -/D_8011AD20 = 0x8011AD20; -/D_8011AD21 = 0x8011AD21; -/D_8011AD22 = 0x8011AD22; -/D_8011AD24 = 0x8011AD24; -/D_8011AD25 = 0x8011AD25; -/D_8011AD26 = 0x8011AD26; -/D_8011AD28 = 0x8011AD28; -/D_8011AD30 = 0x8011AD30; -/D_8011AD34 = 0x8011AD34; -/D_8011AD38 = 0x8011AD38; -/D_8011AD3C = 0x8011AD3C; -/D_8011AD3D = 0x8011AD3D; -/D_8011AD3E = 0x8011AD3E; -/D_8011AD40 = 0x8011AD40; -/D_8011AD44 = 0x8011AD44; -/D_8011AD45 = 0x8011AD45; -/D_8011AD46 = 0x8011AD46; -/D_8011AD48 = 0x8011AD48; -/D_8011AD4A = 0x8011AD4A; -/D_8011AD4C = 0x8011AD4C; -/D_8011AD4E = 0x8011AD4E; -/D_8011AD50 = 0x8011AD50; -/D_8011AD51 = 0x8011AD51; -/D_8011AD52 = 0x8011AD52; -/D_8011AD53 = 0x8011AD53; -/D_8011AD58 = 0x8011AD58; -/D_8011AD5C = 0x8011AD5C; -/D_8011AD60 = 0x8011AD60; -/D_8011AD64 = 0x8011AD64; -/D_8011AD68 = 0x8011AD68; -/D_8011AD6C = 0x8011AD6C; -/D_8011AD70 = 0x8011AD70; -/D_8011AD78 = 0x8011AD78; -/D_8011ADA0 = 0x8011ADA0; -/D_8011ADA4 = 0x8011ADA4; -/D_8011ADA8 = 0x8011ADA8; -/D_8011ADAC = 0x8011ADAC; - - -/D_8011ADB0 = 0x8011ADB0; -/D_8011ADB4 = 0x8011ADB4; -/D_8011ADB8 = 0x8011ADB8; -/D_8011ADBC = 0x8011ADBC; -/D_8011ADC0 = 0x8011ADC0; -/D_8011ADC4 = 0x8011ADC4; -/D_8011ADC5 = 0x8011ADC5; -/D_8011ADC8 = 0x8011ADC8; -/D_8011ADCC = 0x8011ADCC; -/D_8011ADD0 = 0x8011ADD0; -/D_8011ADD4 = 0x8011ADD4; -/D_8011ADD5 = 0x8011ADD5; -/D_8011ADD8 = 0x8011ADD8; -/D_8011AE00 = 0x8011AE00; -/D_8011AE01 = 0x8011AE01; -/D_8011AE02 = 0x8011AE02; -/D_8011AE03 = 0x8011AE03; -/D_8011AE08 = 0x8011AE08; -/D_8011AE48 = 0x8011AE48; -/D_8011AE4C = 0x8011AE4C; -/D_8011AE50 = 0x8011AE50; -/D_8011AE54 = 0x8011AE54; -/objPtrList = 0x8011AE58; -/objCount = 0x8011AE5C; -/D_8011AE60 = 0x8011AE60; -/D_8011AE64 = 0x8011AE64; -/D_8011AE68 = 0x8011AE68; -/D_8011AE6C = 0x8011AE6C; -/D_8011AE70 = 0x8011AE70; -/D_8011AE74 = 0x8011AE74; -/D_8011AE78 = 0x8011AE78; -/D_8011AE7A = 0x8011AE7A; -/D_8011AE7C = 0x8011AE7C; -/D_8011AE7E = 0x8011AE7E; -/D_8011AE80 = 0x8011AE80; -/D_8011AE82 = 0x8011AE82; -/D_8011AE84 = 0x8011AE84; -/D_8011AE88 = 0x8011AE88; -/D_8011AE8C = 0x8011AE8C; -/D_8011AE90 = 0x8011AE90; -/D_8011AE94 = 0x8011AE94; -/D_8011AE98 = 0x8011AE98; -/D_8011AEA0 = 0x8011AEA0; -/D_8011AEA4 = 0x8011AEA4; -/D_8011AEA8 = 0x8011AEA8; -/D_8011AEB0 = 0x8011AEB0; -/D_8011AEB8 = 0x8011AEB8; -/D_8011AEBC = 0x8011AEBC; -/D_8011AEC0 = 0x8011AEC0; -/particlePtrList = 0x8011AEC4; -/particleCount = 0x8011AEC8; - -/D_8011AECC = 0x8011AECC; -/D_8011AED0 = 0x8011AED0; -/D_8011AED4 = 0x8011AED4; -/D_8011AED8 = 0x8011AED8; -/D_8011AEDC = 0x8011AEDC; -/D_8011AEE0 = 0x8011AEE0; -/playerStructArray_Ptr = 0x8011AEE4; -/D_8011AEE8 = 0x8011AEE8; -/D_8011AEEC = 0x8011AEEC; -/playerCount = 0x8011AEF0; -/D_8011AEF4 = 0x8011AEF4; -/D_8011AEF5 = 0x8011AEF5; -/D_8011AEF6 = 0x8011AEF6; -/D_8011AEF7 = 0x8011AEF7; -/D_8011AEF8 = 0x8011AEF8; -/D_8011AEFC = 0x8011AEFC; -/D_8011AF00 = 0x8011AF00; -/D_8011AF04 = 0x8011AF04; -/D_8011AF08 = 0x8011AF08; -/D_8011AF10 = 0x8011AF10; -/D_8011AF18 = 0x8011AF18; -/D_8011AF2C = 0x8011AF2C; -/D_8011AF30 = 0x8011AF30; -/D_8011AF60 = 0x8011AF60; -/D_8011AF68 = 0x8011AF68; - -/D_8011AFE8 = 0x8011AFE8; -/D_8011AFEE = 0x8011AFEE; -/D_8011AFF4 = 0x8011AFF4; -/D_8011AFF8 = 0x8011AFF8; -/D_8011AFFC = 0x8011AFFC; -/D_8011B000 = 0x8011B000; -/D_8011B004 = 0x8011B004; -/D_8011B008 = 0x8011B008; -/D_8011B010 = 0x8011B010; -/D_8011B020 = 0x8011B020; -/D_8011B048 = 0x8011B048; -/D_8011B058 = 0x8011B058; -/D_8011B068 = 0x8011B068; -/D_8011B078 = 0x8011B078; -/D_8011B07B = 0x8011B07B; - -/D_8011B0A0 = 0x8011B0A0; -/D_8011B0A4 = 0x8011B0A4; -/D_8011B0A8 = 0x8011B0A8; -/D_8011B0AC = 0x8011B0AC; -/D_8011B0B0 = 0x8011B0B0; -/D_8011B0B4 = 0x8011B0B4; -/D_8011B0B8 = 0x8011B0B8; -/D_8011B0BC = 0x8011B0BC; -/D_8011B0C0 = 0x8011B0C0; -/D_8011B0C4 = 0x8011B0C4; -/D_8011B0C8 = 0x8011B0C8; -/D_8011B0CC = 0x8011B0CC; -/D_8011B0D0 = 0x8011B0D0; -/D_8011B0D4 = 0x8011B0D4; -/D_8011B0DC = 0x8011B0DC; -/D_8011B0E0 = 0x8011B0E0; -/D_8011B0E1 = 0x8011B0E1; -/D_8011B0E2 = 0x8011B0E2; -/D_8011B0E3 = 0x8011B0E3; -/D_8011B0E4 = 0x8011B0E4; -/D_8011B0E8 = 0x8011B0E8; -/D_8011B0EC = 0x8011B0EC; -/D_8011B0F0 = 0x8011B0F0; -/D_8011B0F4 = 0x8011B0F4; -/D_8011B0F8 = 0x8011B0F8; -/D_8011B0FC = 0x8011B0FC; -/D_8011B100 = 0x8011B100; -/D_8011B104 = 0x8011B104; -/D_8011B108 = 0x8011B108; -/D_8011B10C = 0x8011B10C; -/D_8011B110 = 0x8011B110; -/D_8011B114 = 0x8011B114; -/D_8011B118 = 0x8011B118; -/D_8011B120 = 0x8011B120; -/D_8011B320 = 0x8011B320; -/D_8011B330 = 0x8011B330; -/D_8011C230 = 0x8011C230; -/D_8011C238 = 0x8011C238; -/D_8011C3B8 = 0x8011C3B8; -/D_8011C8B8 = 0x8011C8B8; -/D_8011D0B8 = 0x8011D0B8; -/D_8011D0BC = 0x8011D0BC; -/D_8011D0C0 = 0x8011D0C0; -/D_8011D0C4 = 0x8011D0C4; -/D_8011D0C8 = 0x8011D0C8; -/D_8011D0CC = 0x8011D0CC; -/D_8011D0CE = 0x8011D0CE; -/D_8011D0D0 = 0x8011D0D0; -/D_8011D0D4 = 0x8011D0D4; -/D_8011D0D8 = 0x8011D0D8; -/D_8011D0DC = 0x8011D0DC; -/D_8011D0E0 = 0x8011D0E0; -/D_8011D0E4 = 0x8011D0E4; -/D_8011D0E8 = 0x8011D0E8; -/D_8011D0EC = 0x8011D0EC; -/D_8011D0F0 = 0x8011D0F0; -/D_8011D0F4 = 0x8011D0F4; -/D_8011D0F8 = 0x8011D0F8; -/D_8011D128 = 0x8011D128; -/D_8011D164 = 0x8011D164; -/D_8011D2B8 = 0x8011D2B8; -/D_8011D308 = 0x8011D308; -/D_8011D30C = 0x8011D30C; -/D_8011D310 = 0x8011D310; -/D_8011D314 = 0x8011D314; -/D_8011D318 = 0x8011D318; -/D_8011D31C = 0x8011D31C; -/D_8011D320 = 0x8011D320; -/D_8011D330 = 0x8011D330; -/D_8011D338 = 0x8011D338; -/D_8011D348 = 0x8011D348; -/D_8011D350 = 0x8011D350; -/D_8011D360 = 0x8011D360; -/D_8011D364 = 0x8011D364; -/D_8011D368 = 0x8011D368; -/D_8011D36C = 0x8011D36C; -/D_8011D370 = 0x8011D370; -/D_8011D374 = 0x8011D374; -/D_8011D378 = 0x8011D378; -/D_8011D37C = 0x8011D37C; -/D_8011D380 = 0x8011D380; -/D_8011D384 = 0x8011D384; -/D_8011D388 = 0x8011D388; -/D_8011D468 = 0x8011D468; -/D_8011D474 = 0x8011D474; -/D_8011D478 = 0x8011D478; -/D_8011D47C = 0x8011D47C; -/D_8011D480 = 0x8011D480; -/D_8011D488 = 0x8011D488; -/D_8011D490 = 0x8011D490; -/D_8011D498 = 0x8011D498; -/D_8011D49C = 0x8011D49C; -/D_8011D49E = 0x8011D49E; -/D_8011D4A0 = 0x8011D4A0; -/D_8011D4A4 = 0x8011D4A4; -/D_8011D4A8 = 0x8011D4A8; -/D_8011D4AC = 0x8011D4AC; -/D_8011D4B0 = 0x8011D4B0; -/D_8011D4B4 = 0x8011D4B4; -/D_8011D4B6 = 0x8011D4B6; -/D_8011D4B8 = 0x8011D4B8; -/D_8011D4BA = 0x8011D4BA; -/D_8011D4BC = 0x8011D4BC; - -D_8011D4C0 = 0x8011D4C0; -D_8011D4C4 = 0x8011D4C4; -D_8011D4C8 = 0x8011D4C8; -D_8011D4CC = 0x8011D4CC; -D_8011D4D0 = 0x8011D4D0; -D_8011D4D4 = 0x8011D4D4; -D_8011D4D8 = 0x8011D4D8; -D_8011D4DC = 0x8011D4DC; -D_8011D4E0 = 0x8011D4E0; -D_8011D4E2 = 0x8011D4E2; -D_8011D4F0 = 0x8011D4F0; -D_8011D4F8 = 0x8011D4F8; -D_8011D504 = 0x8011D504; -D_8011D508 = 0x8011D508; -D_8011D510 = 0x8011D510; -D_8011D528 = 0x8011D528; -D_8011D52C = 0x8011D52C; -D_8011D530 = 0x8011D530; -D_8011D534 = 0x8011D534; -D_8011D538 = 0x8011D538; -D_8011D53C = 0x8011D53C; -D_8011D540 = 0x8011D540; -D_8011D544 = 0x8011D544; -D_8011D548 = 0x8011D548; -D_8011D54C = 0x8011D54C; -D_8011D550 = 0x8011D550; -D_8011D552 = 0x8011D552; -D_8011D553 = 0x8011D553; -D_8011D554 = 0x8011D554; -D_8011D558 = 0x8011D558; -D_8011D55C = 0x8011D55C; -D_8011D560 = 0x8011D560; -D_8011D564 = 0x8011D564; -D_8011D568 = 0x8011D568; -D_8011D56C = 0x8011D56C; -D_8011D570 = 0x8011D570; -D_8011D574 = 0x8011D574; -D_8011D578 = 0x8011D578; -D_8011D57C = 0x8011D57C; -D_8011D580 = 0x8011D580; -D_8011D581 = 0x8011D581; -D_8011D582 = 0x8011D582; -D_8011D583 = 0x8011D583; -D_8011D584 = 0x8011D584; -D_8011D585 = 0x8011D585; -D_8011D586 = 0x8011D586; -D_8011D588 = 0x8011D588; -D_8011D589 = 0x8011D589; -D_8011D58A = 0x8011D58A; -D_8011D58B = 0x8011D58B; -D_8011D58C = 0x8011D58C; -D_8011D58D = 0x8011D58D; -D_8011D58E = 0x8011D58E; -D_8011D58F = 0x8011D58F; -D_8011D590 = 0x8011D590; -D_8011D598 = 0x8011D598; -D_8011D59C = 0x8011D59C; -D_8011D59D = 0x8011D59D; -D_8011D59E = 0x8011D59E; -D_8011D5A0 = 0x8011D5A0; -D_8011D5A4 = 0x8011D5A4; -D_8011D5A8 = 0x8011D5A8; -D_8011D5AC = 0x8011D5AC; -D_8011D5AE = 0x8011D5AE; -D_8011D5B0 = 0x8011D5B0; -D_8011D5B4 = 0x8011D5B4; -D_8011D5B8 = 0x8011D5B8; -D_8011D5BA = 0x8011D5BA; -D_8011D5BB = 0x8011D5BB; -D_8011D5BC = 0x8011D5BC; -D_8011D5C0 = 0x8011D5C0; -D_8011D5C4 = 0x8011D5C4; -D_8011D5C8 = 0x8011D5C8; -D_8011D5CC = 0x8011D5CC; -D_8011D5D0 = 0x8011D5D0; -D_8011D5D1 = 0x8011D5D1; -D_8011D5E0 = 0x8011D5E0; -D_8011D5E1 = 0x8011D5E1; D_8011D5F0 = 0x8011D5F0; D_8011D5F1 = 0x8011D5F1; D_8011D600 = 0x8011D600; From ac4e5950a2cdf96e746a6b67decc0c2d01e1ee69 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 20:00:10 -0500 Subject: [PATCH 11/39] Added bss for unknown_05F0C0, _05F690, _05FF10, _060450 --- bss.txt | 16 ---------------- src/unknown_05F0C0.c | 7 +++++++ src/unknown_05F690.c | 7 +++++++ src/unknown_05FF10.c | 8 +++++++- src/unknown_060450.c | 15 +++++++++++++++ undefined_syms.txt | 33 +++++++++++++++++---------------- 6 files changed, 53 insertions(+), 33 deletions(-) diff --git a/bss.txt b/bss.txt index 8455e0b1..7ae3dcaf 100644 --- a/bss.txt +++ b/bss.txt @@ -29,25 +29,9 @@ unknown_05DCD0 unknown_05F0C0 -D_8011D5F0; -D_8011D5F1; unknown_05F690 -D_8011D600; -D_8011D601; -D_8011D610; -D_8011D611; -D_8011D620; -D_8011D624; -D_8011D628; -D_8011D62C; -D_8011D630; -D_8011D634; -D_8011D638; -D_8011D63C; -D_8011D640; -D_8011D644; unknown_0667D0 diff --git a/src/unknown_05F0C0.c b/src/unknown_05F0C0.c index 09ce122c..0b6c88f0 100644 --- a/src/unknown_05F0C0.c +++ b/src/unknown_05F0C0.c @@ -15,4 +15,11 @@ s16 D_800DCE40[16] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D5F0; +s8 D_8011D5F1; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F0C0/func_8005E4C0.s") diff --git a/src/unknown_05F690.c b/src/unknown_05F690.c index 89ef6864..4227cda1 100644 --- a/src/unknown_05F690.c +++ b/src/unknown_05F690.c @@ -15,4 +15,11 @@ s16 D_800DCE60[14] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D600; +s8 D_8011D601; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005EA90.s") diff --git a/src/unknown_05FF10.c b/src/unknown_05FF10.c index 27129541..5ff43767 100644 --- a/src/unknown_05FF10.c +++ b/src/unknown_05FF10.c @@ -4,7 +4,6 @@ #include "types.h" #include "macros.h" - /************ .data ************/ s16 D_800DCE80[14] = { @@ -16,4 +15,11 @@ s16 D_800DCE80[14] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D610; +s8 D_8011D611; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F310.s") \ No newline at end of file diff --git a/src/unknown_060450.c b/src/unknown_060450.c index abb9907f..092094ef 100644 --- a/src/unknown_060450.c +++ b/src/unknown_060450.c @@ -22,6 +22,21 @@ const char D_800E6BE0[] = "MOD Error: Tryed to deallocate non-existent model!!\n /*********************************/ +/************ .bss ************/ + +s32 D_8011D620; +s32 D_8011D624; +s32 D_8011D628; +s32 D_8011D62C; +s32 D_8011D630; +s32 D_8011D634; +s32 D_8011D638; +s32 D_8011D63C; +s32 D_8011D640; +s32 D_8011D644; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F850.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F99C.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005FCD0.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index 360b2931..273e949e 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,22 +25,23 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_8011D5F0 = 0x8011D5F0; -D_8011D5F1 = 0x8011D5F1; -D_8011D600 = 0x8011D600; -D_8011D601 = 0x8011D601; -D_8011D610 = 0x8011D610; -D_8011D611 = 0x8011D611; -D_8011D620 = 0x8011D620; -D_8011D624 = 0x8011D624; -D_8011D628 = 0x8011D628; -D_8011D62C = 0x8011D62C; -D_8011D630 = 0x8011D630; -D_8011D634 = 0x8011D634; -D_8011D638 = 0x8011D638; -D_8011D63C = 0x8011D63C; -D_8011D640 = 0x8011D640; -D_8011D644 = 0x8011D644; +/D_8011D5F0 = 0x8011D5F0; +/D_8011D5F1 = 0x8011D5F1; +/D_8011D600 = 0x8011D600; +/D_8011D601 = 0x8011D601; +/D_8011D610 = 0x8011D610; +/D_8011D611 = 0x8011D611; +/D_8011D620 = 0x8011D620; +/D_8011D624 = 0x8011D624; +/D_8011D628 = 0x8011D628; +/D_8011D62C = 0x8011D62C; +/D_8011D630 = 0x8011D630; +/D_8011D634 = 0x8011D634; +/D_8011D638 = 0x8011D638; +/D_8011D63C = 0x8011D63C; +/D_8011D640 = 0x8011D640; +/D_8011D644 = 0x8011D644; + D_8011D750 = 0x8011D750; D_8011D758 = 0x8011D758; D_8011F758 = 0x8011F758; From 03f799630fec3779dca15daacd65a25f4f71e127 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 8 Jun 2021 20:54:32 -0500 Subject: [PATCH 12/39] Added bss for unknown_060450 & unknown_0667D0 --- .../unknown_00BC20/func_8001A8F4.s | 4 +-- .../unknown_043920/func_80059E40.s | 4 +-- .../unknown_080500/func_8009DB3C.s | 10 +++--- .../unknown_09F8F0/func_800A6254.s | 6 ++-- .../unknown_0AEE70/func_800B653C.s | 36 +++++++++---------- bss.txt | 34 +----------------- src/unknown_060450.c | 1 + src/unknown_0667D0.c | 17 +++++---- undefined_syms.txt | 31 +++------------- 9 files changed, 48 insertions(+), 95 deletions(-) diff --git a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s index b4526871..4f113de3 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s @@ -285,7 +285,7 @@ glabel func_8001A8F4 /* 01B91C 8001AD1C A02BAD50 */ sb $t3, %lo(D_8011AD50)($at) /* 01B920 8001AD20 0C00A3E8 */ jal func_80028FA0 /* 01B924 8001AD24 24040001 */ li $a0, 1 -/* 01B928 8001AD28 3C028012 */ lui $v0, %hi(D_80120010) # $v0, 0x8012 +/* 01B928 8001AD28 3C028012 */ lui $v0, %hi(D_8011AD50) # $v0, 0x8012 /* 01B92C 8001AD2C 8042AD50 */ lb $v0, %lo(D_8011AD50)($v0) /* 01B930 8001AD30 00000000 */ nop .L8001AD34: @@ -326,7 +326,7 @@ glabel func_8001A8F4 /* 01B9B0 8001ADB0 00002025 */ move $a0, $zero /* 01B9B4 8001ADB4 0C01BAA4 */ jal get_settings /* 01B9B8 8001ADB8 30508000 */ andi $s0, $v0, 0x8000 -/* 01B9BC 8001ADBC 8C590010 */ lw $t9, %lo(D_80120010)($v0) +/* 01B9BC 8001ADBC 8C590010 */ lw $t9, 0x10($v0) /* 01B9C0 8001ADC0 00408825 */ move $s1, $v0 /* 01B9C4 8001ADC4 00194B40 */ sll $t1, $t9, 0xd /* 01B9C8 8001ADC8 05200002 */ bltz $t1, .L8001ADD4 diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index e9cbcfb6..c07d262b 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -6,10 +6,10 @@ glabel D_800E6938 .text glabel func_80059E40 -/* 05AA40 80059E40 3C058012 */ lui $a1, %hi(D_80120001) # $a1, 0x8012 +/* 05AA40 80059E40 3C058012 */ lui $a1, %hi(D_8011D59C) # $a1, 0x8012 /* 05AA44 80059E44 80A5D59C */ lb $a1, %lo(D_8011D59C)($a1) /* 05AA48 80059E48 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 05AA4C 80059E4C 24A50001 */ addiu $a1, %lo(D_80120001) # addiu $a1, $a1, 1 +/* 05AA4C 80059E4C 24A50001 */ addiu $a1, $a1, 1 /* 05AA50 80059E50 AFBF001C */ sw $ra, 0x1c($sp) /* 05AA54 80059E54 AFB00018 */ sw $s0, 0x18($sp) /* 05AA58 80059E58 30AE0001 */ andi $t6, $a1, 1 diff --git a/asm/non_matchings/unknown_080500/func_8009DB3C.s b/asm/non_matchings/unknown_080500/func_8009DB3C.s index 73fe2f46..41c90d02 100644 --- a/asm/non_matchings/unknown_080500/func_8009DB3C.s +++ b/asm/non_matchings/unknown_080500/func_8009DB3C.s @@ -145,7 +145,7 @@ glabel L8009DC60 /* 09E938 8009DD38 00000000 */ nop /* 09E93C 8009DD3C 3C0F8012 */ lui $t7, %hi(D_80126516) # $t7, 0x8012 /* 09E940 8009DD40 81EF6516 */ lb $t7, %lo(D_80126516)($t7) -/* 09E944 8009DD44 3C028012 */ lui $v0, %hi(D_80120004) # $v0, 0x8012 +/* 09E944 8009DD44 3C028012 */ lui $v0, %hi(D_8012645C) # $v0, 0x8012 /* 09E948 8009DD48 15E0001B */ bnez $t7, .L8009DDB8 /* 09E94C 8009DD4C 8FB80040 */ lw $t8, 0x40($sp) /* 09E950 8009DD50 8042645C */ lb $v0, %lo(D_8012645C)($v0) @@ -244,7 +244,7 @@ glabel L8009DC60 /* 09EAA0 8009DEA0 24180003 */ li $t8, 3 /* 09EAA4 8009DEA4 AFB80044 */ sw $t8, 0x44($sp) .L8009DEA8: -/* 09EAA8 8009DEA8 3C038012 */ lui $v1, %hi(D_80120001) # $v1, 0x8012 +/* 09EAA8 8009DEA8 3C038012 */ lui $v1, %hi(D_801264E2) /* 09EAAC 8009DEAC 806364E2 */ lb $v1, %lo(D_801264E2)($v1) /* 09EAB0 8009DEB0 24010004 */ li $at, 4 /* 09EAB4 8009DEB4 14610002 */ bne $v1, $at, .L8009DEC0 @@ -273,10 +273,10 @@ glabel L8009DEF0 /* 09EB04 8009DF04 10A00005 */ beqz $a1, .L8009DF1C /* 09EB08 8009DF08 00801025 */ move $v0, $a0 .L8009DF0C: -/* 09EB0C 8009DF0C 8C4B0004 */ lw $t3, %lo(D_80120004)($v0) -/* 09EB10 8009DF10 24630001 */ addiu $v1, %lo(D_80120001) # addiu $v1, $v1, 1 +/* 09EB0C 8009DF0C 8C4B0004 */ lw $t3, 4($v0) +/* 09EB10 8009DF10 24630001 */ addiu $v1, $v1, 1 /* 09EB14 8009DF14 1560FFFD */ bnez $t3, .L8009DF0C -/* 09EB18 8009DF18 24420004 */ addiu $v0, %lo(D_80120004) # addiu $v0, $v0, 4 +/* 09EB18 8009DF18 24420004 */ addiu $v0, $v0, 4 .L8009DF1C: /* 09EB1C 8009DF1C 1860001B */ blez $v1, .L8009DF8C /* 09EB20 8009DF20 246CFFFF */ addiu $t4, $v1, -1 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 536068ce..b7450383 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -392,7 +392,7 @@ glabel L800A63D8 /* 0A73EC 800A67EC 46101081 */ sub.s $f2, $f2, $f16 .L800A67F0: /* 0A73F0 800A67F0 8D2C0000 */ lw $t4, ($t1) -/* 0A73F4 800A67F4 3C028012 */ lui $v0, %hi(D_8012004B) # $v0, 0x8012 +/* 0A73F4 800A67F4 3C028012 */ lui $v0, %hi(D_80126D37) # $v0, 0x8012 /* 0A73F8 800A67F8 E58C016C */ swc1 $f12, 0x16c($t4) /* 0A73FC 800A67FC 8D2D0000 */ lw $t5, ($t1) /* 0A7400 800A6800 00000000 */ nop @@ -415,11 +415,11 @@ glabel L800A63D8 /* 0A7440 800A6840 8CF80128 */ lw $t8, 0x128($a3) /* 0A7444 800A6844 00001825 */ move $v1, $zero /* 0A7448 800A6848 AFB80044 */ sw $t8, 0x44($sp) -/* 0A744C 800A684C 8059004B */ lb $t9, %lo(D_8012004B)($v0) +/* 0A744C 800A684C 8059004B */ lb $t9, 0x4B($v0) /* 0A7450 800A6850 27A6003C */ addiu $a2, $sp, 0x3c /* 0A7454 800A6854 1B20000E */ blez $t9, .L800A6890 /* 0A7458 800A6858 8FA40044 */ lw $a0, 0x44($sp) -/* 0A745C 800A685C 8045004B */ lb $a1, %lo(D_8012004B)($v0) +/* 0A745C 800A685C 8045004B */ lb $a1, 0x4B($v0) /* 0A7460 800A6860 00E02025 */ move $a0, $a3 .L800A6864: /* 0A7464 800A6864 8C820128 */ lw $v0, 0x128($a0) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B653C.s b/asm/non_matchings/unknown_0AEE70/func_800B653C.s index 1a0e2d90..517dabe1 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B653C.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B653C.s @@ -63,23 +63,23 @@ glabel func_800B653C /* 0B7210 800B6610 02A02025 */ move $a0, $s5 glabel L800B6614 /* 0B7214 800B6614 3C018012 */ lui $at, %hi(D_80127CB4) # $at, 0x8012 -/* 0B7218 800B6618 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7218 800B6618 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B721C 800B661C 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7220 800B6620 AC207CB4 */ sw $zero, %lo(D_80127CB4)($at) /* 0B7224 800B6624 96440000 */ lhu $a0, ($s2) /* 0B7228 800B6628 00001825 */ move $v1, $zero /* 0B722C 800B662C 1000009D */ b .L800B68A4 -/* 0B7230 800B6630 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7230 800B6630 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B6634 /* 0B7234 800B6634 240F0001 */ li $t7, 1 /* 0B7238 800B6638 3C018012 */ lui $at, %hi(D_80127CB4) # $at, 0x8012 -/* 0B723C 800B663C 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B723C 800B663C 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7240 800B6640 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7244 800B6644 AC2F7CB4 */ sw $t7, %lo(D_80127CB4)($at) /* 0B7248 800B6648 96440000 */ lhu $a0, ($s2) /* 0B724C 800B664C 24030001 */ li $v1, 1 /* 0B7250 800B6650 10000094 */ b .L800B68A4 -/* 0B7254 800B6654 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7254 800B6654 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B6658 /* 0B7258 800B6658 8FD80000 */ lw $t8, ($fp) /* 0B725C 800B665C 92040000 */ lbu $a0, ($s0) @@ -104,13 +104,13 @@ glabel L800B6658 /* 0B72A8 800B66A8 03194025 */ or $t0, $t8, $t9 /* 0B72AC 800B66AC AC680004 */ sw $t0, 4($v1) .L800B66B0: -/* 0B72B0 800B66B0 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B72B0 800B66B0 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B72B4 800B66B4 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B72B8 800B66B8 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B72BC 800B66BC 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B72C0 800B66C0 96440000 */ lhu $a0, ($s2) /* 0B72C4 800B66C4 10000077 */ b .L800B68A4 -/* 0B72C8 800B66C8 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B72C8 800B66C8 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B66CC /* 0B72CC 800B66CC 8FC90000 */ lw $t1, ($fp) /* 0B72D0 800B66D0 92040000 */ lbu $a0, ($s0) @@ -135,13 +135,13 @@ glabel L800B66CC /* 0B731C 800B671C 012B5025 */ or $t2, $t1, $t3 /* 0B7320 800B6720 AC6A0004 */ sw $t2, 4($v1) .L800B6724: -/* 0B7324 800B6724 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7324 800B6724 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7328 800B6728 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B732C 800B672C 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7330 800B6730 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B7334 800B6734 96440000 */ lhu $a0, ($s2) /* 0B7338 800B6738 1000005A */ b .L800B68A4 -/* 0B733C 800B673C 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B733C 800B673C 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B6740 /* 0B7340 800B6740 8FCC0000 */ lw $t4, ($fp) /* 0B7344 800B6744 02A02025 */ move $a0, $s5 @@ -156,7 +156,7 @@ glabel L800B6740 /* 0B7368 800B6768 AFAE0010 */ sw $t6, 0x10($sp) .L800B676C: /* 0B736C 800B676C 92190000 */ lbu $t9, ($s0) -/* 0B7370 800B6770 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7370 800B6770 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7374 800B6774 A6590000 */ sh $t9, ($s2) /* 0B7378 800B6778 92180001 */ lbu $t8, 1($s0) /* 0B737C 800B677C 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 @@ -176,15 +176,15 @@ glabel L800B6740 /* 0B73B4 800B67B4 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B73B8 800B67B8 26100004 */ addiu $s0, $s0, 4 /* 0B73BC 800B67BC 10000039 */ b .L800B68A4 -/* 0B73C0 800B67C0 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B73C0 800B67C0 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B67C4: -/* 0B73C4 800B67C4 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B73C4 800B67C4 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B73C8 800B67C8 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B73CC 800B67CC 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B73D0 800B67D0 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B73D4 800B67D4 96440000 */ lhu $a0, ($s2) /* 0B73D8 800B67D8 10000032 */ b .L800B68A4 -/* 0B73DC 800B67DC 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B73DC 800B67DC 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B67E0: /* 0B73E0 800B67E0 8FD80000 */ lw $t8, ($fp) /* 0B73E4 800B67E4 02A02025 */ move $a0, $s5 @@ -202,17 +202,17 @@ glabel L800B6740 /* 0B7410 800B6810 00000000 */ nop /* 0B7414 800B6814 96440000 */ lhu $a0, ($s2) /* 0B7418 800B6818 96890000 */ lhu $t1, ($s4) -/* 0B741C 800B681C 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B741C 800B681C 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7420 800B6820 A6C40000 */ sh $a0, ($s6) /* 0B7424 800B6824 A6E90000 */ sh $t1, ($s7) /* 0B7428 800B6828 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B742C 800B682C 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7430 800B6830 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B7434 800B6834 1000001B */ b .L800B68A4 -/* 0B7438 800B6838 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7438 800B6838 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B683C: /* 0B743C 800B683C 96440000 */ lhu $a0, ($s2) -/* 0B7440 800B6840 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7440 800B6840 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7444 800B6844 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7448 800B6848 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B744C 800B684C 04810004 */ bgez $a0, .L800B6860 @@ -222,7 +222,7 @@ glabel L800B6740 /* 0B745C 800B685C 2442FFE0 */ addiu $v0, $v0, -0x20 .L800B6860: /* 0B7460 800B6860 14400003 */ bnez $v0, .L800B6870 -/* 0B7464 800B6864 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7464 800B6864 24A5FFF0 */ addiu $a1, $a1, -0x10 /* 0B7468 800B6868 1000000E */ b .L800B68A4 /* 0B746C 800B686C 24130020 */ li $s3, 32 .L800B6870: @@ -234,13 +234,13 @@ glabel L800B6740 .L800B6880: /* 0B7480 800B6880 0C02DA7F */ jal func_800B69FC /* 0B7484 800B6884 02202825 */ move $a1, $s1 -/* 0B7488 800B6888 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7488 800B6888 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B748C 800B688C 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7490 800B6890 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7494 800B6894 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B7498 800B6898 96440000 */ lhu $a0, ($s2) /* 0B749C 800B689C 00409825 */ move $s3, $v0 -/* 0B74A0 800B68A0 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B74A0 800B68A0 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B68A4: /* 0B74A4 800B68A4 10600006 */ beqz $v1, .L800B68C0 /* 0B74A8 800B68A8 2A210020 */ slti $at, $s1, 0x20 diff --git a/bss.txt b/bss.txt index 7ae3dcaf..4d9273df 100644 --- a/bss.txt +++ b/bss.txt @@ -1,63 +1,31 @@ unknown_001050 - unknown_003260 - unknown_005740 - unknown_00BC20 - unknown_0255E0 - unknown_032760 - unknown_0348C0 - unknown_043920 - unknown_05CEF0 - unknown_05DCD0 - unknown_05F0C0 - unknown_05F690 - unknown_0667D0 -D_8011D750; -D_8011D758; -D_8011F758; -D_8011F760; -D_8011F910; -D_8011FFF0; -D_80120001; - - -unknown_080500 -D_80120004; - - -unknown_00BC20 -D_80120010; - - -unknown_09F8F0 -D_8012004B; -D_80120AC0; - unknown_066AA0 +D_80120AC0; D_80120AC4; D_80120AF4; D_80120BD0; diff --git a/src/unknown_060450.c b/src/unknown_060450.c index 092094ef..e73232bf 100644 --- a/src/unknown_060450.c +++ b/src/unknown_060450.c @@ -34,6 +34,7 @@ s32 D_8011D638; s32 D_8011D63C; s32 D_8011D640; s32 D_8011D644; +s32 D_8011D648[66]; /******************************/ diff --git a/src/unknown_0667D0.c b/src/unknown_0667D0.c index 799b38e4..6161e6fb 100644 --- a/src/unknown_0667D0.c +++ b/src/unknown_0667D0.c @@ -3,6 +3,7 @@ #include "types.h" #include "macros.h" +#include "libultra_internal.h" /************ .data ************/ @@ -10,7 +11,7 @@ s16 D_800DD050 = 0; /*******************************/ -extern s32* D_80065D98; +extern s32* D_80065D98; // func_80065D98 is the entry function for thread 1 /************ .rodata ************/ @@ -19,13 +20,17 @@ const char D_800E6ED0[] = "WARNING: Stack overflow/underflow!!!\n"; /*********************************/ - /************ .bss ************/ -extern s32* D_8011D750; -extern s32* D_8011F758; -extern s32* D_8011F760; -extern s32* D_8011F910; +s32 *D_8011D750; // stack pointer for thread 1 +s32 D_8011D754; +s32 D_8011D758[2048]; +s32 *D_8011F758; +s32 D_8011F75C; +OSThread *D_8011F760; // OSThread for thread 1 +s32 D_8011F764; +s32 D_8011F768[106]; +s32 *D_8011F910; /******************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 273e949e..043adce3 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,33 +25,12 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/D_8011D5F0 = 0x8011D5F0; -/D_8011D5F1 = 0x8011D5F1; -/D_8011D600 = 0x8011D600; -/D_8011D601 = 0x8011D601; -/D_8011D610 = 0x8011D610; -/D_8011D611 = 0x8011D611; -/D_8011D620 = 0x8011D620; -/D_8011D624 = 0x8011D624; -/D_8011D628 = 0x8011D628; -/D_8011D62C = 0x8011D62C; -/D_8011D630 = 0x8011D630; -/D_8011D634 = 0x8011D634; -/D_8011D638 = 0x8011D638; -/D_8011D63C = 0x8011D63C; -/D_8011D640 = 0x8011D640; -/D_8011D644 = 0x8011D644; +/D_8011D750 = 0x8011D750; +/D_8011D758 = 0x8011D758; +/D_8011F758 = 0x8011F758; +/D_8011F760 = 0x8011F760; +/D_8011F910 = 0x8011F910; -D_8011D750 = 0x8011D750; -D_8011D758 = 0x8011D758; -D_8011F758 = 0x8011F758; -D_8011F760 = 0x8011F760; -D_8011F910 = 0x8011F910; -D_8011FFF0 = 0x8011FFF0; -D_80120001 = 0x80120001; -D_80120004 = 0x80120004; -D_80120010 = 0x80120010; -D_8012004B = 0x8012004B; D_80120AC0 = 0x80120AC0; D_80120AC4 = 0x80120AC4; D_80120AF4 = 0x80120AF4; From 241727ee03c7a11e8f790f8ddb9c261a71e59e24 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 01:14:31 -0500 Subject: [PATCH 13/39] Added bss for unknown_066AA0 & part of unknown_06B2B0 --- .../unknown_066AA0/func_80065EA0.s | 4 +- .../unknown_066AA0/func_80067D3C.s | 4 +- .../unknown_066AA0/func_80068514.s | 8 +- .../unknown_066AA0/func_80068BF4.s | 4 +- .../unknown_066AA0/func_80069484.s | 4 +- .../unknown_066AA0/func_80069A40.s | 4 +- .../unknown_066AA0/func_8006A10C.s | 4 +- .../unknown_066AA0/func_8006A1C4.s | 12 +-- .../unknown_066AA0/func_8006A434.s | 8 +- .../unknown_066AA0/func_8006A6B0.s | 60 ++++++------- bss.txt | 58 +------------ src/unknown_0667D0.c | 2 +- src/unknown_066AA0.c | 85 +++++++++++-------- src/unknown_06B2B0.c | 51 +++++------ undefined_syms.txt | 61 ------------- 15 files changed, 133 insertions(+), 236 deletions(-) diff --git a/asm/non_matchings/unknown_066AA0/func_80065EA0.s b/asm/non_matchings/unknown_066AA0/func_80065EA0.s index bbd88892..802fbf6c 100644 --- a/asm/non_matchings/unknown_066AA0/func_80065EA0.s +++ b/asm/non_matchings/unknown_066AA0/func_80065EA0.s @@ -96,10 +96,10 @@ glabel func_80065EA0 /* 066BF4 80065FF4 C426709C */ lwc1 $f6, %lo(D_800E709C)($at) /* 066BF8 80065FF8 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 066BFC 80065FFC 44814000 */ mtc1 $at, $f8 -/* 066C00 80066000 3C058012 */ lui $a1, %hi(D_80120D6C) # $a1, 0x8012 +/* 066C00 80066000 3C058012 */ lui $a1, %hi(D_80120D58+20) # $a1, 0x8012 /* 066C04 80066004 3C073FAA */ lui $a3, (0x3FAAAAAB >> 16) # lui $a3, 0x3faa /* 066C08 80066008 34E7AAAB */ ori $a3, (0x3FAAAAAB & 0xFFFF) # ori $a3, $a3, 0xaaab -/* 066C0C 8006600C 24A50D6C */ addiu $a1, %lo(D_80120D6C) # addiu $a1, $a1, 0xd6c +/* 066C0C 8006600C 24A50D6C */ addiu $a1, %lo(D_80120D58+20) # addiu $a1, $a1, 0xd6c /* 066C10 80066010 02002025 */ move $a0, $s0 /* 066C14 80066014 3C064270 */ lui $a2, 0x4270 /* 066C18 80066018 E7A40010 */ swc1 $f4, 0x10($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_80067D3C.s b/asm/non_matchings/unknown_066AA0/func_80067D3C.s index 07431a5c..8166b733 100644 --- a/asm/non_matchings/unknown_066AA0/func_80067D3C.s +++ b/asm/non_matchings/unknown_066AA0/func_80067D3C.s @@ -6,9 +6,9 @@ glabel func_80067D3C /* 06894C 80067D4C 3C0FB400 */ lui $t7, 0xb400 /* 068950 80067D50 246E0008 */ addiu $t6, $v1, 8 /* 068954 80067D54 AC8E0000 */ sw $t6, ($a0) -/* 068958 80067D58 3C188012 */ lui $t8, %hi(D_80120D6C) # $t8, 0x8012 +/* 068958 80067D58 3C188012 */ lui $t8, %hi(D_80120D58+20) # $t8, 0x8012 /* 06895C 80067D5C AC6F0000 */ sw $t7, ($v1) -/* 068960 80067D60 97180D6C */ lhu $t8, %lo(D_80120D6C)($t8) +/* 068960 80067D60 97180D6C */ lhu $t8, %lo(D_80120D58+20)($t8) /* 068964 80067D64 3C068012 */ lui $a2, %hi(D_80120CE4) # $a2, 0x8012 /* 068968 80067D68 AC780004 */ sw $t8, 4($v1) /* 06896C 80067D6C 24C60CE4 */ addiu $a2, %lo(D_80120CE4) # addiu $a2, $a2, 0xce4 diff --git a/asm/non_matchings/unknown_066AA0/func_80068514.s b/asm/non_matchings/unknown_066AA0/func_80068514.s index d35cf94e..9607f8ad 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068514.s +++ b/asm/non_matchings/unknown_066AA0/func_80068514.s @@ -290,12 +290,12 @@ glabel func_80068514 /* 069584 80068984 15E0000D */ bnez $t7, .L800689BC /* 069588 80068988 3C198012 */ lui $t9, %hi(D_80120CE4) # $t9, 0x8012 /* 06958C 8006898C 8F390CE4 */ lw $t9, %lo(D_80120CE4)($t9) -/* 069590 80068990 3C0B8012 */ lui $t3, %hi(D_80120AC4) # $t3, 0x8012 +/* 069590 80068990 3C0B8012 */ lui $t3, %hi(D_80120AC0+4) # $t3, 0x8012 /* 069594 80068994 00195100 */ sll $t2, $t9, 4 /* 069598 80068998 01595021 */ addu $t2, $t2, $t9 /* 06959C 8006899C 000A5080 */ sll $t2, $t2, 2 /* 0695A0 800689A0 016A5821 */ addu $t3, $t3, $t2 -/* 0695A4 800689A4 856B0AC4 */ lh $t3, %lo(D_80120AC4)($t3) +/* 0695A4 800689A4 856B0AC4 */ lh $t3, %lo(D_80120AC0+4)($t3) /* 0695A8 800689A8 860C0004 */ lh $t4, 4($s0) /* 0695AC 800689AC 00000000 */ nop /* 0695B0 800689B0 016C6821 */ addu $t5, $t3, $t4 @@ -304,12 +304,12 @@ glabel func_80068514 .L800689BC: /* 0695BC 800689BC 3C0E8012 */ lui $t6, %hi(D_80120CE4) # $t6, 0x8012 /* 0695C0 800689C0 8DCE0CE4 */ lw $t6, %lo(D_80120CE4)($t6) -/* 0695C4 800689C4 3C0F8012 */ lui $t7, %hi(D_80120BD4) # $t7, 0x8012 +/* 0695C4 800689C4 3C0F8012 */ lui $t7, %hi(D_80120AC0+276) # $t7, 0x8012 /* 0695C8 800689C8 000EC100 */ sll $t8, $t6, 4 /* 0695CC 800689CC 030EC021 */ addu $t8, $t8, $t6 /* 0695D0 800689D0 0018C080 */ sll $t8, $t8, 2 /* 0695D4 800689D4 01F87821 */ addu $t7, $t7, $t8 -/* 0695D8 800689D8 85EF0BD4 */ lh $t7, %lo(D_80120BD4)($t7) +/* 0695D8 800689D8 85EF0BD4 */ lh $t7, %lo(D_80120AC0+276)($t7) /* 0695DC 800689DC 86190004 */ lh $t9, 4($s0) /* 0695E0 800689E0 00000000 */ nop /* 0695E4 800689E4 01F95021 */ addu $t2, $t7, $t9 diff --git a/asm/non_matchings/unknown_066AA0/func_80068BF4.s b/asm/non_matchings/unknown_066AA0/func_80068BF4.s index 1d16b73f..6ce0708b 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068BF4.s +++ b/asm/non_matchings/unknown_066AA0/func_80068BF4.s @@ -72,7 +72,7 @@ glabel func_80068BF4 /* 06990C 80068D0C 25F80001 */ addiu $t8, $t7, 1 /* 069910 80068D10 AE980000 */ sw $t8, ($s4) /* 069914 80068D14 84F90000 */ lh $t9, ($a3) -/* 069918 80068D18 3C0E8012 */ lui $t6, %hi(D_80120AC4) # $t6, 0x8012 +/* 069918 80068D18 3C0E8012 */ lui $t6, %hi(D_80120AC0+4) # $t6, 0x8012 /* 06991C 80068D1C 00194823 */ negu $t1, $t9 /* 069920 80068D20 A6490000 */ sh $t1, ($s2) /* 069924 80068D24 84EA0002 */ lh $t2, 2($a3) @@ -85,7 +85,7 @@ glabel func_80068BF4 /* 069940 80068D40 01AC6821 */ addu $t5, $t5, $t4 /* 069944 80068D44 000D6880 */ sll $t5, $t5, 2 /* 069948 80068D48 01CD7021 */ addu $t6, $t6, $t5 -/* 06994C 80068D4C 85CE0AC4 */ lh $t6, %lo(D_80120AC4)($t6) +/* 06994C 80068D4C 85CE0AC4 */ lh $t6, %lo(D_80120AC0+4)($t6) /* 069950 80068D50 3C198012 */ lui $t9, %hi(D_80120D15) # $t9, 0x8012 /* 069954 80068D54 01CFC021 */ addu $t8, $t6, $t7 /* 069958 80068D58 A6580004 */ sh $t8, 4($s2) diff --git a/asm/non_matchings/unknown_066AA0/func_80069484.s b/asm/non_matchings/unknown_066AA0/func_80069484.s index 1cbe6152..e421c4ac 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069484.s +++ b/asm/non_matchings/unknown_066AA0/func_80069484.s @@ -48,10 +48,10 @@ glabel func_80069484 /* 06A134 80069534 3C088012 */ lui $t0, %hi(D_80120D1C) # $t0, 0x8012 /* 06A138 80069538 25080D1C */ addiu $t0, %lo(D_80120D1C) # addiu $t0, $t0, 0xd1c /* 06A13C 8006953C 8D190000 */ lw $t9, ($t0) -/* 06A140 80069540 3C048012 */ lui $a0, %hi(D_80120D74) # $a0, 0x8012 +/* 06A140 80069540 3C048012 */ lui $a0, %hi(D_80120D70+4) # $a0, 0x8012 /* 06A144 80069544 00195880 */ sll $t3, $t9, 2 /* 06A148 80069548 008B2021 */ addu $a0, $a0, $t3 -/* 06A14C 8006954C 8C840D74 */ lw $a0, %lo(D_80120D74)($a0) +/* 06A14C 8006954C 8C840D74 */ lw $a0, %lo(D_80120D70+4)($a0) /* 06A150 80069550 3C058012 */ lui $a1, %hi(D_80120F20) # $a1, 0x8012 /* 06A154 80069554 3C068012 */ lui $a2, %hi(D_801210A0) # $a2, 0x8012 /* 06A158 80069558 24C610A0 */ addiu $a2, %lo(D_801210A0) # addiu $a2, $a2, 0x10a0 diff --git a/asm/non_matchings/unknown_066AA0/func_80069A40.s b/asm/non_matchings/unknown_066AA0/func_80069A40.s index ca04bd71..8b94d8fa 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069A40.s +++ b/asm/non_matchings/unknown_066AA0/func_80069A40.s @@ -73,9 +73,9 @@ glabel func_80069A40 /* 06A750 80069B50 00194100 */ sll $t0, $t9, 4 /* 06A754 80069B54 01194021 */ addu $t0, $t0, $t9 /* 06A758 80069B58 00084080 */ sll $t0, $t0, 2 -/* 06A75C 80069B5C 3C018012 */ lui $at, %hi(D_80120AF4) # $at, 0x8012 +/* 06A75C 80069B5C 3C018012 */ lui $at, %hi(D_80120AC0+52) # $at, 0x8012 /* 06A760 80069B60 00280821 */ addu $at, $at, $t0 -/* 06A764 80069B64 A4220AF4 */ sh $v0, %lo(D_80120AF4)($at) +/* 06A764 80069B64 A4220AF4 */ sh $v0, %lo(D_80120AC0+52)($at) /* 06A768 80069B68 03E00008 */ jr $ra /* 06A76C 80069B6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/unknown_066AA0/func_8006A10C.s b/asm/non_matchings/unknown_066AA0/func_8006A10C.s index 64615811..0f018759 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A10C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A10C.s @@ -30,8 +30,8 @@ glabel func_8006A10C /* 06AD7C 8006A17C 304E0001 */ andi $t6, $v0, 1 /* 06AD80 8006A180 11C00009 */ beqz $t6, .L8006A1A8 /* 06AD84 8006A184 AC600000 */ sw $zero, ($v1) -/* 06AD88 8006A188 3C0F8012 */ lui $t7, %hi(D_80121103) # $t7, 0x8012 -/* 06AD8C 8006A18C 91EF1103 */ lbu $t7, %lo(D_80121103)($t7) +/* 06AD88 8006A188 3C0F8012 */ lui $t7, %hi(D_80121100+3) # $t7, 0x8012 +/* 06AD8C 8006A18C 91EF1103 */ lbu $t7, %lo(D_80121100+3)($t7) /* 06AD90 8006A190 00000000 */ nop /* 06AD94 8006A194 31F80008 */ andi $t8, $t7, 8 /* 06AD98 8006A198 17000004 */ bnez $t8, .L8006A1AC diff --git a/asm/non_matchings/unknown_066AA0/func_8006A1C4.s b/asm/non_matchings/unknown_066AA0/func_8006A1C4.s index 1f9b2ed8..41925316 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A1C4.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A1C4.s @@ -12,12 +12,12 @@ glabel func_8006A1C4 /* 06ADEC 8006A1EC 0C0322EC */ jal osRecvMesg /* 06ADF0 8006A1F0 00003025 */ move $a2, $zero /* 06ADF4 8006A1F4 1440005D */ bnez $v0, .L8006A36C -/* 06ADF8 8006A1F8 3C068012 */ lui $a2, %hi(D_80121128) # $a2, 0x8012 +/* 06ADF8 8006A1F8 3C068012 */ lui $a2, %hi(D_80121110+24) # $a2, 0x8012 /* 06ADFC 8006A1FC 3C028012 */ lui $v0, %hi(D_80121110) # $v0, 0x8012 -/* 06AE00 8006A200 3C038012 */ lui $v1, %hi(D_80121128) # $v1, 0x8012 -/* 06AE04 8006A204 24631128 */ addiu $v1, %lo(D_80121128) # addiu $v1, $v1, 0x1128 +/* 06AE00 8006A200 3C038012 */ lui $v1, %hi(D_80121110+24) # $v1, 0x8012 +/* 06AE04 8006A204 24631128 */ addiu $v1, %lo(D_80121110+24) # addiu $v1, $v1, 0x1128 /* 06AE08 8006A208 24421110 */ addiu $v0, %lo(D_80121110) # addiu $v0, $v0, 0x1110 -/* 06AE0C 8006A20C 24C61128 */ addiu $a2, %lo(D_80121128) # addiu $a2, $a2, 0x1128 +/* 06AE0C 8006A20C 24C61128 */ addiu $a2, %lo(D_80121110+24) # addiu $a2, $a2, 0x1128 .L8006A210: /* 06AE10 8006A210 88410000 */ lwl $at, ($v0) /* 06AE14 8006A214 98410003 */ lwr $at, 3($v0) @@ -119,7 +119,7 @@ glabel func_8006A1C4 .L8006A36C: /* 06AF6C 8006A36C 3C0A800E */ lui $t2, %hi(D_800DD300) # $t2, 0x800e /* 06AF70 8006A370 3C09800E */ lui $t1, %hi(D_800DD304) # $t1, 0x800e -/* 06AF74 8006A374 3C068012 */ lui $a2, %hi(D_80121128) # $a2, 0x8012 +/* 06AF74 8006A374 3C068012 */ lui $a2, %hi(D_80121110+24) # $a2, 0x8012 /* 06AF78 8006A378 3C028012 */ lui $v0, %hi(D_80121110) # $v0, 0x8012 /* 06AF7C 8006A37C 3C088012 */ lui $t0, %hi(D_80121140) # $t0, 0x8012 /* 06AF80 8006A380 3C078012 */ lui $a3, %hi(D_80121148) # $a3, 0x8012 @@ -130,7 +130,7 @@ glabel func_8006A1C4 /* 06AF94 8006A394 24E71148 */ addiu $a3, %lo(D_80121148) # addiu $a3, $a3, 0x1148 /* 06AF98 8006A398 25081140 */ addiu $t0, %lo(D_80121140) # addiu $t0, $t0, 0x1140 /* 06AF9C 8006A39C 24421110 */ addiu $v0, %lo(D_80121110) # addiu $v0, $v0, 0x1110 -/* 06AFA0 8006A3A0 24C61128 */ addiu $a2, %lo(D_80121128) # addiu $a2, $a2, 0x1128 +/* 06AFA0 8006A3A0 24C61128 */ addiu $a2, %lo(D_80121110+24) # addiu $a2, $a2, 0x1128 .L8006A3A4: /* 06AFA4 8006A3A4 11400002 */ beqz $t2, .L8006A3B0 /* 06AFA8 8006A3A8 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006A434.s b/asm/non_matchings/unknown_066AA0/func_8006A434.s index 89e03eee..ba2fef6a 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A434.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A434.s @@ -1,11 +1,11 @@ glabel func_8006A434 -/* 06B034 8006A434 3C018012 */ lui $at, %hi(D_80121151) # $at, 0x8012 +/* 06B034 8006A434 3C018012 */ lui $at, %hi(D_80121150+1) # $at, 0x8012 /* 06B038 8006A438 240E0001 */ li $t6, 1 /* 06B03C 8006A43C 240F0002 */ li $t7, 2 /* 06B040 8006A440 24180003 */ li $t8, 3 -/* 06B044 8006A444 A0381153 */ sb $t8, %lo(D_80121153)($at) -/* 06B048 8006A448 A02F1152 */ sb $t7, %lo(D_80121152)($at) -/* 06B04C 8006A44C A02E1151 */ sb $t6, %lo(D_80121151)($at) +/* 06B044 8006A444 A0381153 */ sb $t8, %lo(D_80121150+3)($at) +/* 06B048 8006A448 A02F1152 */ sb $t7, %lo(D_80121150+2)($at) +/* 06B04C 8006A44C A02E1151 */ sb $t6, %lo(D_80121150+1)($at) /* 06B050 8006A450 03E00008 */ jr $ra /* 06B054 8006A454 A0201150 */ sb $zero, 0x1150($at) diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s index a2e42e4b..fa2e8561 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s @@ -58,12 +58,12 @@ glabel func_8006A6B0 /* 06B384 8006A784 254A1170 */ addiu $t2, %lo(D_80121170) # addiu $t2, $t2, 0x1170 /* 06B388 8006A788 8FB90044 */ lw $t9, 0x44($sp) /* 06B38C 8006A78C 8D4C0000 */ lw $t4, ($t2) -/* 06B390 8006A790 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B390 8006A790 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B394 8006A794 3C098012 */ lui $t1, %hi(D_80121174) # $t1, 0x8012 /* 06B398 8006A798 3C108012 */ lui $s0, %hi(D_80121168) # $s0, 0x8012 /* 06B39C 8006A79C 26101168 */ addiu $s0, %lo(D_80121168) # addiu $s0, $s0, 0x1168 /* 06B3A0 8006A7A0 25291174 */ addiu $t1, %lo(D_80121174) # addiu $t1, $t1, 0x1174 -/* 06B3A4 8006A7A4 2508117C */ addiu $t0, %lo(D_8012117C) # addiu $t0, $t0, 0x117c +/* 06B3A4 8006A7A4 2508117C */ addiu $t0, %lo(D_80121178+4) # addiu $t0, $t0, 0x117c /* 06B3A8 8006A7A8 240BFFFF */ li $t3, -1 /* 06B3AC 8006A7AC AD020000 */ sw $v0, ($t0) /* 06B3B0 8006A7B0 AD2B0000 */ sw $t3, ($t1) @@ -87,12 +87,12 @@ glabel func_8006A6B0 /* 06B3F4 8006A7F4 8D2F0000 */ lw $t7, ($t1) /* 06B3F8 8006A7F8 80A40000 */ lb $a0, ($a1) /* 06B3FC 8006A7FC 8FA3002C */ lw $v1, 0x2c($sp) -/* 06B400 8006A800 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B400 8006A800 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B404 8006A804 3C0A8012 */ lui $t2, %hi(D_80121170) # $t2, 0x8012 /* 06B408 8006A808 01E4082A */ slt $at, $t7, $a0 /* 06B40C 8006A80C 254A1170 */ addiu $t2, %lo(D_80121170) # addiu $t2, $t2, 0x1170 /* 06B410 8006A810 10200002 */ beqz $at, .L8006A81C -/* 06B414 8006A814 2508117C */ addiu $t0, %lo(D_8012117C) # addiu $t0, $t0, 0x117c +/* 06B414 8006A814 2508117C */ addiu $t0, %lo(D_80121178+4) # addiu $t0, $t0, 0x117c /* 06B418 8006A818 AD240000 */ sw $a0, ($t1) .L8006A81C: /* 06B41C 8006A81C 80A4004C */ lb $a0, 0x4c($a1) @@ -159,10 +159,10 @@ glabel func_8006A6B0 /* 06B508 8006A908 8D2F0000 */ lw $t7, ($t1) /* 06B50C 8006A90C 3C048012 */ lui $a0, %hi(D_80121178) # $a0, 0x8012 /* 06B510 8006A910 24841178 */ addiu $a0, %lo(D_80121178) # addiu $a0, $a0, 0x1178 -/* 06B514 8006A914 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B514 8006A914 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B518 8006A918 3C0A8012 */ lui $t2, %hi(D_80121170) # $t2, 0x8012 /* 06B51C 8006A91C 254A1170 */ addiu $t2, %lo(D_80121170) # addiu $t2, $t2, 0x1170 -/* 06B520 8006A920 2508117C */ addiu $t0, %lo(D_8012117C) # addiu $t0, $t0, 0x117c +/* 06B520 8006A920 2508117C */ addiu $t0, %lo(D_80121178+4) # addiu $t0, $t0, 0x117c /* 06B524 8006A924 AC820000 */ sw $v0, ($a0) /* 06B528 8006A928 19E0000B */ blez $t7, .L8006A958 /* 06B52C 8006A92C 240BFFFF */ li $t3, -1 @@ -349,7 +349,7 @@ glabel func_8006A6B0 .L8006ABC4: /* 06B7C4 8006ABC4 8DCE1170 */ lw $t6, %lo(D_80121170)($t6) -/* 06B7C8 8006ABC8 3C0F8012 */ lui $t7, %hi(D_8012117C) # $t7, 0x8012 +/* 06B7C8 8006ABC8 3C0F8012 */ lui $t7, %hi(D_80121178+4) # $t7, 0x8012 /* 06B7CC 8006ABCC 008E082A */ slt $at, $a0, $t6 /* 06B7D0 8006ABD0 14200003 */ bnez $at, .L8006ABE0 /* 06B7D4 8006ABD4 0004C080 */ sll $t8, $a0, 2 @@ -357,7 +357,7 @@ glabel func_8006A6B0 /* 06B7DC 8006ABDC 24020E10 */ li $v0, 3600 .L8006ABE0: -/* 06B7E0 8006ABE0 8DEF117C */ lw $t7, %lo(D_8012117C)($t7) +/* 06B7E0 8006ABE0 8DEF117C */ lw $t7, %lo(D_80121178+4)($t7) /* 06B7E4 8006ABE4 0304C023 */ subu $t8, $t8, $a0 /* 06B7E8 8006ABE8 0018C040 */ sll $t8, $t8, 1 /* 06B7EC 8006ABEC 01F8C821 */ addu $t9, $t7, $t8 @@ -386,11 +386,11 @@ glabel func_8006A6B0 /* 06B83C 8006AC3C 00000000 */ nop /* 06B840 8006AC40 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B844 8006AC44 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B848 8006AC48 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B848 8006AC48 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B84C 8006AC4C 0082082A */ slt $at, $a0, $v0 /* 06B850 8006AC50 10200073 */ beqz $at, .L8006AE20 /* 06B854 8006AC54 00044880 */ sll $t1, $a0, 2 -/* 06B858 8006AC58 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06B858 8006AC58 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06B85C 8006AC5C 01244823 */ subu $t1, $t1, $a0 /* 06B860 8006AC60 00094840 */ sll $t1, $t1, 1 /* 06B864 8006AC64 01091821 */ addu $v1, $t0, $t1 @@ -413,11 +413,11 @@ glabel func_8006A6B0 /* 06B898 8006AC98 14A20016 */ bne $a1, $v0, .L8006ACF4 /* 06B89C 8006AC9C 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B8A0 8006ACA0 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B8A4 8006ACA4 3C0B8012 */ lui $t3, %hi(D_8012117C) # $t3, 0x8012 +/* 06B8A4 8006ACA4 3C0B8012 */ lui $t3, %hi(D_80121178+4) # $t3, 0x8012 /* 06B8A8 8006ACA8 0082082A */ slt $at, $a0, $v0 /* 06B8AC 8006ACAC 1020005C */ beqz $at, .L8006AE20 /* 06B8B0 8006ACB0 00046080 */ sll $t4, $a0, 2 -/* 06B8B4 8006ACB4 8D6B117C */ lw $t3, %lo(D_8012117C)($t3) +/* 06B8B4 8006ACB4 8D6B117C */ lw $t3, %lo(D_80121178+4)($t3) /* 06B8B8 8006ACB8 01846023 */ subu $t4, $t4, $a0 /* 06B8BC 8006ACBC 000C6040 */ sll $t4, $t4, 1 /* 06B8C0 8006ACC0 016C1821 */ addu $v1, $t3, $t4 @@ -439,11 +439,11 @@ glabel func_8006A6B0 .L8006ACF4: /* 06B8F4 8006ACF4 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B8F8 8006ACF8 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B8FC 8006ACFC 3C0E8012 */ lui $t6, %hi(D_8012117C) # $t6, 0x8012 +/* 06B8FC 8006ACFC 3C0E8012 */ lui $t6, %hi(D_80121178+4) # $t6, 0x8012 /* 06B900 8006AD00 0082082A */ slt $at, $a0, $v0 /* 06B904 8006AD04 10200046 */ beqz $at, .L8006AE20 /* 06B908 8006AD08 00047880 */ sll $t7, $a0, 2 -/* 06B90C 8006AD0C 8DCE117C */ lw $t6, %lo(D_8012117C)($t6) +/* 06B90C 8006AD0C 8DCE117C */ lw $t6, %lo(D_80121178+4)($t6) /* 06B910 8006AD10 01E47823 */ subu $t7, $t7, $a0 /* 06B914 8006AD14 000F7840 */ sll $t7, $t7, 1 /* 06B918 8006AD18 01CF1821 */ addu $v1, $t6, $t7 @@ -470,11 +470,11 @@ glabel func_8006A6B0 /* 06B95C 8006AD5C 14C20017 */ bne $a2, $v0, .L8006ADBC /* 06B960 8006AD60 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B964 8006AD64 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B968 8006AD68 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B968 8006AD68 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B96C 8006AD6C 0082082A */ slt $at, $a0, $v0 /* 06B970 8006AD70 1020002B */ beqz $at, .L8006AE20 /* 06B974 8006AD74 00044880 */ sll $t1, $a0, 2 -/* 06B978 8006AD78 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06B978 8006AD78 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06B97C 8006AD7C 01244823 */ subu $t1, $t1, $a0 /* 06B980 8006AD80 00094840 */ sll $t1, $t1, 1 /* 06B984 8006AD84 01091821 */ addu $v1, $t0, $t1 @@ -497,11 +497,11 @@ glabel func_8006A6B0 .L8006ADBC: /* 06B9BC 8006ADBC 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B9C0 8006ADC0 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B9C4 8006ADC4 3C0C8012 */ lui $t4, %hi(D_8012117C) # $t4, 0x8012 +/* 06B9C4 8006ADC4 3C0C8012 */ lui $t4, %hi(D_80121178+4) # $t4, 0x8012 /* 06B9C8 8006ADC8 0082082A */ slt $at, $a0, $v0 /* 06B9CC 8006ADCC 10200014 */ beqz $at, .L8006AE20 /* 06B9D0 8006ADD0 00046880 */ sll $t5, $a0, 2 -/* 06B9D4 8006ADD4 8D8C117C */ lw $t4, %lo(D_8012117C)($t4) +/* 06B9D4 8006ADD4 8D8C117C */ lw $t4, %lo(D_80121178+4)($t4) /* 06B9D8 8006ADD8 01A46823 */ subu $t5, $t5, $a0 /* 06B9DC 8006ADDC 000D6840 */ sll $t5, $t5, 1 /* 06B9E0 8006ADE0 018D1821 */ addu $v1, $t4, $t5 @@ -548,9 +548,9 @@ glabel func_8006A6B0 /* 06BA68 8006AE68 14C20013 */ bne $a2, $v0, .L8006AEB8 /* 06BA6C 8006AE6C 00000000 */ nop /* 06BA70 8006AE70 04800066 */ bltz $a0, .L8006B00C -/* 06BA74 8006AE74 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06BA74 8006AE74 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06BA78 8006AE78 00044880 */ sll $t1, $a0, 2 -/* 06BA7C 8006AE7C 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06BA7C 8006AE7C 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06BA80 8006AE80 01244823 */ subu $t1, $t1, $a0 /* 06BA84 8006AE84 00094840 */ sll $t1, $t1, 1 /* 06BA88 8006AE88 01091021 */ addu $v0, $t0, $t1 @@ -572,9 +572,9 @@ glabel func_8006A6B0 /* 06BAB8 8006AEB8 14A20013 */ bne $a1, $v0, .L8006AF08 /* 06BABC 8006AEBC 00000000 */ nop /* 06BAC0 8006AEC0 04800052 */ bltz $a0, .L8006B00C -/* 06BAC4 8006AEC4 3C0B8012 */ lui $t3, %hi(D_8012117C) # $t3, 0x8012 +/* 06BAC4 8006AEC4 3C0B8012 */ lui $t3, %hi(D_80121178+4) # $t3, 0x8012 /* 06BAC8 8006AEC8 00046080 */ sll $t4, $a0, 2 -/* 06BACC 8006AECC 8D6B117C */ lw $t3, %lo(D_8012117C)($t3) +/* 06BACC 8006AECC 8D6B117C */ lw $t3, %lo(D_80121178+4)($t3) /* 06BAD0 8006AED0 01846023 */ subu $t4, $t4, $a0 /* 06BAD4 8006AED4 000C6040 */ sll $t4, $t4, 1 /* 06BAD8 8006AED8 016C1021 */ addu $v0, $t3, $t4 @@ -594,9 +594,9 @@ glabel func_8006A6B0 /* 06BB04 8006AF04 2402FFFF */ li $v0, -1 .L8006AF08: /* 06BB08 8006AF08 04800040 */ bltz $a0, .L8006B00C -/* 06BB0C 8006AF0C 3C0E8012 */ lui $t6, %hi(D_8012117C) # $t6, 0x8012 +/* 06BB0C 8006AF0C 3C0E8012 */ lui $t6, %hi(D_80121178+4) # $t6, 0x8012 /* 06BB10 8006AF10 00047880 */ sll $t7, $a0, 2 -/* 06BB14 8006AF14 8DCE117C */ lw $t6, %lo(D_8012117C)($t6) +/* 06BB14 8006AF14 8DCE117C */ lw $t6, %lo(D_80121178+4)($t6) /* 06BB18 8006AF18 01E47823 */ subu $t7, $t7, $a0 /* 06BB1C 8006AF1C 000F7840 */ sll $t7, $t7, 1 /* 06BB20 8006AF20 01CF1021 */ addu $v0, $t6, $t7 @@ -623,9 +623,9 @@ glabel func_8006A6B0 /* 06BB64 8006AF64 14C20014 */ bne $a2, $v0, .L8006AFB8 /* 06BB68 8006AF68 00000000 */ nop /* 06BB6C 8006AF6C 04800027 */ bltz $a0, .L8006B00C -/* 06BB70 8006AF70 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06BB70 8006AF70 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06BB74 8006AF74 00044880 */ sll $t1, $a0, 2 -/* 06BB78 8006AF78 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06BB78 8006AF78 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06BB7C 8006AF7C 01244823 */ subu $t1, $t1, $a0 /* 06BB80 8006AF80 00094840 */ sll $t1, $t1, 1 /* 06BB84 8006AF84 01091021 */ addu $v0, $t0, $t1 @@ -646,9 +646,9 @@ glabel func_8006A6B0 /* 06BBB4 8006AFB4 2402FFFF */ li $v0, -1 .L8006AFB8: /* 06BBB8 8006AFB8 04800014 */ bltz $a0, .L8006B00C -/* 06BBBC 8006AFBC 3C0C8012 */ lui $t4, %hi(D_8012117C) # $t4, 0x8012 +/* 06BBBC 8006AFBC 3C0C8012 */ lui $t4, %hi(D_80121178+4) # $t4, 0x8012 /* 06BBC0 8006AFC0 00046880 */ sll $t5, $a0, 2 -/* 06BBC4 8006AFC4 8D8C117C */ lw $t4, %lo(D_8012117C)($t4) +/* 06BBC4 8006AFC4 8D8C117C */ lw $t4, %lo(D_80121178+4)($t4) /* 06BBC8 8006AFC8 01A46823 */ subu $t5, $t5, $a0 /* 06BBCC 8006AFCC 000D6840 */ sll $t5, $t5, 1 /* 06BBD0 8006AFD0 018D1021 */ addu $v0, $t4, $t5 @@ -700,10 +700,10 @@ glabel func_8006A6B0 /* 06BC64 8006B064 000E2603 */ sra $a0, $t6, 0x18 /* 06BC68 8006B068 18A0000E */ blez $a1, .L8006B0A4 /* 06BC6C 8006B06C 00001825 */ move $v1, $zero -/* 06BC70 8006B070 3C068012 */ lui $a2, %hi(D_8012117C) # $a2, 0x8012 +/* 06BC70 8006B070 3C068012 */ lui $a2, %hi(D_80121178+4) # $a2, 0x8012 /* 06BC74 8006B074 00053880 */ sll $a3, $a1, 2 /* 06BC78 8006B078 00E53823 */ subu $a3, $a3, $a1 -/* 06BC7C 8006B07C 8CC6117C */ lw $a2, %lo(D_8012117C)($a2) +/* 06BC7C 8006B07C 8CC6117C */ lw $a2, %lo(D_80121178+4)($a2) /* 06BC80 8006B080 00073840 */ sll $a3, $a3, 1 /* 06BC84 8006B084 00001025 */ move $v0, $zero .L8006B088: diff --git a/bss.txt b/bss.txt index 4d9273df..d2152b1a 100644 --- a/bss.txt +++ b/bss.txt @@ -25,65 +25,9 @@ unknown_05F690 unknown_0667D0 unknown_066AA0 -D_80120AC0; -D_80120AC4; -D_80120AF4; -D_80120BD0; -D_80120BD4; -D_80120CE0; -D_80120CE4; -D_80120CE8; -D_80120CF0; -D_80120D08; -D_80120D0C; -D_80120D10; -D_80120D14; -D_80120D15; -D_80120D18; -D_80120D1C; -D_80120D20; -D_80120D28; -D_80120D40; -D_80120D58; -D_80120D6C; -D_80120D70; -D_80120D74; -D_80120D88; -D_80120DA0; -D_80120EE0; -D_80120F20; -D_80120F60; -D_80120FA0; -D_80120FE0; -D_80121020; -D_80121060; -D_801210A0; -D_801210E0; -D_801210F8; -D_801210FC; -D_80121100; -D_80121103; -D_80121110; -D_80121128; -D_80121140; -D_80121148; -D_80121150; -D_80121151; -D_80121152; -D_80121153; -D_80121160; -D_80121164; -D_80121168; -D_8012116C; -D_80121170; -D_80121174; -D_80121178; -D_8012117C; -D_80121180; -D_801211C0; - unknown_06B2B0 +D_801211C0; D_801211C8; D_801211F0; D_801211F8; diff --git a/src/unknown_0667D0.c b/src/unknown_0667D0.c index 6161e6fb..efb419ec 100644 --- a/src/unknown_0667D0.c +++ b/src/unknown_0667D0.c @@ -30,7 +30,7 @@ s32 D_8011F75C; OSThread *D_8011F760; // OSThread for thread 1 s32 D_8011F764; s32 D_8011F768[106]; -s32 *D_8011F910; +s32 *D_8011F910[1132]; /******************************/ diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index efec9482..53590b5e 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -145,7 +145,9 @@ s16 D_800DD304 = -1; /*******************************/ -/* Size: 0x44 bytes */ +/************ .bss ************/ + +/* Size: 0x44 bytes, might just be Player? */ typedef struct unk80120AC0 { s16 unk0; s16 unk2; @@ -169,42 +171,53 @@ typedef struct unk80120AC0 { u8 pad3C[8]; } unk80120AC0; -extern unk80120AC0 D_80120AC0[4]; // Unknown number of entries. -extern unk80120AC0 D_80120AFB[4]; // Unknown number of entries. -extern unk80120AC0 D_80120BD0[4]; // Unknown number of entries. -extern s32 D_80120CE0; -extern s32 D_80120CE4; -extern s32 D_80120CE8; -extern s32 D_80120D08; -extern s32 D_80120D0C; -extern f32 D_80120D10; -extern s8 D_80120D14; -extern u8 D_80120D15; -extern s32 D_80120D18; -extern s32 D_80120D1C; -extern s32 D_80120D6C; -extern s32 D_80120D70[6]; -extern s32 D_80120D88[6]; // Unknown number of entries. -extern s32 D_80120EE0; -extern s32 D_80120F20; -extern s32 D_80120F60; -extern s32 D_80120FE0; -extern s32 D_80120FA0; -extern s32 D_80121060; -extern s32 D_801210A0; -extern s32 D_801210E0; +unk80120AC0 D_80120AC0[8]; +s32 D_80120CE0; +s32 D_80120CE4; +s32 D_80120CE8; +s32 D_80120CEC; +s32 D_80120CF0[6]; +s32 D_80120D08; +s32 D_80120D0C; +f32 D_80120D10; +s8 D_80120D14; +u8 D_80120D15; +s32 D_80120D18; +s32 D_80120D1C; +s32 D_80120D20[2]; +s32 D_80120D28[6]; +s32 D_80120D40[6]; +s32 D_80120D58[6]; +s32 D_80120D70[6]; +s32 D_80120D88[6]; +s32 D_80120DA0[80]; +s32 D_80120EE0[16]; +s32 D_80120F20[16]; +s32 D_80120F60[16]; +s32 D_80120FA0[16]; +s32 D_80120FE0[16]; +s32 D_80121020[16]; +s32 D_80121060[16]; +s32 D_801210A0[16]; +s32 D_801210E0[6]; +s32 D_801210F8; +s32 D_801210FC; +u8 D_80121100[16]; -/* Size: 5 bytes */ +/* Size: 6 bytes */ typedef struct unk80121110 { u16 unk0; s8 unk2; s8 unk3; s8 unk4; + s8 unk6; } unk80121110; -extern unk80121110 D_80121110[2]; // Unknown number of entries -extern u16 D_80121140[2]; // Unknown number of entries. -extern u16 D_80121148[2]; // Unknown number of entries. -extern u8 D_80121150[8]; // Unknown number of entries. +unk80121110 D_80121110[8]; +u16 D_80121140[4]; +u16 D_80121148[4]; +u8 D_80121150[16]; + +/******************************/ extern s32 D_A4000000; extern s32 SP_IMEM; @@ -258,13 +271,13 @@ f32 func_800660DC(void) { void func_800660EC(f32 arg0) { if (0.0f < arg0 && arg0 < 90.0f && arg0 != D_80120D10) { D_80120D10 = arg0; - guPerspectiveF(&D_80120EE0, &D_80120D6C, arg0, 1.33333333f, 10.0f, 15000.0f, 1.0f); + guPerspectiveF(&D_80120EE0, &D_80120D58[5], arg0, 1.33333333f, 10.0f, 15000.0f, 1.0f); func_8006F870(&D_80120EE0, &D_80120FE0); } } void func_80066194(void) { - guPerspectiveF(&D_80120EE0, &D_80120D6C, 60.0f, 1.33333333f, 10.0f, 15000.0f, 1.0f); + guPerspectiveF(&D_80120EE0, &D_80120D58[5], 60.0f, 1.33333333f, 10.0f, 15000.0f, 1.0f); func_8006F870(&D_80120EE0, &D_80120FE0); } @@ -809,9 +822,9 @@ unk80120AC0 *func_80069D20(void) { unk80120AC0 *func_80069D7C(void) { if (D_80120D14 != 0) { - return D_80120BD0; + return &D_80120AC0[4]; } - return D_80120AC0; + return &D_80120AC0[0]; } s32* func_80069DA4(void) { @@ -866,7 +879,7 @@ extern s32 D_800DD300; extern s32 D_801210F8; extern s32 D_801210FC; extern s8 D_80121100; -extern u8 D_80121103; +extern u8 D_80121100+3; // Has regalloc & stack issues. s32 func_8006A10C(void) { @@ -877,7 +890,7 @@ s32 func_8006A10C(void) { func_800CCFE0(&D_801210E0); func_8006A434(); D_800DD300 = 0; - if ((sp23 & 1) && !(D_80121103 & 8)) { + if ((sp23 & 1) && !(D_80121100+3 & 8)) { return 0; } D_800DD300 = 1; diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index 3d385a20..ad3eb805 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -113,32 +113,35 @@ s32 D_800DD424[2] = { /*******************************/ - extern s32 D_800DFD94; -extern s32 D_80121164; -extern LevelHeader* D_80121168; +/************ .bss ************/ -extern s32 D_80121170; -extern s32 D_80121174; +s32 D_80121160; +s32 D_80121164; +LevelHeader* D_80121168; +s32 D_8012116C; +s32 D_80121170; +s32 D_80121174; -// Size: 6 bytes -typedef struct unk8012117C { +// Unknown size +typedef struct unk80121178 { s8 unk0; s8 unk1; s8 unk2; s8 pad3[3]; -} unk8012117C; -extern unk8012117C *D_8012117C[2]; // Unknown number of entries +} unk80121178; +unk80121178 *D_80121178[2]; +s32 D_80121180; -extern s32 D_801211C0; -extern s16 D_801211C8[8]; // Unknown number of entries -extern Gfx *D_801211F0[3]; // Unknown number of entries. +extern s32 D_801211C0[2]; +extern s16 D_801211C8[8]; +extern Gfx *D_801211F0[3]; extern Gfx *D_801211F8; extern s32 D_80121208; extern s32 D_80121218; extern s32 D_80121228; -extern s8 D_80121250[16]; // Unknown number of entries +extern s8 D_80121250[16]; extern s32 D_801234E8; extern s32 D_801234EC; extern s32 D_801234F0; @@ -161,6 +164,8 @@ extern u8 D_80123526; extern s32* D_80123548; // This is actually an OSMesgQueue pointer. extern s32 D_80123560; +/******************************/ + void func_800014BC(f32 arg0); s8* func_8001E29C(s32 arg0); s32 func_8006A624(s8 arg0); @@ -184,14 +189,14 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A6B0.s") s32 func_8006B0AC(s32 arg0) { if (arg0 > 0 && arg0 < D_80121170) { - return (*D_8012117C)[arg0].unk2 & 0xF; + return D_80121178[1][arg0].unk2 & 0xF; } return 0; } s32 func_8006B0F8(s32 arg0) { if (arg0 > 0 && arg0 < D_80121170) { - s32 temp = (*D_8012117C)[arg0].unk2; + s32 temp = D_80121178[1][arg0].unk2; if(temp != 0) { return (temp >> 4) & 0xF; } @@ -201,14 +206,14 @@ s32 func_8006B0F8(s32 arg0) { s8 func_8006B14C(s32 arg0) { if (arg0 >= 0 && arg0 < D_80121170) { - return (*D_8012117C)[arg0].unk1; + return D_80121178[1][arg0].unk1; } return -1; } s8 func_8006B190(s32 arg0) { if (arg0 >= 0 && arg0 < D_80121170) { - return (*D_8012117C)[arg0].unk0; + return D_80121178[1][arg0].unk0; } return 0; } @@ -238,9 +243,6 @@ s32 func_8006B240(void) { GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B250.s") #else -extern s32 *D_80121160; -extern s32 D_800DD314; - Settings *get_settings(void); s32 *func_80076C58(s32); LevelHeader *func_80070C9C(s32, s32); @@ -554,7 +556,6 @@ void func_8006BEFC(void) { } } -extern s32 *D_80121160; Settings *get_settings(void); s32 *func_80076C58(s32); @@ -607,18 +608,18 @@ void func_8006BFC8(s8 *arg0) { } temp2 = D_80121160[phi_s0]; temp = D_80121160[phi_s0 + 1] - temp2; - D_801211C0 = func_80070C9C(temp, 0xFFFF00FF, D_80121160); - func_80076E68(0, D_801211C0, temp2, temp); + D_801211C0[0] = func_80070C9C(temp, 0xFFFF00FF, D_80121160); + func_80076E68(0, D_801211C0[0], temp2, temp); func_80071140(D_80121160); } #endif void func_8006C164(void) { - func_80071140(D_801211C0); + func_80071140(D_801211C0[0]); } s32 func_8006C18C(void) { - return D_801211C0; + return D_801211C0[0]; } s8 func_8006C19C(void) { diff --git a/undefined_syms.txt b/undefined_syms.txt index 043adce3..b806f1ac 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,67 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/D_8011D750 = 0x8011D750; -/D_8011D758 = 0x8011D758; -/D_8011F758 = 0x8011F758; -/D_8011F760 = 0x8011F760; -/D_8011F910 = 0x8011F910; - -D_80120AC0 = 0x80120AC0; -D_80120AC4 = 0x80120AC4; -D_80120AF4 = 0x80120AF4; -D_80120BD0 = 0x80120BD0; -D_80120BD4 = 0x80120BD4; -D_80120CE0 = 0x80120CE0; -D_80120CE4 = 0x80120CE4; -D_80120CE8 = 0x80120CE8; -D_80120CF0 = 0x80120CF0; -D_80120D08 = 0x80120D08; -D_80120D0C = 0x80120D0C; -D_80120D10 = 0x80120D10; -D_80120D14 = 0x80120D14; -D_80120D15 = 0x80120D15; -D_80120D18 = 0x80120D18; -D_80120D1C = 0x80120D1C; -D_80120D20 = 0x80120D20; -D_80120D28 = 0x80120D28; -D_80120D40 = 0x80120D40; -D_80120D58 = 0x80120D58; -D_80120D6C = 0x80120D6C; -D_80120D70 = 0x80120D70; -D_80120D74 = 0x80120D74; -D_80120D88 = 0x80120D88; -D_80120DA0 = 0x80120DA0; -D_80120EE0 = 0x80120EE0; -D_80120F20 = 0x80120F20; -D_80120F60 = 0x80120F60; -D_80120FA0 = 0x80120FA0; -D_80120FE0 = 0x80120FE0; -D_80121020 = 0x80121020; -D_80121060 = 0x80121060; -D_801210A0 = 0x801210A0; -D_801210E0 = 0x801210E0; -D_801210F8 = 0x801210F8; -D_801210FC = 0x801210FC; -D_80121100 = 0x80121100; -D_80121103 = 0x80121103; -D_80121110 = 0x80121110; -D_80121128 = 0x80121128; -D_80121140 = 0x80121140; -D_80121148 = 0x80121148; -D_80121150 = 0x80121150; -D_80121151 = 0x80121151; -D_80121152 = 0x80121152; -D_80121153 = 0x80121153; -D_80121160 = 0x80121160; -D_80121164 = 0x80121164; -D_80121168 = 0x80121168; -D_8012116C = 0x8012116C; -D_80121170 = 0x80121170; -D_80121174 = 0x80121174; -D_80121178 = 0x80121178; -D_8012117C = 0x8012117C; -D_80121180 = 0x80121180; D_801211C0 = 0x801211C0; D_801211C8 = 0x801211C8; D_801211F0 = 0x801211F0; From a0827a10c161b946fdf348e42f4a75816fe80b07 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 11:34:09 -0500 Subject: [PATCH 14/39] Added bss for unknown_06B2B0, _071730, _072E50 --- .../unknown_071730/func_80071278.s | 4 +- .../unknown_071730/func_80071478.s | 4 +- .../unknown_071730/func_80071538.s | 4 +- .../unknown_071730/func_8007164C.s | 4 +- .../unknown_071730/func_80071A24.s | 4 +- bss.txt | 68 --------------- src/unknown_06B2B0.c | 85 +++++++++++-------- src/unknown_071730.c | 20 +++-- src/unknown_072E50.c | 14 ++- src/unknown_0777A0.c | 4 + undefined_syms.txt | 66 +------------- 11 files changed, 94 insertions(+), 183 deletions(-) diff --git a/asm/non_matchings/unknown_071730/func_80071278.s b/asm/non_matchings/unknown_071730/func_80071278.s index 8dd66386..33867484 100644 --- a/asm/non_matchings/unknown_071730/func_80071278.s +++ b/asm/non_matchings/unknown_071730/func_80071278.s @@ -4,10 +4,10 @@ glabel func_80071278 /* 071E80 80071280 0C01C57B */ jal func_800715EC /* 071E84 80071284 AFA40020 */ sw $a0, 0x20($sp) /* 071E88 80071288 00027100 */ sll $t6, $v0, 4 -/* 071E8C 8007128C 3C038012 */ lui $v1, %hi(D_80123588) # $v1, 0x8012 +/* 071E8C 8007128C 3C038012 */ lui $v1, %hi(D_80123580+8) # $v1, 0x8012 /* 071E90 80071290 006E1821 */ addu $v1, $v1, $t6 /* 071E94 80071294 8FA40020 */ lw $a0, 0x20($sp) -/* 071E98 80071298 8C633588 */ lw $v1, %lo(D_80123588)($v1) +/* 071E98 80071298 8C633588 */ lw $v1, %lo(D_80123580+8)($v1) /* 071E9C 8007129C AFA20018 */ sw $v0, 0x18($sp) /* 071EA0 800712A0 00002825 */ move $a1, $zero /* 071EA4 800712A4 2407FFFF */ li $a3, -1 diff --git a/asm/non_matchings/unknown_071730/func_80071478.s b/asm/non_matchings/unknown_071730/func_80071478.s index 2fd0193d..db6fb9ea 100644 --- a/asm/non_matchings/unknown_071730/func_80071478.s +++ b/asm/non_matchings/unknown_071730/func_80071478.s @@ -8,9 +8,9 @@ glabel func_80071478 /* 072090 80071490 0C01C57B */ jal func_800715EC /* 072094 80071494 02002025 */ move $a0, $s0 /* 072098 80071498 00027100 */ sll $t6, $v0, 4 -/* 07209C 8007149C 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 +/* 07209C 8007149C 3C048012 */ lui $a0, %hi(D_80123580+8) # $a0, 0x8012 /* 0720A0 800714A0 008E2021 */ addu $a0, $a0, $t6 -/* 0720A4 800714A4 8C843588 */ lw $a0, %lo(D_80123588)($a0) +/* 0720A4 800714A4 8C843588 */ lw $a0, %lo(D_80123580+8)($a0) /* 0720A8 800714A8 00001825 */ move $v1, $zero /* 0720AC 800714AC 2409FFFF */ li $t1, -1 /* 0720B0 800714B0 24080004 */ li $t0, 4 diff --git a/asm/non_matchings/unknown_071730/func_80071538.s b/asm/non_matchings/unknown_071730/func_80071538.s index a5e2e0d1..ac75cf2b 100644 --- a/asm/non_matchings/unknown_071730/func_80071538.s +++ b/asm/non_matchings/unknown_071730/func_80071538.s @@ -7,10 +7,10 @@ glabel func_80071538 /* 07214C 8007154C 0C01C57B */ jal func_800715EC /* 072150 80071550 AFA20018 */ sw $v0, 0x18($sp) /* 072154 80071554 00027100 */ sll $t6, $v0, 4 -/* 072158 80071558 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 +/* 072158 80071558 3C048012 */ lui $a0, %hi(D_80123580+8) # $a0, 0x8012 /* 07215C 8007155C 008E2021 */ addu $a0, $a0, $t6 /* 072160 80071560 8FA70028 */ lw $a3, 0x28($sp) -/* 072164 80071564 8C843588 */ lw $a0, %lo(D_80123588)($a0) +/* 072164 80071564 8C843588 */ lw $a0, %lo(D_80123580+8)($a0) /* 072168 80071568 00001825 */ move $v1, $zero /* 07216C 8007156C 2406FFFF */ li $a2, -1 /* 072170 80071570 24050014 */ li $a1, 20 diff --git a/asm/non_matchings/unknown_071730/func_8007164C.s b/asm/non_matchings/unknown_071730/func_8007164C.s index e3b1ba33..30aa83a6 100644 --- a/asm/non_matchings/unknown_071730/func_8007164C.s +++ b/asm/non_matchings/unknown_071730/func_8007164C.s @@ -79,9 +79,9 @@ glabel func_8007164C /* 072370 80071770 00000000 */ nop /* 072374 80071774 00047100 */ sll $t6, $a0, 4 -/* 072378 80071778 3C028012 */ lui $v0, %hi(D_80123588) # $v0, 0x8012 +/* 072378 80071778 3C028012 */ lui $v0, %hi(D_80123580+8) # $v0, 0x8012 /* 07237C 8007177C 004E1021 */ addu $v0, $v0, $t6 -/* 072380 80071780 8C423588 */ lw $v0, %lo(D_80123588)($v0) +/* 072380 80071780 8C423588 */ lw $v0, %lo(D_80123580+8)($v0) /* 072384 80071784 03E00008 */ jr $ra /* 072388 80071788 00000000 */ nop diff --git a/asm/non_matchings/unknown_071730/func_80071A24.s b/asm/non_matchings/unknown_071730/func_80071A24.s index a7042aa7..3db3c795 100644 --- a/asm/non_matchings/unknown_071730/func_80071A24.s +++ b/asm/non_matchings/unknown_071730/func_80071A24.s @@ -26,8 +26,8 @@ glabel D_800E7584 .text glabel func_80071A24 -/* 072624 80071A24 3C028012 */ lui $v0, %hi(D_80123588) # $v0, 0x8012 -/* 072628 80071A28 8C423588 */ lw $v0, %lo(D_80123588)($v0) +/* 072624 80071A24 3C028012 */ lui $v0, %hi(D_80123580+8) # $v0, 0x8012 +/* 072628 80071A28 8C423588 */ lw $v0, %lo(D_80123580+8)($v0) /* 07262C 80071A2C 00001825 */ move $v1, $zero /* 072630 80071A30 00002825 */ move $a1, $zero /* 072634 80071A34 24060640 */ li $a2, 1600 diff --git a/bss.txt b/bss.txt index d2152b1a..b88d4b4b 100644 --- a/bss.txt +++ b/bss.txt @@ -27,78 +27,10 @@ unknown_0667D0 unknown_066AA0 unknown_06B2B0 -D_801211C0; -D_801211C8; -D_801211F0; -D_801211F8; -D_80121200; -D_80121204; -D_80121208; -D_80121210; -D_80121214; -D_80121218; -D_80121220; -D_80121224; -D_80121228; -D_80121250; -D_80121260; -D_801234E8; -D_801234EC; -D_801234F0; -D_801234F4; -D_801234F8; -D_801234FC; -D_80123500; -D_80123504; -D_80123508; -D_8012350C; -gSettingsPtr; -D_80123514; -gIsPaused; -D_80123516; -D_80123518; -D_8012351C; -D_80123520; -D_80123524; -D_80123525; -D_80123526; -D_80123528; -D_8012352C; -D_80123530; -D_80123534; -D_80123538; -D_80123544; -D_80123548; -D_80123560; - unknown_071730 -D_80123580; -D_80123588; -D_801235C0; -D_801235C8; -D_80123DC8; -D_80123DCC; -D_80123DD0; -D_80123ED0; -D_80123FD0; -D_80123FF0; - unknown_072E50 -D_80124010; -D_80124018; -D_801241B8; -D_801241E0; -D_801241E4; -D_801241E5; -D_801241E6; -D_801241E7; -D_801241E8; -D_801241EC; -D_801241F0; -D_801241F4; - unknown_0777A0 D_80124200; diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index ad3eb805..51289d43 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -132,37 +132,54 @@ typedef struct unk80121178 { s8 pad3[3]; } unk80121178; unk80121178 *D_80121178[2]; -s32 D_80121180; +s32 D_80121180[16]; -extern s32 D_801211C0[2]; -extern s16 D_801211C8[8]; -extern Gfx *D_801211F0[3]; -extern Gfx *D_801211F8; -extern s32 D_80121208; -extern s32 D_80121218; -extern s32 D_80121228; -extern s8 D_80121250[16]; -extern s32 D_801234E8; -extern s32 D_801234EC; -extern s32 D_801234F0; -extern s32 D_801234F4; -extern s32 D_801234F8; -extern s32 D_801234FC; -extern s32 D_80123500; -extern s32 D_80123504; -extern s32 D_80123508; -extern Settings *gSettingsPtr; -extern s8 D_80123514; -extern s8 gIsPaused; -extern s8 D_80123516; -extern s32 D_80123518; -extern s32 D_8012351C; -extern s32 D_80123520; -extern u8 D_80123524; -extern u8 D_80123525; -extern u8 D_80123526; -extern s32* D_80123548; // This is actually an OSMesgQueue pointer. -extern s32 D_80123560; +s32 D_801211C0[2]; +s16 D_801211C8[20]; +Gfx *D_801211F0[2]; +Gfx *D_801211F8; +s32 D_801211FC; +s32 D_80121200; +s32 D_80121204; +s32 D_80121208[2]; +s32 D_80121210; +s32 D_80121214; +s32 D_80121218[2]; +s32 D_80121220; +s32 D_80121224; +s32 D_80121228[10]; +s8 D_80121250[16]; +s32 D_80121260[2210]; +s32 D_801234E8; +s32 D_801234EC; +s32 D_801234F0; +s32 D_801234F4; +s32 D_801234F8; +s32 D_801234FC; +s32 D_80123500; +s32 D_80123504; +s32 D_80123508; +s32 D_8012350C; +Settings *gSettingsPtr; +s8 D_80123514; +s8 gIsPaused; +s8 D_80123516; +s32 D_80123518; +s32 D_8012351C; +s32 D_80123520; +u8 D_80123524; +u8 D_80123525; +u8 D_80123526; +s32 D_80123528; +s32 D_8012352C; +s32 D_80123530; +s32 D_80123534; +s32 D_80123538[3]; +s32 D_80123544; +s32* D_80123548; // This is actually an OSMesgQueue pointer. +s32 D_8012354C; +s32 D_80123550[4]; +s32 D_80123560[8]; /******************************/ @@ -755,7 +772,7 @@ void func_8006C3E0(void) { func_800C7350(); osCreateMesgQueue(&D_80123548, &D_80123544, 1); osScAddClient(&D_80121260, &D_80123538, &D_80123548, 3); - D_80123560 = 0; + D_80123560[0] = 0; D_80123504 = 0; D_80123508 = 0; D_801234E8 = 0; @@ -1057,10 +1074,10 @@ s8 func_8006EAB0(void) { } s32 func_8006EAC0(void) { - if (D_80123560 == 0) { - D_80123560 = (s32) ((osRecvMesg(&D_80123548, NULL, 0) + 1) != 0); + if (D_80123560[0] == 0) { + D_80123560[0] = (s32) ((osRecvMesg(&D_80123548, NULL, 0) + 1) != 0); } - return D_80123560; + return D_80123560[0]; } s32 func_8006EB14(void) { diff --git a/src/unknown_071730.c b/src/unknown_071730.c index f09575b6..300d4157 100644 --- a/src/unknown_071730.c +++ b/src/unknown_071730.c @@ -32,6 +32,8 @@ const char D_800E751C[] = "ORANGE %d\n\n"; /*********************************/ +/************ .bss ************/ + /* Size: 0x8 bytes */ typedef struct unk80070BE4_8_0 { s16 unk0; @@ -58,13 +60,14 @@ typedef struct unk80070BE4 { s32 size; } unk80070BE4; -extern unk80070BE4 D_80123580[12]; // unknown number of entries +unk80070BE4 D_80123580[4]; #ifndef _ALIGN16 #define _ALIGN16(val) ((val) & 0xFFFFFFF0) + 0x10 #endif -extern s32 D_801235C0; +s32 D_801235C0; +s32 D_801235C4; /* Size: 0x8 bytes */ typedef struct unk801235C8 { @@ -73,12 +76,19 @@ typedef struct unk801235C8 { u8 pad5[3]; } unk801235C8; -extern unk801235C8 D_801235C8[8]; +unk801235C8 D_801235C8[256]; + +s32 D_80123DC8; +s32 D_80123DCC; +s32 D_80123DD0[64]; +s32 D_80123ED0[64]; +s32 D_80123FD0[8]; +s32 D_80123FF0[8]; -extern s32 D_80123DC8; -extern s32 D_80123DCC; extern unk80070BE4_8 D_8012D3F0; +/******************************/ + /* Unknown size */ typedef struct unk800B7D10 { u8 pad0[0x14]; diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 5fbdc27f..196556db 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -53,7 +53,19 @@ const char D_800E7750[] = "warning: corrupt ghost\n"; /************ .bss ************/ -extern s32 D_80124010; +s32 D_80124010; +s32 D_80124014; +s32 D_80124018[104]; +s32 D_801241B8[10]; +s32 D_801241E0; +s8 D_801241E4; +s8 D_801241E5; +s8 D_801241E6; +s8 D_801241E7; +s32 D_801241E8; +s32 D_801241EC; +s32 D_801241F0; +s32 D_801241F4; /*******************************/ diff --git a/src/unknown_0777A0.c b/src/unknown_0777A0.c index 0f0372b2..7b4301a8 100644 --- a/src/unknown_0777A0.c +++ b/src/unknown_0777A0.c @@ -4,6 +4,8 @@ #include "types.h" #include "macros.h" +/************ .bss ************/ + extern s32 *D_80124200; extern s32 D_80124218; extern s32 D_80124220; @@ -11,6 +13,8 @@ extern s32 D_80124238; extern s32 D_80124278; extern s32 *D_80124290; +/*******************************/ + // These are both defined in the generated dkr.ld file. extern u8 __ASSETS_LUT_START, __ASSETS_LUT_END; // __ASSETS_LUT_START = 0xECB60, _END = 0xECC30 diff --git a/undefined_syms.txt b/undefined_syms.txt index b806f1ac..70093605 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,77 +25,13 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_801211C0 = 0x801211C0; -D_801211C8 = 0x801211C8; -D_801211F0 = 0x801211F0; -D_801211F8 = 0x801211F8; -D_80121200 = 0x80121200; -D_80121204 = 0x80121204; -D_80121208 = 0x80121208; -D_80121210 = 0x80121210; -D_80121214 = 0x80121214; -D_80121218 = 0x80121218; -D_80121220 = 0x80121220; -D_80121224 = 0x80121224; -D_80121228 = 0x80121228; -D_80121250 = 0x80121250; -D_80121260 = 0x80121260; -D_801234E8 = 0x801234E8; -D_801234EC = 0x801234EC; -D_801234F0 = 0x801234F0; -D_801234F4 = 0x801234F4; -D_801234F8 = 0x801234F8; -D_801234FC = 0x801234FC; -D_80123500 = 0x80123500; -D_80123504 = 0x80123504; -D_80123508 = 0x80123508; -D_8012350C = 0x8012350C; -gSettingsPtr = 0x80123510; -D_80123514 = 0x80123514; -gIsPaused = 0x80123515; -D_80123516 = 0x80123516; -D_80123518 = 0x80123518; -D_8012351C = 0x8012351C; -D_80123520 = 0x80123520; -D_80123524 = 0x80123524; -D_80123525 = 0x80123525; -D_80123526 = 0x80123526; -D_80123528 = 0x80123528; -D_8012352C = 0x8012352C; -D_80123530 = 0x80123530; -D_80123534 = 0x80123534; -D_80123538 = 0x80123538; -D_80123544 = 0x80123544; -D_80123548 = 0x80123548; -D_80123560 = 0x80123560; -D_80123580 = 0x80123580; -D_80123588 = 0x80123588; -D_801235C0 = 0x801235C0; -D_801235C8 = 0x801235C8; -D_80123DC8 = 0x80123DC8; -D_80123DCC = 0x80123DCC; -D_80123DD0 = 0x80123DD0; -D_80123ED0 = 0x80123ED0; -D_80123FD0 = 0x80123FD0; -D_80123FF0 = 0x80123FF0; -D_80124010 = 0x80124010; -D_80124018 = 0x80124018; -D_801241B8 = 0x801241B8; -D_801241E0 = 0x801241E0; -D_801241E4 = 0x801241E4; -D_801241E5 = 0x801241E5; -D_801241E6 = 0x801241E6; -D_801241E7 = 0x801241E7; -D_801241E8 = 0x801241E8; -D_801241EC = 0x801241EC; -D_801241F0 = 0x801241F0; -D_801241F4 = 0x801241F4; D_80124200 = 0x80124200; D_80124218 = 0x80124218; D_80124220 = 0x80124220; D_80124238 = 0x80124238; D_80124278 = 0x80124278; D_80124290 = 0x80124290; + D_801242A0 = 0x801242A0; D_801246A0 = 0x801246A0; D_80125EA0 = 0x80125EA0; From 8b84cbd1a4b2643211fff41bee81dea62d48c0d6 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 12:56:10 -0500 Subject: [PATCH 15/39] Added bss for unknown_0777A0, _078050, _079F50, _07AF10 --- bss.txt | 37 ------------------------------ src/unknown_0777A0.c | 16 ++++++------- src/unknown_078050.c | 31 ++++++++++++++++++------- src/unknown_079F50.c | 12 +++++++++- src/unknown_07AF10.c | 28 ++++++++++++++++++----- undefined_syms.txt | 54 -------------------------------------------- 6 files changed, 64 insertions(+), 114 deletions(-) diff --git a/bss.txt b/bss.txt index b88d4b4b..096cf296 100644 --- a/bss.txt +++ b/bss.txt @@ -33,47 +33,10 @@ unknown_071730 unknown_072E50 unknown_0777A0 -D_80124200; -D_80124218; -D_80124220; -D_80124238; -D_80124278; -D_80124290; - unknown_078050 -D_801242A0; -D_801246A0; -D_80125EA0; -D_80125EB8; -D_80125EC0; -D_80125ED8; -D_80125EF0; -D_80125F10; -D_80125F30; -D_80125F31; -D_80125F32; -D_80125F33; -D_80125F34; -D_80125F35; -D_80125F36; -D_80125F37; -D_80125F38; -D_80125F3C; -D_80125F40; -D_80126020; -D_80126100; - unknown_079F50 -D_80126110; -D_80126114; -D_80126118; -D_8012611C; -D_80126120; -D_80126124; -D_80126170; -D_80126174; unknown_07AF10 diff --git a/src/unknown_0777A0.c b/src/unknown_0777A0.c index 7b4301a8..1f4eb7ce 100644 --- a/src/unknown_0777A0.c +++ b/src/unknown_0777A0.c @@ -3,23 +3,23 @@ #include "types.h" #include "macros.h" +#include "ultra64.h" /************ .bss ************/ -extern s32 *D_80124200; -extern s32 D_80124218; -extern s32 D_80124220; -extern s32 D_80124238; -extern s32 D_80124278; -extern s32 *D_80124290; +OSIoMesg D_80124200; +OSMesg D_80124218; +OSMesgQueue D_80124220; +OSMesg D_80124238; +s32 D_80124240[14]; +OSMesgQueue D_80124278; +s32 *D_80124290; /*******************************/ // These are both defined in the generated dkr.ld file. extern u8 __ASSETS_LUT_START, __ASSETS_LUT_END; // __ASSETS_LUT_START = 0xECB60, _END = 0xECC30 -void osCreateMesgQueue(s32*, s32*, s32); -void osCreatePiManager(s32, s32*, s32*, s32); void *func_80070C9C(s32, s32); s32 func_80071478(s32*); void dmacopy(u32 romOffset, u8 *ramAddress, s32 numBytes); diff --git a/src/unknown_078050.c b/src/unknown_078050.c index 7223f02f..5950b15e 100644 --- a/src/unknown_078050.c +++ b/src/unknown_078050.c @@ -136,14 +136,29 @@ u32 D_800DE6E8[] = { /************ .bss ************/ -extern OSMesgQueue D_80125EA0; -extern OSMesg D_80125EB8; -extern OSMesgQueue D_80125EC0; -extern OSMesgQueue D_80125ED8; -extern OSMesg D_80125EF0; -extern OSMesg D_80125F10; - -extern u32 D_80126100; +s32 D_801242A0[256]; +s32 D_801246A0[1536]; +OSMesgQueue D_80125EA0; +OSMesg D_80125EB8; +OSMesgQueue D_80125EC0; +OSMesgQueue D_80125ED8; +OSMesg D_80125EF0; +s32 D_80125EF8[6]; +OSMesg D_80125F10; +s32 D_80125F18[6]; +s8 D_80125F30; +s8 D_80125F31; +s8 D_80125F32; +s8 D_80125F33; +s8 D_80125F34; +s8 D_80125F35; +s8 D_80125F36; +s8 D_80125F37; +s32 D_80125F38; +s32 D_80125F3C; +s32 D_80125F40[56]; +s32 D_80126020[56]; +u32 D_80126100; /*******************************/ diff --git a/src/unknown_079F50.c b/src/unknown_079F50.c index 4558e128..0646d982 100644 --- a/src/unknown_079F50.c +++ b/src/unknown_079F50.c @@ -109,7 +109,17 @@ const char D_800E7958[] = "\tdata_size\t\t= %u\n"; extern OSViMode D_800E3900[];//osViModeTable; -extern s32 D_80126120; +/************ .bss ************/ + +s32 D_80126110; +s32 D_80126114; +s32 D_80126118; +s32 D_8012611C; +s32 D_80126120; +s32 D_80126124; +s32 D_80126128[18]; + +/*******************************/ void __scMain(void); void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp); diff --git a/src/unknown_07AF10.c b/src/unknown_07AF10.c index 0e7ba2df..46a6ae1d 100644 --- a/src/unknown_07AF10.c +++ b/src/unknown_07AF10.c @@ -47,12 +47,28 @@ const char D_800E7AC8[] = "640 by 480 Anti-aliased, Interlaced, De-flickered.\n" /************ .bss ************/ -extern s32 D_801262B0[2]; -extern s32 D_801262B8[2]; -extern s32 D_801262C8; -extern s32 D_801262CC; -extern s8 D_80126308; -extern s8 D_80126309; +s32 D_80126170; +s32 D_80126174; +s32 D_80126178[2]; +s32 D_80126180[8]; +s32 D_801261A0[48]; +s32 D_80126260[20]; +s32 D_801262B0[2]; +s32 D_801262B8[2]; +s32 D_801262C0[2]; +s32 D_801262C8; +s32 D_801262CC; +s32 D_801262D0; +s32 D_801262D4; +s32 D_801262D8; +s32 D_801262DC; +s32 D_801262E0; +s32 D_801262E4; +s32 D_801262E8[8]; +s8 D_80126308; +s8 D_80126309; +s32 D_8012630C; +s32 D_80126310; /******************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 70093605..e8afc62c 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,60 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_80124200 = 0x80124200; -D_80124218 = 0x80124218; -D_80124220 = 0x80124220; -D_80124238 = 0x80124238; -D_80124278 = 0x80124278; -D_80124290 = 0x80124290; - -D_801242A0 = 0x801242A0; -D_801246A0 = 0x801246A0; -D_80125EA0 = 0x80125EA0; -D_80125EB8 = 0x80125EB8; -D_80125EC0 = 0x80125EC0; -D_80125ED8 = 0x80125ED8; -D_80125EF0 = 0x80125EF0; -D_80125F10 = 0x80125F10; -D_80125F30 = 0x80125F30; -D_80125F31 = 0x80125F31; -D_80125F32 = 0x80125F32; -D_80125F33 = 0x80125F33; -D_80125F34 = 0x80125F34; -D_80125F35 = 0x80125F35; -D_80125F36 = 0x80125F36; -D_80125F37 = 0x80125F37; -D_80125F38 = 0x80125F38; -D_80125F3C = 0x80125F3C; -D_80125F40 = 0x80125F40; -D_80126020 = 0x80126020; -D_80126100 = 0x80126100; -D_80126110 = 0x80126110; -D_80126114 = 0x80126114; -D_80126118 = 0x80126118; -D_8012611C = 0x8012611C; -D_80126120 = 0x80126120; -D_80126124 = 0x80126124; -D_80126170 = 0x80126170; -D_80126174 = 0x80126174; -D_80126178 = 0x80126178; -D_80126180 = 0x80126180; -D_801261A0 = 0x801261A0; -D_80126260 = 0x80126260; -D_801262B0 = 0x801262B0; -D_801262B8 = 0x801262B8; -D_801262C0 = 0x801262C0; -D_801262C8 = 0x801262C8; -D_801262CC = 0x801262CC; -D_801262D0 = 0x801262D0; -D_801262D4 = 0x801262D4; -D_801262D8 = 0x801262D8; -D_801262DC = 0x801262DC; -D_801262E0 = 0x801262E0; -D_801262E4 = 0x801262E4; -D_80126308 = 0x80126308; -D_80126309 = 0x80126309; -D_80126310 = 0x80126310; D_80126320 = 0x80126320; D_80126328 = 0x80126328; D_8012632C = 0x8012632C; From ac1d02ccdbb5f8d81dede759c1e462fbd2ed5017 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 17:45:44 -0500 Subject: [PATCH 16/39] Added bss for unknown_07B870 & unknown_080500 --- .../unknown_080500/MenuCharacterSelectLoop.s | 12 +- .../unknown_080500/MenuFileSelectLoop.s | 8 +- .../unknown_080500/MenuLoadNewAreaInit.s | 4 +- .../unknown_080500/MenuLoadNewAreaLoop.s | 12 +- .../unknown_080500/MenuOptionsLoop.s | 4 +- .../unknown_080500/MenuTrophyRaceRoundInit.s | 4 +- .../unknown_080500/func_8007F900.s | 4 +- .../unknown_080500/func_80081218.s | 34 +- .../unknown_080500/func_800862C4.s | 4 +- .../unknown_080500/func_8008D5F8.s | 8 +- .../unknown_080500/func_8008D8BC.s | 4 +- .../unknown_080500/func_8008DC7C.s | 4 +- .../unknown_080500/func_8008F00C.s | 4 +- .../unknown_080500/func_8008FF1C.s | 4 +- .../unknown_080500/func_80090F30.s | 32 +- .../unknown_080500/func_80092188.s | 8 +- .../unknown_080500/func_80092E94.s | 24 +- .../unknown_080500/func_80095728.s | 16 +- bss.txt | 46 -- src/unknown_07B870.c | 31 +- src/unknown_080500.c | 386 ++++++++++----- undefined_syms.txt | 453 ++++++++---------- 22 files changed, 592 insertions(+), 514 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s index dd5f6368..e790367d 100644 --- a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s @@ -32,13 +32,13 @@ glabel MenuCharacterSelectLoop /* 08C994 8008BD94 8C620000 */ lw $v0, ($v1) /* 08C998 8008BD98 3C0F8012 */ lui $t7, %hi(D_801263D4) # $t7, 0x8012 /* 08C99C 8008BD9C 1440001B */ bnez $v0, .L8008BE0C -/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(D_801263D5) # $t8, 0x8012 -/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(D_801263D6) # $t9, 0x8012 -/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(D_801263D7) # $t4, 0x8012 -/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(D_801263D7)($t4) -/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(D_801263D6)($t9) +/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(D_801263D4+1) # $t8, 0x8012 +/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(D_801263D4+2) # $t9, 0x8012 +/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(D_801263D4+3) # $t4, 0x8012 +/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(D_801263D4+3)($t4) +/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(D_801263D4+2)($t9) /* 08C9B4 8008BDB4 81EF63D4 */ lb $t7, %lo(D_801263D4)($t7) -/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(D_801263D5)($t8) +/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(D_801263D4+1)($t8) /* 08C9BC 8008BDBC A3AC0023 */ sb $t4, 0x23($sp) /* 08C9C0 8008BDC0 A3B90022 */ sb $t9, 0x22($sp) /* 08C9C4 8008BDC4 A3AF0020 */ sb $t7, 0x20($sp) diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s index 54146090..d4ff9c24 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s @@ -72,9 +72,9 @@ glabel MenuFileSelectLoop /* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(gIsInAdventureTwo)($at) /* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e /* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) -/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 /* 08D4D0 8008C8D0 0C01B6C5 */ jal func_8006DB14 -/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(p1_vehicle)($at) +/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(gPlayerVehicle)($at) /* 08D4D8 8008C8D8 0C0204F4 */ jal MenuInit /* 08D4DC 8008C8DC 24040006 */ li $a0, 6 /* 08D4E0 8008C8E0 10000076 */ b .L8008CABC @@ -134,10 +134,10 @@ glabel MenuFileSelectLoop /* 08D5A8 8008C9A8 AFA20024 */ sw $v0, 0x24($sp) /* 08D5AC 8008C9AC 0C01A955 */ jal func_8006A554 /* 08D5B0 8008C9B0 AFA60020 */ sw $a2, 0x20($sp) -/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(D_80126465) # $t9, 0x8012 +/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(D_80126464+1) # $t9, 0x8012 /* 08D5B8 8008C9B8 8FA30024 */ lw $v1, 0x24($sp) /* 08D5BC 8008C9BC 8FA60020 */ lw $a2, 0x20($sp) -/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(D_80126465)($t9) +/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(D_80126464+1)($t9) /* 08D5C4 8008C9C4 00621825 */ or $v1, $v1, $v0 /* 08D5C8 8008C9C8 00D93021 */ addu $a2, $a2, $t9 .L8008C9CC: diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s index 1a029385..7d6e7857 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s @@ -15,8 +15,8 @@ glabel MenuLoadNewAreaInit /* 0938B8 80092CB8 81D00002 */ lb $s0, 2($t6) /* 0938BC 80092CBC 0C01AC2B */ jal func_8006B0AC /* 0938C0 80092CC0 02002025 */ move $a0, $s0 -/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 -/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) +/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) /* 0938CC 80092CCC 0C01AC53 */ jal func_8006B14C /* 0938D0 80092CD0 02002025 */ move $a0, $s0 /* 0938D4 80092CD4 24010005 */ li $at, 5 diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s index 09750dd8..493aad1a 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s @@ -84,11 +84,11 @@ glabel MenuLoadNewAreaLoop /* 094330 80093730 00000000 */ nop /* 094334 80093734 0C01AC2B */ jal func_8006B0AC /* 094338 80093738 00000000 */ nop -/* 09433C 8009373C 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 -/* 094340 80093740 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) +/* 09433C 8009373C 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 094340 80093740 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) .L80093744: -/* 094344 80093744 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 -/* 094348 80093748 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) +/* 094344 80093744 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 +/* 094348 80093748 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) /* 09434C 8009374C 8FA40024 */ lw $a0, 0x24($sp) /* 094350 80093750 0C01AC3E */ jal func_8006B0F8 /* 094354 80093754 AFA30034 */ sw $v1, 0x34($sp) @@ -238,9 +238,9 @@ glabel MenuLoadNewAreaLoop /* 094558 80093958 0C000741 */ jal func_80001D04 /* 09455C 8009395C AFA30034 */ sw $v1, 0x34($sp) /* 094560 80093960 8FA30034 */ lw $v1, 0x34($sp) -/* 094564 80093964 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 094564 80093964 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 /* 094568 80093968 10000021 */ b .L800939F0 -/* 09456C 8009396C A02369C0 */ sb $v1, %lo(p1_vehicle)($at) +/* 09456C 8009396C A02369C0 */ sb $v1, %lo(gPlayerVehicle)($at) .L80093970: /* 094570 80093970 04410007 */ bgez $v0, .L80093990 /* 094574 80093974 8FAA0038 */ lw $t2, 0x38($sp) diff --git a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s index a71c4304..399f89f0 100644 --- a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s @@ -147,8 +147,8 @@ glabel MenuOptionsLoop /* 085174 80084574 14410028 */ bne $v0, $at, .L80084618 /* 085178 80084578 00000000 */ nop /* 08517C 8008457C 10E00026 */ beqz $a3, .L80084618 -/* 085180 80084580 3C0F8012 */ lui $t7, %hi(D_8012644C) # $t7, 0x8012 -/* 085184 80084584 8DEF644C */ lw $t7, %lo(D_8012644C)($t7) +/* 085180 80084580 3C0F8012 */ lui $t7, %hi(D_80126448+4) # $t7, 0x8012 +/* 085184 80084584 8DEF644C */ lw $t7, %lo(D_80126448+4)($t7) /* 085188 80084588 3C010200 */ lui $at, 0x200 /* 08518C 8008458C 01E1C824 */ and $t9, $t7, $at /* 085190 80084590 1320000F */ beqz $t9, .L800845D0 diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s index 122bcd55..99b68125 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s @@ -50,8 +50,8 @@ glabel MenuTrophyRaceRoundInit /* 098F1C 8009831C 8E690000 */ lw $t1, ($s3) /* 098F20 80098320 00008825 */ move $s1, $zero /* 098F24 80098324 1920000A */ blez $t1, .L80098350 -/* 098F28 80098328 3C128012 */ lui $s2, %hi(p1_vehicle) # $s2, 0x8012 -/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(p1_vehicle) # addiu $s2, $s2, 0x69c0 +/* 098F28 80098328 3C128012 */ lui $s2, %hi(gPlayerVehicle) # $s2, 0x8012 +/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(gPlayerVehicle) # addiu $s2, $s2, 0x69c0 .L80098330: /* 098F30 80098330 0C01AC2B */ jal func_8006B0AC /* 098F34 80098334 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/unknown_080500/func_8007F900.s b/asm/non_matchings/unknown_080500/func_8007F900.s index 8d6f187b..0ce18a38 100644 --- a/asm/non_matchings/unknown_080500/func_8007F900.s +++ b/asm/non_matchings/unknown_080500/func_8007F900.s @@ -126,7 +126,7 @@ glabel func_8007F900 /* 0806D0 8007FAD0 00000000 */ nop /* 0806D4 8007FAD4 AD2B0114 */ sw $t3, 0x114($t1) /* 0806D8 8007FAD8 8C8C007C */ lw $t4, 0x7c($a0) -/* 0806DC 8007FADC 3C0B8012 */ lui $t3, %hi(D_8012644C) # $t3, 0x8012 +/* 0806DC 8007FADC 3C0B8012 */ lui $t3, %hi(D_80126448+4) # $t3, 0x8012 /* 0806E0 8007FAE0 AD2C0134 */ sw $t4, 0x134($t1) /* 0806E4 8007FAE4 8C8D0080 */ lw $t5, 0x80($a0) /* 0806E8 8007FAE8 00000000 */ nop @@ -143,7 +143,7 @@ glabel func_8007F900 /* 080714 8007FB14 8C990088 */ lw $t9, 0x88($a0) /* 080718 8007FB18 00000000 */ nop /* 08071C 8007FB1C AC590000 */ sw $t9, ($v0) -/* 080720 8007FB20 8D6B644C */ lw $t3, %lo(D_8012644C)($t3) +/* 080720 8007FB20 8D6B644C */ lw $t3, %lo(D_80126448+4)($t3) /* 080724 8007FB24 00000000 */ nop /* 080728 8007FB28 01616824 */ and $t5, $t3, $at /* 08072C 8007FB2C 11A00004 */ beqz $t5, .L8007FB40 diff --git a/asm/non_matchings/unknown_080500/func_80081218.s b/asm/non_matchings/unknown_080500/func_80081218.s index 16bc0f5f..7e12e3cb 100644 --- a/asm/non_matchings/unknown_080500/func_80081218.s +++ b/asm/non_matchings/unknown_080500/func_80081218.s @@ -20,7 +20,7 @@ glabel func_80081218 /* 081E60 80081260 3C048012 */ lui $a0, %hi(D_80126530) # $a0, 0x8012 /* 081E64 80081264 24846530 */ addiu $a0, %lo(D_80126530) # addiu $a0, $a0, 0x6530 /* 081E68 80081268 AC820000 */ sw $v0, ($a0) -/* 081E6C 8008126C 3C018012 */ lui $at, %hi(D_80126534) # $at, 0x8012 +/* 081E6C 8008126C 3C018012 */ lui $at, %hi(D_80126530+4) # $at, 0x8012 /* 081E70 80081270 AC226530 */ sw $v0, %lo(D_80126530)($at) /* 081E74 80081274 3C098012 */ lui $t1, %hi(D_80126530) # $t1, 0x8012 /* 081E78 80081278 8D296530 */ lw $t1, %lo(D_80126530)($t1) @@ -30,35 +30,35 @@ glabel func_80081218 /* 081E88 80081288 3C0B8012 */ lui $t3, %hi(D_80126530) # $t3, 0x8012 /* 081E8C 8008128C AD2A0004 */ sw $t2, 4($t1) /* 081E90 80081290 8D6B6530 */ lw $t3, %lo(D_80126530)($t3) -/* 081E94 80081294 3C188012 */ lui $t8, %hi(D_80126534) # $t8, 0x8012 +/* 081E94 80081294 3C188012 */ lui $t8, %hi(D_80126530+4) # $t8, 0x8012 /* 081E98 80081298 8D6C0004 */ lw $t4, 4($t3) -/* 081E9C 8008129C 3C088012 */ lui $t0, %hi(D_80126534) # $t0, 0x8012 +/* 081E9C 8008129C 3C088012 */ lui $t0, %hi(D_80126530+4) # $t0, 0x8012 /* 081EA0 800812A0 01866821 */ addu $t5, $t4, $a2 /* 081EA4 800812A4 AD6D0000 */ sw $t5, ($t3) /* 081EA8 800812A8 8C8E0000 */ lw $t6, ($a0) /* 081EAC 800812AC 00E71821 */ addu $v1, $a3, $a3 /* 081EB0 800812B0 01C77821 */ addu $t7, $t6, $a3 -/* 081EB4 800812B4 AC2F6534 */ sw $t7, %lo(D_80126534)($at) -/* 081EB8 800812B8 8F186534 */ lw $t8, %lo(D_80126534)($t8) -/* 081EBC 800812BC 3C018012 */ lui $at, %hi(D_8012653C) # $at, 0x8012 +/* 081EB4 800812B4 AC2F6534 */ sw $t7, %lo(D_80126530+4)($at) +/* 081EB8 800812B8 8F186534 */ lw $t8, %lo(D_80126530+4)($t8) +/* 081EBC 800812BC 3C018012 */ lui $at, %hi(D_80126530+12) # $at, 0x8012 /* 081EC0 800812C0 27190118 */ addiu $t9, $t8, 0x118 /* 081EC4 800812C4 AF190004 */ sw $t9, 4($t8) -/* 081EC8 800812C8 8D086534 */ lw $t0, %lo(D_80126534)($t0) -/* 081ECC 800812CC 3C0B8012 */ lui $t3, %hi(D_80126538) # $t3, 0x8012 +/* 081EC8 800812C8 8D086534 */ lw $t0, %lo(D_80126530+4)($t0) +/* 081ECC 800812CC 3C0B8012 */ lui $t3, %hi(D_80126530+8) # $t3, 0x8012 /* 081ED0 800812D0 8D0A0004 */ lw $t2, 4($t0) -/* 081ED4 800812D4 3C0F8012 */ lui $t7, %hi(D_80126538) # $t7, 0x8012 +/* 081ED4 800812D4 3C0F8012 */ lui $t7, %hi(D_80126530+8) # $t7, 0x8012 /* 081ED8 800812D8 01464821 */ addu $t1, $t2, $a2 /* 081EDC 800812DC AD090000 */ sw $t1, ($t0) /* 081EE0 800812E0 8C8C0000 */ lw $t4, ($a0) -/* 081EE4 800812E4 3C088012 */ lui $t0, %hi(D_8012653C) # $t0, 0x8012 +/* 081EE4 800812E4 3C088012 */ lui $t0, %hi(D_80126530+12) # $t0, 0x8012 /* 081EE8 800812E8 01836821 */ addu $t5, $t4, $v1 -/* 081EEC 800812EC AC2D6538 */ sw $t5, %lo(D_80126538)($at) -/* 081EF0 800812F0 8D6B6538 */ lw $t3, %lo(D_80126538)($t3) +/* 081EEC 800812EC AC2D6538 */ sw $t5, %lo(D_80126530+8)($at) +/* 081EF0 800812F0 8D6B6538 */ lw $t3, %lo(D_80126530+8)($t3) /* 081EF4 800812F4 00671821 */ addu $v1, $v1, $a3 /* 081EF8 800812F8 256E0118 */ addiu $t6, $t3, 0x118 /* 081EFC 800812FC AD6E0004 */ sw $t6, 4($t3) -/* 081F00 80081300 8DEF6538 */ lw $t7, %lo(D_80126538)($t7) -/* 081F04 80081304 3C0D8012 */ lui $t5, %hi(D_8012653C) # $t5, 0x8012 +/* 081F00 80081300 8DEF6538 */ lw $t7, %lo(D_80126530+8)($t7) +/* 081F04 80081304 3C0D8012 */ lui $t5, %hi(D_80126530+12) # $t5, 0x8012 /* 081F08 80081308 8DF90004 */ lw $t9, 4($t7) /* 081F0C 8008130C 00000000 */ nop /* 081F10 80081310 0326C021 */ addu $t8, $t9, $a2 @@ -66,12 +66,12 @@ glabel func_80081218 /* 081F18 80081318 8C8A0000 */ lw $t2, ($a0) /* 081F1C 8008131C 24040041 */ li $a0, 65 /* 081F20 80081320 01434821 */ addu $t1, $t2, $v1 -/* 081F24 80081324 AC29653C */ sw $t1, %lo(D_8012653C)($at) -/* 081F28 80081328 8D08653C */ lw $t0, %lo(D_8012653C)($t0) +/* 081F24 80081324 AC29653C */ sw $t1, %lo(D_80126530+12)($at) +/* 081F28 80081328 8D08653C */ lw $t0, %lo(D_80126530+12)($t0) /* 081F2C 8008132C 00000000 */ nop /* 081F30 80081330 250C0118 */ addiu $t4, $t0, 0x118 /* 081F34 80081334 AD0C0004 */ sw $t4, 4($t0) -/* 081F38 80081338 8DAD653C */ lw $t5, %lo(D_8012653C)($t5) +/* 081F38 80081338 8DAD653C */ lw $t5, %lo(D_80126530+12)($t5) /* 081F3C 8008133C 00000000 */ nop /* 081F40 80081340 8DAE0004 */ lw $t6, 4($t5) /* 081F44 80081344 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800862C4.s b/asm/non_matchings/unknown_080500/func_800862C4.s index f0914be9..43f4130a 100644 --- a/asm/non_matchings/unknown_080500/func_800862C4.s +++ b/asm/non_matchings/unknown_080500/func_800862C4.s @@ -3,9 +3,9 @@ glabel func_800862C4 /* 086EC8 800862C8 AFB60038 */ sw $s6, 0x38($sp) /* 086ECC 800862CC AFB20028 */ sw $s2, 0x28($sp) /* 086ED0 800862D0 3C128012 */ lui $s2, %hi(D_80126A08) # $s2, 0x8012 -/* 086ED4 800862D4 3C168012 */ lui $s6, %hi(D_8012653C) # $s6, 0x8012 +/* 086ED4 800862D4 3C168012 */ lui $s6, %hi(D_80126530+12) # $s6, 0x8012 /* 086ED8 800862D8 26526A08 */ addiu $s2, %lo(D_80126A08) # addiu $s2, $s2, 0x6a08 -/* 086EDC 800862DC 8ED6653C */ lw $s6, %lo(D_8012653C)($s6) +/* 086EDC 800862DC 8ED6653C */ lw $s6, %lo(D_80126530+12)($s6) /* 086EE0 800862E0 AE400000 */ sw $zero, ($s2) /* 086EE4 800862E4 3C018012 */ lui $at, %hi(D_80126BD4) # $at, 0x8012 /* 086EE8 800862E8 44802000 */ mtc1 $zero, $f4 diff --git a/asm/non_matchings/unknown_080500/func_8008D5F8.s b/asm/non_matchings/unknown_080500/func_8008D5F8.s index bcfd2b0c..2e37b253 100644 --- a/asm/non_matchings/unknown_080500/func_8008D5F8.s +++ b/asm/non_matchings/unknown_080500/func_8008D5F8.s @@ -18,13 +18,13 @@ glabel func_8008D5F8 /* 08E238 8008D638 AFA60020 */ sw $a2, 0x20($sp) /* 08E23C 8008D63C 0C01A955 */ jal func_8006A554 /* 08E240 8008D640 AFA7001C */ sw $a3, 0x1c($sp) -/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 -/* 08E248 8008D648 3C188012 */ lui $t8, %hi(D_80126465) # $t8, 0x8012 +/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 +/* 08E248 8008D648 3C188012 */ lui $t8, %hi(D_80126464+1) # $t8, 0x8012 /* 08E24C 8008D64C 8FA30024 */ lw $v1, 0x24($sp) /* 08E250 8008D650 8FA60020 */ lw $a2, 0x20($sp) /* 08E254 8008D654 8FA7001C */ lw $a3, 0x1c($sp) -/* 08E258 8008D658 81EF645D */ lb $t7, %lo(D_8012645D)($t7) -/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(D_80126465)($t8) +/* 08E258 8008D658 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) +/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(D_80126464+1)($t8) /* 08E260 8008D660 24080002 */ li $t0, 2 /* 08E264 8008D664 00621825 */ or $v1, $v1, $v0 /* 08E268 8008D668 00CF3021 */ addu $a2, $a2, $t7 diff --git a/asm/non_matchings/unknown_080500/func_8008D8BC.s b/asm/non_matchings/unknown_080500/func_8008D8BC.s index e54cef79..86385bdc 100644 --- a/asm/non_matchings/unknown_080500/func_8008D8BC.s +++ b/asm/non_matchings/unknown_080500/func_8008D8BC.s @@ -17,10 +17,10 @@ glabel func_8008D8BC /* 08E4F8 8008D8F8 AFA20028 */ sw $v0, 0x28($sp) /* 08E4FC 8008D8FC 0C01A955 */ jal func_8006A554 /* 08E500 8008D900 AFA50024 */ sw $a1, 0x24($sp) -/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 +/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 /* 08E508 8008D908 8FA30028 */ lw $v1, 0x28($sp) /* 08E50C 8008D90C 8FA50024 */ lw $a1, 0x24($sp) -/* 08E510 8008D910 81EF645D */ lb $t7, %lo(D_8012645D)($t7) +/* 08E510 8008D910 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) /* 08E514 8008D914 00621825 */ or $v1, $v1, $v0 /* 08E518 8008D918 00AF2821 */ addu $a1, $a1, $t7 .L8008D91C: diff --git a/asm/non_matchings/unknown_080500/func_8008DC7C.s b/asm/non_matchings/unknown_080500/func_8008DC7C.s index 16aa02c3..186d7b01 100644 --- a/asm/non_matchings/unknown_080500/func_8008DC7C.s +++ b/asm/non_matchings/unknown_080500/func_8008DC7C.s @@ -15,10 +15,10 @@ glabel func_8008DC7C /* 08E8B0 8008DCB0 AFA2001C */ sw $v0, 0x1c($sp) /* 08E8B4 8008DCB4 0C01A955 */ jal func_8006A554 /* 08E8B8 8008DCB8 AFA50018 */ sw $a1, 0x18($sp) -/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 +/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 /* 08E8C0 8008DCC0 8FA3001C */ lw $v1, 0x1c($sp) /* 08E8C4 8008DCC4 8FA50018 */ lw $a1, 0x18($sp) -/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(D_8012645D)($t7) +/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) /* 08E8CC 8008DCCC 00621825 */ or $v1, $v1, $v0 /* 08E8D0 8008DCD0 00AF2821 */ addu $a1, $a1, $t7 .L8008DCD4: diff --git a/asm/non_matchings/unknown_080500/func_8008F00C.s b/asm/non_matchings/unknown_080500/func_8008F00C.s index 4900eef6..23eb4373 100644 --- a/asm/non_matchings/unknown_080500/func_8008F00C.s +++ b/asm/non_matchings/unknown_080500/func_8008F00C.s @@ -48,8 +48,8 @@ glabel func_8008F00C /* 08FCB8 8008F0B8 3C048012 */ lui $a0, %hi(D_801269C4) # $a0, 0x8012 /* 08FCBC 8008F0BC 18C0000B */ blez $a2, .L8008F0EC /* 08FCC0 8008F0C0 24180001 */ li $t8, 1 -/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 -/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(p1_vehicle) +/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 +/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(gPlayerVehicle) /* 08FCCC 8008F0CC 00C32821 */ addu $a1, $a2, $v1 /* 08FCD0 8008F0D0 248469C4 */ addiu $a0, %lo(D_801269C4) # addiu $a0, $a0, 0x69c4 .L8008F0D4: diff --git a/asm/non_matchings/unknown_080500/func_8008FF1C.s b/asm/non_matchings/unknown_080500/func_8008FF1C.s index 75591292..72129030 100644 --- a/asm/non_matchings/unknown_080500/func_8008FF1C.s +++ b/asm/non_matchings/unknown_080500/func_8008FF1C.s @@ -335,11 +335,11 @@ glabel func_8008FF1C /* 091000 80090400 3C018012 */ lui $at, %hi(D_801269F0) # $at, 0x8012 /* 091004 80090404 3C108012 */ lui $s0, %hi(D_80126930) # $s0, 0x8012 /* 091008 80090408 3C14800E */ lui $s4, %hi(D_800E05F4) # $s4, 0x800e -/* 09100C 8009040C 3C138012 */ lui $s3, %hi(p1_vehicle) # $s3, 0x8012 +/* 09100C 8009040C 3C138012 */ lui $s3, %hi(gPlayerVehicle) # $s3, 0x8012 /* 091010 80090410 3C12800E */ lui $s2, %hi(D_800E05D4) # $s2, 0x800e /* 091014 80090414 AC2069F0 */ sw $zero, %lo(D_801269F0)($at) /* 091018 80090418 265205D4 */ addiu $s2, %lo(D_800E05D4) # addiu $s2, $s2, 0x5d4 -/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(p1_vehicle) # addiu $s3, $s3, 0x69c0 +/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(gPlayerVehicle) # addiu $s3, $s3, 0x69c0 /* 091020 80090420 269405F4 */ addiu $s4, %lo(D_800E05F4) # addiu $s4, $s4, 0x5f4 /* 091024 80090424 26106930 */ addiu $s0, %lo(D_80126930) # addiu $s0, $s0, 0x6930 /* 091028 80090428 AFA0007C */ sw $zero, 0x7c($sp) diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index e73a5d9b..708e7fab 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -352,8 +352,8 @@ glabel func_80090F30 /* 092040 80091440 24070060 */ li $a3, 96 /* 092044 80091444 0C0310E1 */ jal func_800C4384 /* 092048 80091448 AFAE0010 */ sw $t6, 0x10($sp) -/* 09204C 8009144C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 092050 80091450 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 09204C 8009144C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 092050 80091450 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 092054 80091454 8FAF0070 */ lw $t7, 0x70($sp) /* 092058 80091458 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 09205C 8009145C 0018C880 */ sll $t9, $t8, 2 @@ -375,8 +375,8 @@ glabel func_80090F30 /* 09209C 8009149C 02003025 */ move $a2, $s0 /* 0920A0 800914A0 0C031110 */ jal func_800C4440 /* 0920A4 800914A4 02203825 */ move $a3, $s1 -/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 0920B0 800914B0 8FAE0070 */ lw $t6, 0x70($sp) /* 0920B4 800914B4 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 0920B8 800914B8 00187880 */ sll $t7, $t8, 2 @@ -397,8 +397,8 @@ glabel func_80090F30 /* 0920F4 800914F4 02403025 */ move $a2, $s2 /* 0920F8 800914F8 0C031110 */ jal func_800C4440 /* 0920FC 800914FC 02203825 */ move $a3, $s1 -/* 092100 80091500 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 092104 80091504 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 092100 80091500 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 092104 80091504 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 092108 80091508 8FAD0070 */ lw $t5, 0x70($sp) /* 09210C 8009150C 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 092110 80091510 00187080 */ sll $t6, $t8, 2 @@ -417,8 +417,8 @@ glabel func_80090F30 /* 092144 80091544 24060035 */ li $a2, 53 /* 092148 80091548 0C020600 */ jal func_80081800 /* 09214C 8009154C 24070080 */ li $a3, 128 -/* 092150 80091550 3C0D8012 */ lui $t5, %hi(p1_vehicle) # $t5, 0x8012 -/* 092154 80091554 81AD69C0 */ lb $t5, %lo(p1_vehicle)($t5) +/* 092150 80091550 3C0D8012 */ lui $t5, %hi(gPlayerVehicle) # $t5, 0x8012 +/* 092154 80091554 81AD69C0 */ lb $t5, %lo(gPlayerVehicle)($t5) /* 092158 80091558 8FB80070 */ lw $t8, 0x70($sp) /* 09215C 8009155C 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e /* 092160 80091560 000D7080 */ sll $t6, $t5, 2 @@ -664,10 +664,10 @@ glabel func_80090F30 /* 0924E8 800918E8 258C06B0 */ addiu $t4, %lo(D_800E06B0) # addiu $t4, $t4, 0x6b0 /* 0924EC 800918EC 254A0624 */ addiu $t2, %lo(D_800E0624) # addiu $t2, $t2, 0x624 /* 0924F0 800918F0 00094080 */ sll $t0, $t1, 2 -/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(p1_vehicle) # $s1, 0x8012 +/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(gPlayerVehicle) # $s1, 0x8012 /* 0924F8 800918F8 00135840 */ sll $t3, $s3, 1 /* 0924FC 800918FC 016C8021 */ addu $s0, $t3, $t4 -/* 092500 80091900 263169C0 */ addiu $s1, %lo(p1_vehicle) # addiu $s1, $s1, 0x69c0 +/* 092500 80091900 263169C0 */ addiu $s1, %lo(gPlayerVehicle) # addiu $s1, $s1, 0x69c0 /* 092504 80091904 010A9021 */ addu $s2, $t0, $t2 .L80091908: /* 092508 80091908 822D0000 */ lb $t5, ($s1) @@ -750,8 +750,8 @@ glabel func_80090F30 /* 092624 80091A24 8FAF007C */ lw $t7, 0x7c($sp) /* 092628 80091A28 8FB00080 */ lw $s0, 0x80($sp) .L80091A2C: -/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 -/* 092630 80091A30 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) +/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 +/* 092630 80091A30 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) /* 092634 80091A34 24010002 */ li $at, 2 /* 092638 80091A38 2610008B */ addiu $s0, $s0, 0x8b /* 09263C 80091A3C 24160003 */ li $s6, 3 @@ -821,10 +821,10 @@ glabel func_80090F30 /* 092730 80091B30 14410031 */ bne $v0, $at, .L80091BF8 /* 092734 80091B34 26310624 */ addiu $s1, %lo(D_800E0624) # addiu $s1, $s1, 0x624 /* 092738 80091B38 8FAA0074 */ lw $t2, 0x74($sp) -/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(p1_vehicle) # $t0, 0x8012 +/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(gPlayerVehicle) # $t0, 0x8012 /* 092740 80091B40 1540002D */ bnez $t2, .L80091BF8 /* 092744 80091B44 00000000 */ nop -/* 092748 80091B48 810869C0 */ lb $t0, %lo(p1_vehicle)($t0) +/* 092748 80091B48 810869C0 */ lb $t0, %lo(gPlayerVehicle)($t0) /* 09274C 80091B4C 8FD90000 */ lw $t9, ($fp) /* 092750 80091B50 01160019 */ multu $t0, $s6 /* 092754 80091B54 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -844,8 +844,8 @@ glabel func_80090F30 /* 09278C 80091B8C AFB80010 */ sw $t8, 0x10($sp) /* 092790 80091B90 0C01E2AE */ jal func_80078AB8 /* 092794 80091B94 AFB9001C */ sw $t9, 0x1c($sp) -/* 092798 80091B98 3C028012 */ lui $v0, %hi(p2_vehicle) # $v0, 0x8012 -/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(p2_vehicle)($v0) +/* 092798 80091B98 3C028012 */ lui $v0, %hi(gPlayerVehicle+1) # $v0, 0x8012 +/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(gPlayerVehicle+1)($v0) /* 0927A0 80091BA0 24010002 */ li $at, 2 /* 0927A4 80091BA4 14410002 */ bne $v0, $at, .L80091BB0 /* 0927A8 80091BA8 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 2d3317a0..1fa5d86b 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -329,10 +329,10 @@ glabel L8009251C /* 093230 80092630 000FC080 */ sll $t8, $t7, 2 /* 093234 80092634 03387021 */ addu $t6, $t9, $t8 /* 093238 80092638 8DCF0000 */ lw $t7, ($t6) -/* 09323C 8009263C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 09323C 8009263C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 /* 093240 80092640 31F90002 */ andi $t9, $t7, 2 /* 093244 80092644 13200027 */ beqz $t9, .L800926E4 -/* 093248 80092648 271869C0 */ addiu $t8, %lo(p1_vehicle) # addiu $t8, $t8, 0x69c0 +/* 093248 80092648 271869C0 */ addiu $t8, %lo(gPlayerVehicle) # addiu $t8, $t8, 0x69c0 /* 09324C 8009264C 00057040 */ sll $t6, $a1, 1 /* 093250 80092650 3C068012 */ lui $a2, %hi(D_80126830) # $a2, 0x8012 /* 093254 80092654 00B81821 */ addu $v1, $a1, $t8 @@ -700,8 +700,8 @@ glabel L8009287C /* 093760 80092B60 0C000741 */ jal func_80001D04 /* 093764 80092B64 00002825 */ move $a1, $zero .L80092B68: -/* 093768 80092B68 3C048012 */ lui $a0, %hi(p1_vehicle) # $a0, 0x8012 -/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(p1_vehicle)($a0) +/* 093768 80092B68 3C048012 */ lui $a0, %hi(gPlayerVehicle) # $a0, 0x8012 +/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(gPlayerVehicle)($a0) /* 093770 80092B70 0C01B6C5 */ jal func_8006DB14 /* 093774 80092B74 00000000 */ nop /* 093778 80092B78 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80092E94.s b/asm/non_matchings/unknown_080500/func_80092E94.s index 791b120b..ce229fb0 100644 --- a/asm/non_matchings/unknown_080500/func_80092E94.s +++ b/asm/non_matchings/unknown_080500/func_80092E94.s @@ -159,8 +159,8 @@ glabel func_80092E94 /* 093D00 80093100 240600FF */ li $a2, 255 /* 093D04 80093104 0C0310E1 */ jal func_800C4384 /* 093D08 80093108 24070060 */ li $a3, 96 -/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(p1_vehicle) # $t1, 0x8012 -/* 093D10 80093110 812969C0 */ lb $t1, %lo(p1_vehicle)($t1) +/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(gPlayerVehicle) # $t1, 0x8012 +/* 093D10 80093110 812969C0 */ lb $t1, %lo(gPlayerVehicle)($t1) /* 093D14 80093114 8FA80050 */ lw $t0, 0x50($sp) /* 093D18 80093118 00095080 */ sll $t2, $t1, 2 /* 093D1C 8009311C 8FB10058 */ lw $s1, 0x58($sp) @@ -180,8 +180,8 @@ glabel func_80092E94 /* 093D54 80093154 02003025 */ move $a2, $s0 /* 093D58 80093158 0C031110 */ jal func_800C4440 /* 093D5C 8009315C 27A70054 */ addiu $a3, $sp, 0x54 -/* 093D60 80093160 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 093D64 80093164 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 093D60 80093160 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 093D64 80093164 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 093D68 80093168 8FAF0050 */ lw $t7, 0x50($sp) /* 093D6C 8009316C 0018C880 */ sll $t9, $t8, 2 /* 093D70 80093170 01F94821 */ addu $t1, $t7, $t9 @@ -201,8 +201,8 @@ glabel func_80092E94 /* 093DA8 800931A8 02003825 */ move $a3, $s0 /* 093DAC 800931AC 8FA20050 */ lw $v0, 0x50($sp) /* 093DB0 800931B0 3C0D800E */ lui $t5, %hi(D_800DF4C4) # $t5, 0x800e -/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 -/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) +/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 +/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) /* 093DBC 800931BC 8DADF4C4 */ lw $t5, %lo(D_800DF4C4)($t5) /* 093DC0 800931C0 8C4C004C */ lw $t4, 0x4c($v0) /* 093DC4 800931C4 00194880 */ sll $t1, $t9, 2 @@ -223,10 +223,10 @@ glabel func_80092E94 /* 093E00 80093200 0C020600 */ jal func_80081800 /* 093E04 80093204 24070080 */ li $a3, 128 /* 093E08 80093208 8FAE0050 */ lw $t6, 0x50($sp) -/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 /* 093E10 80093210 3C0F800E */ lui $t7, %hi(D_800DF4C4) # $t7, 0x800e /* 093E14 80093214 8DEFF4C4 */ lw $t7, %lo(D_800DF4C4)($t7) -/* 093E18 80093218 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 093E18 80093218 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 093E1C 8009321C 8DCA004C */ lw $t2, 0x4c($t6) /* 093E20 80093220 0018C880 */ sll $t9, $t8, 2 /* 093E24 80093224 014F5821 */ addu $t3, $t2, $t7 @@ -313,8 +313,8 @@ glabel func_80092E94 /* 093F58 80093358 01EB6024 */ and $t4, $t7, $t3 /* 093F5C 8009335C 11800025 */ beqz $t4, .L800933F4 /* 093F60 80093360 00104080 */ sll $t0, $s0, 2 -/* 093F64 80093364 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 -/* 093F68 80093368 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) +/* 093F64 80093364 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 +/* 093F68 80093368 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) /* 093F6C 8009336C 01104023 */ subu $t0, $t0, $s0 /* 093F70 80093370 3C18800E */ lui $t8, %hi(D_800E0624) # $t8, 0x800e /* 093F74 80093374 27180624 */ addiu $t8, %lo(D_800E0624) # addiu $t8, $t8, 0x624 @@ -355,8 +355,8 @@ glabel func_80092E94 /* 093FF8 800933F8 24010003 */ li $at, 3 /* 093FFC 800933FC 1601FFC8 */ bne $s0, $at, .L80093320 /* 094000 80093400 8FAE007C */ lw $t6, 0x7c($sp) -/* 094004 80093404 3C028012 */ lui $v0, %hi(p1_vehicle) # $v0, 0x8012 -/* 094008 80093408 804269C0 */ lb $v0, %lo(p1_vehicle)($v0) +/* 094004 80093404 3C028012 */ lui $v0, %hi(gPlayerVehicle) # $v0, 0x8012 +/* 094008 80093408 804269C0 */ lb $v0, %lo(gPlayerVehicle)($v0) /* 09400C 8009340C 8FB10040 */ lw $s1, 0x40($sp) /* 094010 80093410 24010002 */ li $at, 2 /* 094014 80093414 14410002 */ bne $v0, $at, .L80093420 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 312c9350..115ce018 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -306,8 +306,8 @@ glabel L80095B34 /* 096780 80095B80 3C013F00 */ lui $at, 0x3f00 /* 096784 80095B84 11C0005B */ beqz $t6, .L80095CF4 /* 096788 80095B88 240D0003 */ li $t5, 3 -/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 -/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(p1_vehicle)($t7) +/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 +/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(gPlayerVehicle)($t7) /* 096794 80095B94 90EC0049 */ lbu $t4, 0x49($a3) /* 096798 80095B98 000FC080 */ sll $t8, $t7, 2 /* 09679C 80095B9C 00F81021 */ addu $v0, $a3, $t8 @@ -331,9 +331,9 @@ glabel L80095B34 /* 0967E4 80095BE4 24A56390 */ addiu $a1, %lo(D_80126390) # addiu $a1, $a1, 0x6390 /* 0967E8 80095BE8 0C025DBE */ jal func_800976F8 /* 0967EC 80095BEC 24060003 */ li $a2, 3 -/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(p1_vehicle) # $t4, 0x8012 +/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(gPlayerVehicle) # $t4, 0x8012 /* 0967F4 80095BF4 8FA2002C */ lw $v0, 0x2c($sp) -/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(p1_vehicle)($t4) +/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(gPlayerVehicle)($t4) /* 0967FC 80095BFC 90580049 */ lbu $t8, 0x49($v0) /* 096800 80095C00 000CC880 */ sll $t9, $t4, 2 /* 096804 80095C04 00597021 */ addu $t6, $v0, $t9 @@ -438,8 +438,8 @@ glabel L80095D50 /* 09697C 80095D7C 304E0080 */ andi $t6, $v0, 0x80 /* 096980 80095D80 0C025DD1 */ jal func_80097744 /* 096984 80095D84 24050003 */ li $a1, 3 -/* 096988 80095D88 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 -/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 +/* 096988 80095D88 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 +/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 /* 096990 80095D90 80ED0000 */ lb $t5, ($a3) /* 096994 80095D94 8FA3002C */ lw $v1, 0x2c($sp) /* 096998 80095D98 000D7880 */ sll $t7, $t5, 2 @@ -472,8 +472,8 @@ glabel L80095D50 /* 096A00 80095E00 24840FA8 */ addiu $a0, %lo(D_800E0FA8) # addiu $a0, $a0, 0xfa8 /* 096A04 80095E04 0C025DD1 */ jal func_80097744 /* 096A08 80095E08 24050003 */ li $a1, 3 -/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 -/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 +/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 +/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 /* 096A14 80095E14 80F80000 */ lb $t8, ($a3) /* 096A18 80095E18 8FA3002C */ lw $v1, 0x2c($sp) /* 096A1C 80095E1C 0018C880 */ sll $t9, $t8, 2 diff --git a/bss.txt b/bss.txt index 096cf296..76d0a240 100644 --- a/bss.txt +++ b/bss.txt @@ -38,55 +38,9 @@ unknown_078050 unknown_079F50 - unknown_07AF10 -D_80126178; -D_80126180; -D_801261A0; -D_80126260; -D_801262B0; -D_801262B8; -D_801262C0; -D_801262C8; -D_801262CC; -D_801262D0; -D_801262D4; -D_801262D8; -D_801262DC; -D_801262E0; -D_801262E4; -D_80126308; -D_80126309; -D_80126310; - unknown_07B870 -D_80126320; -D_80126328; -D_8012632C; -D_80126330; -D_80126338; -D_8012633C; -D_80126340; -D_80126344; -D_80126348; -D_8012634C; -D_80126350; -D_80126354; -D_80126358; -D_8012635C; -D_80126360; -D_80126364; -D_80126368; -D_8012636C; -D_80126370; -D_80126374; -D_80126378; -D_8012637C; -D_80126380; -D_80126382; -D_80126384; - unknown_080500 D_80126390; diff --git a/src/unknown_07B870.c b/src/unknown_07B870.c index c304859e..8b02b6d1 100644 --- a/src/unknown_07B870.c +++ b/src/unknown_07B870.c @@ -483,12 +483,31 @@ const char D_800E7C50[] = "TEXSPR Error: Tryed to deallocate non-existent sprite /************ .bss ************/ -extern s32 D_80126338; -extern s32 D_8012633C; -extern s32 D_80126354; -extern s32 D_80126378; -extern s16 D_80126382; -extern s16 D_80126384; +s32 D_80126320[2]; +s32 D_80126328; +s32 D_8012632C; +s32 D_80126330[2]; +s32 D_80126338; +s32 D_8012633C; +s32 D_80126340; +s32 D_80126344; +s32 D_80126348; +s32 D_8012634C; +s32 D_80126350; +s32 D_80126354; +s32 D_80126358; +s32 D_8012635C; +s32 D_80126360; +s32 D_80126364; +s32 D_80126368; +s32 D_8012636C; +s32 D_80126370; +s32 D_80126374; +s32 D_80126378; +s32 D_8012637C; +s16 D_80126380; +s16 D_80126382; +s16 D_80126384; /*******************************/ diff --git a/src/unknown_080500.c b/src/unknown_080500.c index a4dff02b..35c93b4b 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -40,6 +40,255 @@ typedef enum MENU_ID { extern s32 osTvType; +typedef struct unk800DFC10 { + u32 *unk0; + s16 unk4; + s16 unk6; + u32 *unk8; + s32 unkC; +} unk800DFC10; + +/************ .bss ************/ + +// The bss section needs to stay above the data section! +// Otherwise the bss variables will get reordered, which is bad. + +unk800DFC10 *D_80126390; +unk800DFC10 *D_80126394; +s32 D_80126398; +s32 D_8012639C; +Gfx *D_801263A0; +s32 D_801263A4; +s32 D_801263A8; +s32 D_801263AC; +s32 D_801263B0; +s8 D_801263B4; +s32 D_801263B8; +s32 D_801263BC; +s32 D_801263C0; +s32 D_801263C4; +s32 D_801263C8; +s32 D_801263CC; +s32 D_801263D0; +s8 D_801263D4[4]; +s32 D_801263D8; +s8 D_801263DC[4]; +s32 D_801263E0; +s32 D_801263E4; +s8 players_character_array[8]; +s8 D_801263F0[8]; +s32 D_801263F8[8]; +u8 D_80126418[8]; +u8 D_80126420[8]; +u8 D_80126428[8]; +s8 D_80126430; +s8 D_80126431; +s32 D_80126434; +s32 D_80126438[4]; +s64 D_80126448; +f32 D_80126450; +u8 D_80126454[4]; +u8 D_80126458[4]; +s8 D_8012645C[4]; +s8 D_80126460[4]; +s8 D_80126464[4]; +u8 D_80126468[4]; +u8 D_8012646C[4]; +s32 D_80126470; +s32 D_80126474; +s32 D_80126478; +s32 D_8012647C; +s32 D_80126480; +s32 D_80126484; +s32 D_80126488; +s32 D_8012648C; +s32 D_80126490; +s32 D_80126494; +s32 D_80126498; +s32 D_8012649C; +s32 D_801264A0[12]; +s32 D_801264D0; +s32 D_801264D4; +s8 D_801264D8; +s32 D_801264DC; +s8 D_801264E0; +s8 D_801264E1; +s8 D_801264E2; +s32 D_801264E4; +s32 D_801264E8; +s32 D_801264EC; +s32 D_801264F0[2]; +s32 D_801264F8[2]; +s32 D_80126500; +s8 D_80126504; +s32 D_80126508; +s16 D_8012650C; +s8 D_8012650E; +s32 D_80126510; +s16 D_80126514; +s8 D_80126516; +s32 D_80126518; +s32 D_8012651C; +s32 D_80126520; +s32 D_80126524; +s32 D_80126528; +s32 D_8012652C; +Settings *D_80126530[4]; +s8 D_80126540; +s8 D_80126541; +s32 D_80126544; +s32 D_80126548; +u32* D_80126550[67]; // lookup table? +s32 D_8012665C; +s32 D_80126660; +s32 D_80126664; +s32 D_80126668[58]; +u8 D_80126750[128]; +s32 D_801267D0; +s32 D_801267D4; +s32 D_801267D8[3]; +s32 D_801267E4; +s32 D_801267E8; +s8* D_801267EC; +s32 D_801267F0[5]; +s32 D_80126804; +s32 D_80126808; +s32 D_8012680C; +s32 D_80126810; +s32 D_80126814; +s32 D_80126818; +s32 D_8012681C; +s32 D_80126820; +s32 D_80126824; +s32 D_80126828; +s32 D_8012682C; +s32 D_80126830; +s32 D_80126834; +s16 D_80126838; +s16 D_8012683A; +s32 D_8012683C; +s32 D_80126840; +s32 D_80126844; +s32 D_80126848; +s32 D_8012684C; +s32 D_80126850; +s32 D_80126854; +s32 D_80126858; +s32 D_8012685C; +s32 D_80126860; +s32 D_80126864; +s32 D_80126868; +s32 D_8012686C; +s32 D_80126870; +s32 D_80126874; +s32 D_80126878[24]; +s32 D_801268D8; +s32 D_801268DC; +s32 D_801268E0; +s32 D_801268E4; +s32 D_801268E8[12]; +s32 D_80126918[3]; +s32 D_80126924; +s32 D_80126928; +s32 D_8012692C; +s32 D_80126930[36]; +s8 gPlayerVehicle[4]; // Unknown number of entries. +s32 D_801269C4; +s32 D_801269C8; +s32 D_801269CC; +s32 D_801269D0[3]; +s32 D_801269DC; +u32* D_801269E0; +s32 D_801269E4; +s32 D_801269E8; +s32 D_801269EC; +s32 D_801269F0; +s32 D_801269F4; +s32 D_801269F8; +s32 D_801269FC; +s32 D_80126A00; +s32 D_80126A04; +s32 D_80126A08; +s32 D_80126A0C; +s32 D_80126A10; +s32 D_80126A14; +s32 D_80126A18; +s32 D_80126A1C; +s32 D_80126A20[4]; +s32 D_80126A30; +s32 D_80126A34; +s32 D_80126A38; +s32 D_80126A3C; +s32 D_80126A40[8]; +s8 D_80126A60[2]; +s32 D_80126A64; +s32 D_80126A68; +s32 D_80126A6C; +s32 D_80126A70; +s32 D_80126A74; +s32 D_80126A78; +s32 D_80126A7C; +s32 D_80126A80[4]; +s32 D_80126A90; +s32 D_80126A94; +s32 D_80126A98; +s32 D_80126A9C; +s32* D_80126AA0[16]; +s32 D_80126AE0[16]; +s32 D_80126B20[16]; +s32 D_80126B60[4]; +s32 D_80126B70[16]; +s32 D_80126BB0; +s32 D_80126BB4; +s32 D_80126BB8; +s32 D_80126BBC; +s32 D_80126BC0; +s32 D_80126BC4; +s32 D_80126BC8; +s32 D_80126BCC; +s32 D_80126BD0; +s32 D_80126BD4; +s32 D_80126BD8; +f32 D_80126BDC; +s32 D_80126BE0; +s32 D_80126BE4; +s32 D_80126BE8; +f32 D_80126BEC; +s32 D_80126BF0[8]; +s32 D_80126C10; +s32 D_80126C14; +s32 D_80126C18; +s32 D_80126C1C; +s32 D_80126C20; +s32 D_80126C24; +s32 D_80126C28; +s32 *D_80126C2C; +u16 (*D_80126C30)[30]; // Cheat table. +s32 D_80126C34; +s32 D_80126C38; +s32 D_80126C3C; +u16 D_80126C40; +u16 D_80126C42; +u16 D_80126C44; +s16 D_80126C46; +s32 D_80126C48; +s16 D_80126C4C; +f32 D_80126C50; +s8 D_80126C54; +s8 D_80126C55; +s8 D_80126C56; +s8 D_80126C57; +u8 D_80126C58[20]; +s32 *D_80126C6C; +s32 D_80126C70; +s32 D_80126C74; +s32 D_80126C78; +s32 D_80126C7C; +s32 D_80126C80[16]; +s32 D_80126CC0; + +/******************************/ + /************ .data ************/ s8 D_800DF450 = 0; @@ -330,14 +579,6 @@ s32* D_800DFBE0[10] = { s32 D_800DFC08 = 0; // Currently unknown, might be a different type. s32 D_800DFC0C = 0xFFFF; // Currently unknown, might be a different type. -typedef struct unk800DFC10 { - u32 *unk0; - s16 unk4; - s16 unk6; - u32 *unk8; - s32 unkC; -} unk800DFC10; - unk800DFC10 D_800DFC10 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800DFC20 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800DFC30 = { NULL, 0, 0, NULL, 0 }; @@ -859,15 +1100,17 @@ MenuElement D_800E0CEC[11] = { }; + + MenuElement D_800E0E4C[9] = { { 481, 174, 161, 174, -159, 174, 0, 0, 0, 255, 128, 0, 12, 0, NULL, 0, 0, 0, 0 }, { 479, 172, 159, 172, -161, 172, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, { 368, 192, 48, 192, -272, 192, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, { 506, 187, 186, 187, -134, 187, 255, 192, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, - { 578, 192, 258, 192, -62, 192, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126390, 0, 0, 0, 0 }, + { 578, 192, 258, 192, -62, 192, 255, 128, 255, 96, 255, 0, 12, 0, &D_80126390, 0, 0, 0, 0 }, { 368, 212, 48, 212, -272, 212, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, { 506, 207, 186, 207, -134, 207, 128, 255, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, - { 578, 212, 258, 212, -62, 212, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126394, 0, 0, 0, 0 }, + { 578, 212, 258, 212, -62, 212, 255, 128, 255, 96, 255, 0, 12, 0, &D_80126394, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 }, }; @@ -1309,7 +1552,7 @@ s16 D_800E1E08[4] = { 0, 0, 0x34, -1 }; -s32 *D_800E1E10 = (s32 *)0x800E8200; +s32 *D_800E1E10 = " (ADV."; s32 D_800E1E14 = 0; s32 D_800E1E18 = 0; @@ -1335,7 +1578,6 @@ s16 D_800E1E40[10] = { /************ .rodata ************/ -const char D_800E8200[] = " (ADV."; const char D_800E8208[] = "OK?"; const char D_800E820C[] = "~"; const char D_800E8210[] = "DEL"; @@ -1353,110 +1595,6 @@ const char D_800E8250[] = "loadFrontEndItem() - Item no %d out of range 0-%d\n"; /*********************************/ -/************ .bss ************/ - -extern Gfx *D_801263A0; -extern s32 D_801263A8; -extern s32 D_801263AC; -extern s8 D_801263B4; -extern s32 D_801263BC; -extern s32 D_801263C4; -extern s8 D_801263D4[4]; -extern s8 D_801263DC[4]; -extern s32 D_801263D8; -extern s32 D_801263E0; -extern s8 players_character_array[8]; -extern s8 D_801263F0[8]; -extern u8 D_80126418[8]; -extern u8 D_80126420[8]; -extern s64 D_80126448; -extern f32 D_80126450; -extern u8 D_80126454[4]; -extern u8 D_80126458[4]; -extern s8 D_8012645C[4]; -extern s8 D_80126464[4]; -extern u8 D_80126468[4]; -extern u8 D_8012646C[4]; -extern s32 D_80126470; -extern s32 D_80126484; -extern s32 D_80126488; -extern s8 D_801264D8; -extern s8 D_801264E2; -extern s8 D_80126504; -extern s8 D_8012650E; -extern s8 D_80126516; -extern Settings *D_80126530[3]; -extern s32 D_80126548; -extern u32* D_80126550[1]; // lookup table? Unknown number of entries. -extern u8 D_80126750[1]; // unknown number of entries -extern s32 D_801267D0; -extern s8* D_801267EC; -extern s32 D_80126804; -extern s32 D_80126824; -extern s32 D_8012683C; -extern s32 D_80126840; -extern s32 D_80126844; -extern s32 D_8012684C; -extern s32 D_80126854; -extern s32 D_80126858; -extern s32 D_8012685C; -extern s32 D_80126860; -extern s8 p1_vehicle[4]; // Unknown number of entries. -extern s32 D_801269C8; -extern s32 D_801269CC; -extern u32* D_801269E0; -extern s32 D_801269FC; -extern s32 D_80126A00; -extern s32 D_80126A04; -extern s32 D_80126A08; -extern s32 D_80126A0C; -extern s32 D_80126A10; -extern s32 D_80126A14; -extern s32 D_80126A18; -extern s32 D_80126A1C; -extern s32 D_80126A20[8]; // Unknown number of entries. -extern s8 D_80126A60[2]; -extern s32 D_80126A64; -extern s32 D_80126A68; -extern s32 D_80126A6C; -extern s32 D_80126A94; -extern s32* D_80126AA0[16]; -extern s32 D_80126BB4; -extern s32 D_80126BB8; -extern s32 D_80126BBC; -extern s32 D_80126BC4; -extern s32 D_80126BC8; -extern s32 D_80126BCC; -extern s32 D_80126BD0; -extern s32 D_80126BD4; -extern s32 D_80126BD8; -extern f32 D_80126BDC; -extern s32 D_80126BE0; -extern f32 D_80126BEC; -extern s32 D_80126BE4; -extern s32 D_80126BF0[3]; -extern s32 D_80126C10; -extern s32 D_80126C14; -extern s32 *D_80126C2C; -extern u16 *D_80126C30[30]; // Cheat table. -extern s32 D_80126C34; -extern s32 D_80126C3C; -extern u16 D_80126C40; -extern u16 D_80126C42; -extern s16 D_80126C46; -extern u16 D_80126C44; -extern s32 D_80126C48; -extern s16 D_80126C4C; -extern u8 D_80126C58; -extern f32 D_80126C50; -extern s32 *D_80126C6C; -extern s32 D_80126C70; -extern s32 D_80126C74; -extern s32 D_80126C78; -extern s32 D_80126CC0; - -/******************************/ - Settings *get_settings(void); void func_8009C4A8(s16 *arg0); void func_8009C674(s16 *arg0); @@ -1738,8 +1876,6 @@ void func_800841B8(s32 arg0) { #if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") #else - -extern s32 D_8012644C; void func_80084734(void); void set_language(s32 language); @@ -1797,7 +1933,7 @@ s32 MenuOptionsLoop(s32 arg0) { func_80001D04(0xEB, 0); } else if (D_800DF460 == 1 && analogX != 0) { // Enable/Disable subtitles. - if (D_8012644C & 0x2000000) { + if (D_80126448+4 & 0x2000000) { func_80001D04(0xEB, 0); func_8009EABC(0, 0x2000000); func_800C2AF4(0); @@ -2367,7 +2503,7 @@ void menu_magic_codes_init(void) { D_80126C44 = 0; D_80126470 = 0; D_80126C4C = -1; - D_80126C58 = 0; + D_80126C58[0] = 0; D_801263BC = 0; D_800DF47C = 0; D_801263D8 = 0; @@ -2949,7 +3085,7 @@ void func_8008DC7C(s32 arg0) { temp_a1 = D_8012645C; if (D_800DF4BC == 2) { phi_v1 = phi_v1 | func_8006A554(1); - temp_a1 += D_8012645D; + temp_a1 += D_8012645C+1; } if (D_80126494 == 0) { @@ -3249,7 +3385,7 @@ void MenuLoadNewAreaInit(void) { D_801263BC = 0; D_800DF47C = 0; temp_s0 = settings->unk4C->unk2; - p1_vehicle = func_8006B0AC(temp_s0); + gPlayerVehicle = func_8006B0AC(temp_s0); temp_v0_2 = func_8006B14C(temp_s0); if (temp_v0_2 != 5) { if (temp_v0_2 != 8) { @@ -3586,7 +3722,7 @@ void MenuTrophyRaceRoundInit(void) { } for(i = 0; i < D_800DF4BC; i++){ - p1_vehicle[i] = func_8006B0AC(temp); + gPlayerVehicle[i] = func_8006B0AC(temp); } func_8006DB14(func_8006B0AC(temp)); @@ -3918,11 +4054,11 @@ s8 func_8009C23C(s32 arg0) { } s8 func_8009C250(s32 arg0) { - return p1_vehicle[arg0]; + return gPlayerVehicle[arg0]; } void func_8009C264(s32 arg0, s32 arg1) { - p1_vehicle[arg0] = arg1; + gPlayerVehicle[arg0] = arg1; } s8* func_8009C274(void) { diff --git a/undefined_syms.txt b/undefined_syms.txt index e8afc62c..1219c778 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,248 +25,217 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_80126320 = 0x80126320; -D_80126328 = 0x80126328; -D_8012632C = 0x8012632C; -D_80126330 = 0x80126330; -D_80126338 = 0x80126338; -D_8012633C = 0x8012633C; -D_80126340 = 0x80126340; -D_80126344 = 0x80126344; -D_80126348 = 0x80126348; -D_8012634C = 0x8012634C; -D_80126350 = 0x80126350; -D_80126354 = 0x80126354; -D_80126358 = 0x80126358; -D_8012635C = 0x8012635C; -D_80126360 = 0x80126360; -D_80126364 = 0x80126364; -D_80126368 = 0x80126368; -D_8012636C = 0x8012636C; -D_80126370 = 0x80126370; -D_80126374 = 0x80126374; -D_80126378 = 0x80126378; -D_8012637C = 0x8012637C; -D_80126380 = 0x80126380; -D_80126382 = 0x80126382; -D_80126384 = 0x80126384; -D_80126390 = 0x80126390; -D_80126394 = 0x80126394; -D_80126398 = 0x80126398; -D_8012639C = 0x8012639C; -D_801263A0 = 0x801263A0; -D_801263A4 = 0x801263A4; -D_801263A8 = 0x801263A8; -D_801263AC = 0x801263AC; -D_801263B0 = 0x801263B0; -D_801263B4 = 0x801263B4; -D_801263B8 = 0x801263B8; -D_801263BC = 0x801263BC; -D_801263C0 = 0x801263C0; -D_801263C4 = 0x801263C4; -D_801263C8 = 0x801263C8; -D_801263CC = 0x801263CC; -D_801263D0 = 0x801263D0; -D_801263D4 = 0x801263D4; -D_801263D5 = 0x801263D5; -D_801263D6 = 0x801263D6; -D_801263D7 = 0x801263D7; -D_801263D8 = 0x801263D8; -D_801263DC = 0x801263DC; -D_801263E0 = 0x801263E0; -players_character_array = 0x801263E8; -D_801263F0 = 0x801263F0; -D_801263F8 = 0x801263F8; -D_80126418 = 0x80126418; -D_80126420 = 0x80126420; -D_80126428 = 0x80126428; -D_80126430 = 0x80126430; -D_80126431 = 0x80126431; -D_80126438 = 0x80126438; -D_80126448 = 0x80126448; -D_8012644C = 0x8012644C; -D_80126450 = 0x80126450; -D_80126454 = 0x80126454; -D_80126458 = 0x80126458; -D_8012645C = 0x8012645C; -D_8012645D = 0x8012645D; -D_80126460 = 0x80126460; -D_80126464 = 0x80126464; -D_80126465 = 0x80126465; -D_80126468 = 0x80126468; -D_8012646C = 0x8012646C; -D_80126470 = 0x80126470; -D_80126474 = 0x80126474; -D_80126478 = 0x80126478; -D_8012647C = 0x8012647C; -D_80126480 = 0x80126480; -D_80126484 = 0x80126484; -D_80126488 = 0x80126488; -D_8012648C = 0x8012648C; -D_80126490 = 0x80126490; -D_80126494 = 0x80126494; -D_80126498 = 0x80126498; -D_801264A0 = 0x801264A0; -D_801264D0 = 0x801264D0; -D_801264D4 = 0x801264D4; -D_801264D8 = 0x801264D8; -D_801264DC = 0x801264DC; -D_801264E2 = 0x801264E2; -D_801264E4 = 0x801264E4; -D_801264EC = 0x801264EC; -D_801264F8 = 0x801264F8; -D_80126504 = 0x80126504; -D_80126508 = 0x80126508; -D_8012650E = 0x8012650E; -D_80126510 = 0x80126510; -D_80126516 = 0x80126516; -D_80126518 = 0x80126518; -D_80126520 = 0x80126520; -D_80126530 = 0x80126530; -D_80126534 = 0x80126534; -D_80126538 = 0x80126538; -D_8012653C = 0x8012653C; -D_80126540 = 0x80126540; -D_80126541 = 0x80126541; -D_80126548 = 0x80126548; -D_80126550 = 0x80126550; -D_8012665C = 0x8012665C; -D_80126660 = 0x80126660; -D_80126664 = 0x80126664; -D_80126750 = 0x80126750; -D_801267D0 = 0x801267D0; -D_801267D8 = 0x801267D8; -D_801267E4 = 0x801267E4; -D_801267E8 = 0x801267E8; -D_801267EC = 0x801267EC; -D_801267F0 = 0x801267F0; -D_80126804 = 0x80126804; -D_80126808 = 0x80126808; -D_8012680C = 0x8012680C; -D_80126810 = 0x80126810; -D_80126814 = 0x80126814; -D_80126818 = 0x80126818; -D_80126820 = 0x80126820; -D_80126824 = 0x80126824; -D_80126828 = 0x80126828; -D_80126830 = 0x80126830; -D_80126838 = 0x80126838; -D_8012683A = 0x8012683A; -D_8012683C = 0x8012683C; -D_80126840 = 0x80126840; -D_80126844 = 0x80126844; -D_80126848 = 0x80126848; -D_8012684C = 0x8012684C; -D_80126850 = 0x80126850; -D_80126854 = 0x80126854; -D_80126858 = 0x80126858; -D_8012685C = 0x8012685C; -D_80126860 = 0x80126860; -D_80126864 = 0x80126864; -D_80126868 = 0x80126868; -D_8012686C = 0x8012686C; -D_80126870 = 0x80126870; -D_80126874 = 0x80126874; -D_80126878 = 0x80126878; -D_801268D8 = 0x801268D8; -D_801268DC = 0x801268DC; -D_801268E0 = 0x801268E0; -D_801268E8 = 0x801268E8; -D_80126918 = 0x80126918; -D_80126924 = 0x80126924; -D_80126928 = 0x80126928; -D_8012692C = 0x8012692C; -D_80126930 = 0x80126930; -p1_vehicle = 0x801269C0; -p2_vehicle = 0x801269C1; -D_801269C4 = 0x801269C4; -D_801269C8 = 0x801269C8; -D_801269CC = 0x801269CC; -D_801269D0 = 0x801269D0; -D_801269DC = 0x801269DC; -D_801269E0 = 0x801269E0; -D_801269E4 = 0x801269E4; -D_801269E8 = 0x801269E8; -D_801269EC = 0x801269EC; -D_801269F0 = 0x801269F0; -D_801269F4 = 0x801269F4; -D_801269F8 = 0x801269F8; -D_801269FC = 0x801269FC; -D_80126A00 = 0x80126A00; -D_80126A04 = 0x80126A04; -D_80126A08 = 0x80126A08; -D_80126A0C = 0x80126A0C; -D_80126A10 = 0x80126A10; -D_80126A14 = 0x80126A14; -D_80126A18 = 0x80126A18; -D_80126A1C = 0x80126A1C; -D_80126A20 = 0x80126A20; -D_80126A30 = 0x80126A30; -D_80126A34 = 0x80126A34; -D_80126A38 = 0x80126A38; -D_80126A3C = 0x80126A3C; -D_80126A40 = 0x80126A40; -D_80126A60 = 0x80126A60; -D_80126A64 = 0x80126A64; -D_80126A68 = 0x80126A68; -D_80126A6C = 0x80126A6C; -D_80126A70 = 0x80126A70; -D_80126A74 = 0x80126A74; -D_80126A78 = 0x80126A78; -D_80126A80 = 0x80126A80; -D_80126A90 = 0x80126A90; -D_80126A94 = 0x80126A94; -D_80126A98 = 0x80126A98; -D_80126AA0 = 0x80126AA0; -D_80126AE0 = 0x80126AE0; -D_80126B20 = 0x80126B20; -D_80126B60 = 0x80126B60; -D_80126B70 = 0x80126B70; -D_80126BB0 = 0x80126BB0; -D_80126BB4 = 0x80126BB4; -D_80126BB8 = 0x80126BB8; -D_80126BBC = 0x80126BBC; -D_80126BC0 = 0x80126BC0; -D_80126BC4 = 0x80126BC4; -D_80126BC8 = 0x80126BC8; -D_80126BCC = 0x80126BCC; -D_80126BD0 = 0x80126BD0; -D_80126BD4 = 0x80126BD4; -D_80126BD8 = 0x80126BD8; -D_80126BDC = 0x80126BDC; -D_80126BE0 = 0x80126BE0; -D_80126BE4 = 0x80126BE4; -D_80126BE8 = 0x80126BE8; -D_80126BEC = 0x80126BEC; -D_80126BF0 = 0x80126BF0; -D_80126C10 = 0x80126C10; -D_80126C14 = 0x80126C14; -D_80126C18 = 0x80126C18; -D_80126C1C = 0x80126C1C; -D_80126C20 = 0x80126C20; -D_80126C24 = 0x80126C24; -D_80126C28 = 0x80126C28; -D_80126C2C = 0x80126C2C; -D_80126C30 = 0x80126C30; -D_80126C34 = 0x80126C34; -D_80126C38 = 0x80126C38; -D_80126C3C = 0x80126C3C; -D_80126C40 = 0x80126C40; -D_80126C42 = 0x80126C42; -D_80126C44 = 0x80126C44; -D_80126C46 = 0x80126C46; -D_80126C48 = 0x80126C48; -D_80126C4C = 0x80126C4C; -D_80126C50 = 0x80126C50; -D_80126C54 = 0x80126C54; -D_80126C57 = 0x80126C57; -D_80126C58 = 0x80126C58; -D_80126C6C = 0x80126C6C; -D_80126C70 = 0x80126C70; -D_80126C74 = 0x80126C74; -D_80126C78 = 0x80126C78; -D_80126C80 = 0x80126C80; -D_80126CC0 = 0x80126CC0; +/D_80126390 = 0x80126390; +/D_80126394 = 0x80126394; +/D_80126398 = 0x80126398; +/D_8012639C = 0x8012639C; +/D_801263A0 = 0x801263A0; +/D_801263A4 = 0x801263A4; +/D_801263A8 = 0x801263A8; +/D_801263AC = 0x801263AC; +/D_801263B0 = 0x801263B0; +/D_801263B4 = 0x801263B4; +/D_801263B8 = 0x801263B8; +/D_801263BC = 0x801263BC; +/D_801263C0 = 0x801263C0; +/D_801263C4 = 0x801263C4; +/D_801263C8 = 0x801263C8; +/D_801263CC = 0x801263CC; +/D_801263D0 = 0x801263D0; +/D_801263D4 = 0x801263D4; +/D_801263D8 = 0x801263D8; +/D_801263DC = 0x801263DC; +/D_801263E0 = 0x801263E0; +/players_character_array = 0x801263E8; +/D_801263F0 = 0x801263F0; +/D_801263F8 = 0x801263F8; +/D_80126418 = 0x80126418; +/D_80126420 = 0x80126420; +/D_80126428 = 0x80126428; +/D_80126430 = 0x80126430; +/D_80126431 = 0x80126431; +/D_80126438 = 0x80126438; +/D_80126448 = 0x80126448; +/D_80126450 = 0x80126450; +/D_80126454 = 0x80126454; +/D_80126458 = 0x80126458; +/D_8012645C = 0x8012645C; +/D_80126460 = 0x80126460; +/D_80126464 = 0x80126464; +/D_80126468 = 0x80126468; +/D_8012646C = 0x8012646C; +/D_80126470 = 0x80126470; +/D_80126474 = 0x80126474; +/D_80126478 = 0x80126478; +/D_8012647C = 0x8012647C; +/D_80126480 = 0x80126480; +/D_80126484 = 0x80126484; +/D_80126488 = 0x80126488; +/D_8012648C = 0x8012648C; +/D_80126490 = 0x80126490; +/D_80126494 = 0x80126494; +/D_80126498 = 0x80126498; + +/D_801264A0 = 0x801264A0; +/D_801264D0 = 0x801264D0; +/D_801264D4 = 0x801264D4; +/D_801264D8 = 0x801264D8; +/D_801264DC = 0x801264DC; +/D_801264E2 = 0x801264E2; +/D_801264E4 = 0x801264E4; +/D_801264EC = 0x801264EC; +/D_801264F8 = 0x801264F8; + +/D_80126504 = 0x80126504; +/D_80126508 = 0x80126508; +/D_8012650E = 0x8012650E; +/D_80126510 = 0x80126510; +/D_80126516 = 0x80126516; +/D_80126518 = 0x80126518; +/D_80126520 = 0x80126520; + +/D_80126530 = 0x80126530; +/D_80126540 = 0x80126540; +/D_80126541 = 0x80126541; +/D_80126548 = 0x80126548; +/D_80126550 = 0x80126550; +/D_8012665C = 0x8012665C; +/D_80126660 = 0x80126660; +/D_80126664 = 0x80126664; +/D_80126750 = 0x80126750; +/D_801267D0 = 0x801267D0; +/D_801267D8 = 0x801267D8; +/D_801267E4 = 0x801267E4; +/D_801267E8 = 0x801267E8; +/D_801267EC = 0x801267EC; +/D_801267F0 = 0x801267F0; +/D_80126804 = 0x80126804; +/D_80126808 = 0x80126808; +/D_8012680C = 0x8012680C; +/D_80126810 = 0x80126810; +/D_80126814 = 0x80126814; +/D_80126818 = 0x80126818; +/D_80126820 = 0x80126820; +/D_80126824 = 0x80126824; +/D_80126828 = 0x80126828; +/D_80126830 = 0x80126830; +/D_80126838 = 0x80126838; +/D_8012683A = 0x8012683A; +/D_8012683C = 0x8012683C; +/D_80126840 = 0x80126840; +/D_80126844 = 0x80126844; +/D_80126848 = 0x80126848; +/D_8012684C = 0x8012684C; +/D_80126850 = 0x80126850; +/D_80126854 = 0x80126854; +/D_80126858 = 0x80126858; +/D_8012685C = 0x8012685C; +/D_80126860 = 0x80126860; +/D_80126864 = 0x80126864; +/D_80126868 = 0x80126868; +/D_8012686C = 0x8012686C; +/D_80126870 = 0x80126870; +/D_80126874 = 0x80126874; +/D_80126878 = 0x80126878; +/D_801268D8 = 0x801268D8; +/D_801268DC = 0x801268DC; +/D_801268E0 = 0x801268E0; +/D_801268E8 = 0x801268E8; +/D_80126918 = 0x80126918; +/D_80126924 = 0x80126924; +/D_80126928 = 0x80126928; +/D_8012692C = 0x8012692C; +/D_80126930 = 0x80126930; +/gPlayerVehicle = 0x801269C0; +/D_801269C4 = 0x801269C4; +/D_801269C8 = 0x801269C8; +/D_801269CC = 0x801269CC; +/D_801269D0 = 0x801269D0; +/D_801269DC = 0x801269DC; +/D_801269E0 = 0x801269E0; +/D_801269E4 = 0x801269E4; +/D_801269E8 = 0x801269E8; +/D_801269EC = 0x801269EC; +/D_801269F0 = 0x801269F0; +/D_801269F4 = 0x801269F4; +/D_801269F8 = 0x801269F8; +/D_801269FC = 0x801269FC; +/D_80126A00 = 0x80126A00; +/D_80126A04 = 0x80126A04; +/D_80126A08 = 0x80126A08; +/D_80126A0C = 0x80126A0C; +/D_80126A10 = 0x80126A10; +/D_80126A14 = 0x80126A14; +/D_80126A18 = 0x80126A18; +/D_80126A1C = 0x80126A1C; +/D_80126A20 = 0x80126A20; +/D_80126A30 = 0x80126A30; +/D_80126A34 = 0x80126A34; +/D_80126A38 = 0x80126A38; +/D_80126A3C = 0x80126A3C; +/D_80126A40 = 0x80126A40; +/D_80126A60 = 0x80126A60; +/D_80126A64 = 0x80126A64; +/D_80126A68 = 0x80126A68; +/D_80126A6C = 0x80126A6C; +/D_80126A70 = 0x80126A70; +/D_80126A74 = 0x80126A74; +/D_80126A78 = 0x80126A78; +/D_80126A80 = 0x80126A80; +/D_80126A90 = 0x80126A90; +/D_80126A94 = 0x80126A94; +/D_80126A98 = 0x80126A98; +/D_80126AA0 = 0x80126AA0; +/D_80126AE0 = 0x80126AE0; +/D_80126B20 = 0x80126B20; +/D_80126B60 = 0x80126B60; +/D_80126B70 = 0x80126B70; +/D_80126BB0 = 0x80126BB0; +/D_80126BB4 = 0x80126BB4; +/D_80126BB8 = 0x80126BB8; +/D_80126BBC = 0x80126BBC; +/D_80126BC0 = 0x80126BC0; +/D_80126BC4 = 0x80126BC4; +/D_80126BC8 = 0x80126BC8; +/D_80126BCC = 0x80126BCC; +/D_80126BD0 = 0x80126BD0; +/D_80126BD4 = 0x80126BD4; +/D_80126BD8 = 0x80126BD8; +/D_80126BDC = 0x80126BDC; +/D_80126BE0 = 0x80126BE0; +/D_80126BE4 = 0x80126BE4; +/D_80126BE8 = 0x80126BE8; +/D_80126BEC = 0x80126BEC; +/D_80126BF0 = 0x80126BF0; +/D_80126C10 = 0x80126C10; +/D_80126C14 = 0x80126C14; +/D_80126C18 = 0x80126C18; +/D_80126C1C = 0x80126C1C; +/D_80126C20 = 0x80126C20; +/D_80126C24 = 0x80126C24; +/D_80126C28 = 0x80126C28; +/D_80126C2C = 0x80126C2C; +/D_80126C30 = 0x80126C30; +/D_80126C34 = 0x80126C34; +/D_80126C38 = 0x80126C38; +/D_80126C3C = 0x80126C3C; +/D_80126C40 = 0x80126C40; +/D_80126C42 = 0x80126C42; +/D_80126C44 = 0x80126C44; +/D_80126C46 = 0x80126C46; +/D_80126C48 = 0x80126C48; +/D_80126C4C = 0x80126C4C; +/D_80126C50 = 0x80126C50; +/D_80126C54 = 0x80126C54; +/D_80126C57 = 0x80126C57; +/D_80126C58 = 0x80126C58; +/D_80126C6C = 0x80126C6C; +/D_80126C70 = 0x80126C70; +/D_80126C74 = 0x80126C74; +/D_80126C78 = 0x80126C78; +/D_80126C80 = 0x80126C80; +/D_80126CC0 = 0x80126CC0; + D_80126CD0 = 0x80126CD0; D_80126CD1 = 0x80126CD1; D_80126CD2 = 0x80126CD2; From 3f511c5c84d31b7586f57f4528c8d5cac201e094 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 19:04:01 -0500 Subject: [PATCH 17/39] Added bss for unknown_09F8F0 & unknown_0AEE70 --- bss.txt | 371 ------------------------------------------- src/unknown_07B870.c | 2 +- src/unknown_09F8F0.c | 106 +++++++++++-- src/unknown_0AEE70.c | 101 ++++++++++++ undefined_syms.txt | 356 ----------------------------------------- 5 files changed, 193 insertions(+), 743 deletions(-) diff --git a/bss.txt b/bss.txt index 76d0a240..a7c9b8f0 100644 --- a/bss.txt +++ b/bss.txt @@ -43,381 +43,10 @@ unknown_07AF10 unknown_07B870 unknown_080500 -D_80126390; -D_80126394; -D_80126398; -D_8012639C; -D_801263A0; -D_801263A4; -D_801263A8; -D_801263AC; -D_801263B0; -D_801263B4; -D_801263B8; -D_801263BC; -D_801263C0; -D_801263C4; -D_801263C8; -D_801263CC; -D_801263D0; -D_801263D4; -D_801263D5; -D_801263D6; -D_801263D7; -D_801263D8; -D_801263DC; -D_801263E0; -players_character_array; -D_801263F0; -D_801263F8; -D_80126418; -D_80126420; -D_80126428; -D_80126430; -D_80126431; -D_80126438; -D_80126448; -D_8012644C; -D_80126450; -D_80126454; -D_80126458; -D_8012645C; -D_8012645D; -D_80126460; -D_80126464; -D_80126465; -D_80126468; -D_8012646C; -D_80126470; -D_80126474; -D_80126478; -D_8012647C; -D_80126480; -D_80126484; -D_80126488; -D_8012648C; -D_80126490; -D_80126494; -D_80126498; -D_801264A0; -D_801264D0; -D_801264D4; -D_801264D8; -D_801264DC; -D_801264E2; -D_801264E4; -D_801264EC; -D_801264F8; -D_80126504; -D_80126508; -D_8012650E; -D_80126510; -D_80126516; -D_80126518; -D_80126520; -D_80126530; -D_80126534; -D_80126538; -D_8012653C; -D_80126540; -D_80126541; -D_80126548; -D_80126550; -D_8012665C; -D_80126660; -D_80126664; -D_80126750; -D_801267D0; -D_801267D8; -D_801267E4; -D_801267E8; -D_801267EC; -D_801267F0; -D_80126804; -D_80126808; -D_8012680C; -D_80126810; -D_80126814; -D_80126818; -D_80126820; -D_80126824; -D_80126828; -D_80126830; -D_80126838; -D_8012683A; -D_8012683C; -D_80126840; -D_80126844; -D_80126848; -D_8012684C; -D_80126850; -D_80126854; -D_80126858; -D_8012685C; -D_80126860; -D_80126864; -D_80126868; -D_8012686C; -D_80126870; -D_80126874; -D_80126878; -D_801268D8; -D_801268DC; -D_801268E0; -D_801268E8; -D_80126918; -D_80126924; -D_80126928; -D_8012692C; -D_80126930; -p1_vehicle; -p2_vehicle; -D_801269C4; -D_801269C8; -D_801269CC; -D_801269D0; -D_801269DC; -D_801269E0; -D_801269E4; -D_801269E8; -D_801269EC; -D_801269F0; -D_801269F4; -D_801269F8; -D_801269FC; -D_80126A00; -D_80126A04; -D_80126A08; -D_80126A0C; -D_80126A10; -D_80126A14; -D_80126A18; -D_80126A1C; -D_80126A20; -D_80126A30; -D_80126A34; -D_80126A38; -D_80126A3C; -D_80126A40; -D_80126A60; -D_80126A64; -D_80126A68; -D_80126A6C; -D_80126A70; -D_80126A74; -D_80126A78; -D_80126A80; -D_80126A90; -D_80126A94; -D_80126A98; -D_80126AA0; -D_80126AE0; -D_80126B20; -D_80126B60; -D_80126B70; -D_80126BB0; -D_80126BB4; -D_80126BB8; -D_80126BBC; -D_80126BC0; -D_80126BC4; -D_80126BC8; -D_80126BCC; -D_80126BD0; -D_80126BD4; -D_80126BD8; -D_80126BDC; -D_80126BE0; -D_80126BE4; -D_80126BE8; -D_80126BEC; -D_80126BF0; -D_80126C10; -D_80126C14; -D_80126C18; -D_80126C1C; -D_80126C20; -D_80126C24; -D_80126C28; -D_80126C2C; -D_80126C30; -D_80126C34; -D_80126C38; -D_80126C3C; -D_80126C40; -D_80126C42; -D_80126C44; -D_80126C46; -D_80126C48; -D_80126C4C; -D_80126C50; -D_80126C54; -D_80126C57; -D_80126C58; -D_80126C6C; -D_80126C70; -D_80126C74; -D_80126C78; -D_80126C80; -D_80126CC0; - unknown_09F8F0 -D_80126CD0; -D_80126CD1; -D_80126CD2; -D_80126CD3; -D_80126CD4; -D_80126CD5; -D_80126CD8; -D_80126CDC; -D_80126CE0; -D_80126CEC; -D_80126CF0; -D_80126CF4; -D_80126CF8; -D_80126CFC; -D_80126D00; -D_80126D04; -D_80126D08; -D_80126D0C; -D_80126D10; -D_80126D14; -D_80126D18; -D_80126D1C; -D_80126D20; -D_80126D24; -D_80126D28; -D_80126D2C; -D_80126D30; -D_80126D34; -D_80126D35; -D_80126D36; -D_80126D37; -D_80126D38; -D_80126D3C; -D_80126D40; -D_80126D44; -D_80126D48; -D_80126D4C; -D_80126D50; -D_80126D54; -D_80126D55; -D_80126D56; -D_80126D58; -D_80126D5C; -D_80126D60; -D_80126D64; -D_80126D65; -D_80126D66; -D_80126D67; -D_80126D68; -D_80126D69; -D_80126D6C; -D_80126D70; -D_80126D71; -D_80126D74; -D_80126D78; -D_80126D7C; -D_80126D80; -D_80127180; -D_80127184; -D_80127188; -D_80127189; -D_8012718A; -D_8012718B; -D_8012718C; -D_80127190; -D_80127194; - - -unknown_078050 -D_801271B0; - - -unknown_09F8F0 -D_80127BB0; -D_80127BB4; -D_80127BB8; -D_80127BF8; -D_80127C00; -D_80127C04; -D_80127C08; -D_80127C0C; -D_80127C10; -D_80127C14; -D_80127C18; -D_80127C1C; -D_80127C20; -D_80127C24; -D_80127C28; -D_80127C2C; -D_80127C30; -D_80127C40; -D_80127C80; - unknown_0AEE70 -D_80127C88; -D_80127CA0; -D_80127CA4; -D_80127CA8; -D_80127CAC; -D_80127CAE; -D_80127CB0; -D_80127CB2; -D_80127CB4; -D_80127CB8; -D_80127CBC; -D_80127CC0; -D_80127CC4; -D_80127CC8; -D_80127CCC; -D_80127CD0; -D_80127CD2; -D_80127CD8; -D_801285D8; -D_801295E0; -D_80129790; -D_801297A8; -D_801297C8; -D_801297E8; -D_80129800; -D_80129824; -D_8012982C; -D_80129834; -D_8012983C; -D_80129844; -D_8012984C; -D_80129854; -D_8012985C; -D_80129864; -D_8012986C; -D_80129874; -D_8012987C; -D_80129884; -D_8012988C; -D_80129894; -D_8012989C; -D_801298A4; -D_801298AC; -D_801298B4; -D_801298BC; -D_801298C4; -D_801298CC; -D_801298D4; -D_801298DC; -D_801298E4; -D_801298EC; -D_801298F4; -D_801298FC; -D_80129904; -D_80129918; -D_8012991C; -D_80129920; -D_80129924; -D_801299B0; - unknown_0C4800 piThreadStack; diff --git a/src/unknown_07B870.c b/src/unknown_07B870.c index 8b02b6d1..36863f6c 100644 --- a/src/unknown_07B870.c +++ b/src/unknown_07B870.c @@ -509,7 +509,7 @@ s16 D_80126380; s16 D_80126382; s16 D_80126384; -/*******************************/ +/******************************/ GLOBAL_ASM("asm/non_matchings/unknown_07B870/func_8007AC70.s") diff --git a/src/unknown_09F8F0.c b/src/unknown_09F8F0.c index 6331d4d9..3a5d2654 100644 --- a/src/unknown_09F8F0.c +++ b/src/unknown_09F8F0.c @@ -369,21 +369,97 @@ s16 D_800E2C98[4] = { /************ .bss ************/ -extern u8 D_80126CD0; -extern u8 D_80126CD1; -extern u8 D_80126CD2; -extern u8 D_80126CD3; -extern u8 D_80126CD4; -extern unk80126CDC* D_80126CDC; -extern u8 D_80126D34; -extern s32 D_80126D40; -extern unk80126D60* D_80126D60; -extern s32 D_80126D74; -extern s32 D_80126D78; -extern u16 D_80126D7C; -extern u8 D_80127188; -extern u8 D_8012718B; -extern unk80127BF8 D_80127BF8; +u8 D_80126CD0; +u8 D_80126CD1; +u8 D_80126CD2; +u8 D_80126CD3; +u8 D_80126CD4; +u8 D_80126CD5; +s32 D_80126CD8; +unk80126CDC* D_80126CDC; +s32 D_80126CE0; +s32 D_80126CE4; +s32 D_80126CE8; +s32 D_80126CEC; +s32 D_80126CF0; +s32 D_80126CF4; +s32 D_80126CF8; +s32 D_80126CFC; +s32 D_80126D00; +s32 D_80126D04; +s32 D_80126D08; +s32 D_80126D0C; +s32 D_80126D10; +s32 D_80126D14; +s32 D_80126D18; +s32 D_80126D1C; +s32 D_80126D20; +s32 D_80126D24; +s32 D_80126D28; +s32 D_80126D2C; +s32 D_80126D30; +u8 D_80126D34; +u8 D_80126D35; +u8 D_80126D36; +u8 D_80126D37; +s32 D_80126D38; +s32 D_80126D3C; +s32 D_80126D40; +s32 D_80126D44; +s32 D_80126D48; +s32 D_80126D4C; +s32 D_80126D50; +u8 D_80126D54; +u8 D_80126D55; +u8 D_80126D56; +s32 D_80126D58; +s32 D_80126D5C; +unk80126D60* D_80126D60; +u8 D_80126D64; +u8 D_80126D65; +u8 D_80126D66; +u8 D_80126D67; +u8 D_80126D68; +u8 D_80126D69; +s32 D_80126D6C; +u8 D_80126D70; +u8 D_80126D71; +s32 D_80126D74; +s32 D_80126D78; +u16 D_80126D7C; +s32 D_80126D80; +s32 D_80126D84; +s32 D_80126D88[254]; +s32 D_80127180; +s32 D_80127184; +u8 D_80127188; +u8 D_80127189; +u8 D_8012718A; +u8 D_8012718B; +s32 D_8012718C; +s32 D_80127190; +s32 D_80127194; +s32 D_80127198[6]; +s32 D_801271B0[640]; +s32 D_80127BB0; +s32 D_80127BB4; +s32 D_80127BB8[16]; +unk80127BF8 D_80127BF8; +s32 D_80127BFC; +s32 D_80127C00; +s32 D_80127C04; +s32 D_80127C08; +s32 D_80127C0C; +s32 D_80127C10; +s32 D_80127C14; +s32 D_80127C18; +s32 D_80127C1C; +s32 D_80127C20; +s32 D_80127C24; +s32 D_80127C28; +s32 D_80127C2C; +s32 D_80127C30[4]; +s32 D_80127C40[16]; /******************************/ diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index 813ec141..a0417f2b 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -159,6 +159,107 @@ s32 D_800E2EEC = 0x100; /*******************************/ +/************ .bss ************/ + +s32 D_80127C80; +s32 D_80127C84; +s32 D_80127C88[6]; +s32 D_80127CA0; +s32 D_80127CA4; +s32 D_80127CA8; +s16 D_80127CAC; +s16 D_80127CAE; +s16 D_80127CB0; +s16 D_80127CB2; +s32 D_80127CB4; +s32 D_80127CB8; +s32 D_80127CBC; +s32 D_80127CC0; +s32 D_80127CC4; +s32 D_80127CC8; +s32 D_80127CCC; +s16 D_80127CD0; +s16 D_80127CD2; +s32 D_80127CD4; +s32 D_80127CD8[576]; +s32 D_801285D8[1026]; +s32 D_801295E0[108]; +s32 D_80129790[6]; +s32 D_801297A8[8]; +s32 D_801297C8[8]; +s32 D_801297E8[6]; +s32 D_80129800[9]; +s32 D_80129824; +s32 D_80129828; +s32 D_8012982C; +s32 D_80129830; +s32 D_80129834; +s32 D_80129838; +s32 D_8012983C; +s32 D_80129840; +s32 D_80129844; +s32 D_80129848; +s32 D_8012984C; +s32 D_80129850; +s32 D_80129854; +s32 D_80129858; +s32 D_8012985C; +s32 D_80129860; +s32 D_80129864; +s32 D_80129868; +s32 D_8012986C; +s32 D_80129870; +s32 D_80129874; +s32 D_80129878; +s32 D_8012987C; +s32 D_80129880; +s32 D_80129884; +s32 D_80129888; +s32 D_8012988C; +s32 D_80129890; +s32 D_80129894; +s32 D_80129898; +s32 D_8012989C; +s32 D_801298A0; +s32 D_801298A4; +s32 D_801298A8; +s32 D_801298AC; +s32 D_801298B0; +s32 D_801298B4; +s32 D_801298B8; +s32 D_801298BC; +s32 D_801298C0; +s32 D_801298C4; +s32 D_801298C8; +s32 D_801298CC; +s32 D_801298D0; +s32 D_801298D4; +s32 D_801298D8; +s32 D_801298DC; +s32 D_801298E0; +s32 D_801298E4; +s32 D_801298E8; +s32 D_801298EC; +s32 D_801298F0; +s32 D_801298F4; +s32 D_801298F8; +s32 D_801298FC; +s32 D_80129900; +s32 D_80129904; +s32 D_80129908; +s32 D_8012990C; +s32 D_80129910; +s32 D_80129914; +s32 D_80129918; +s32 D_8012991C; +s32 D_80129920; +s32 D_80129924; +s32 D_80129928[34]; +s32 D_801299B0; + + +/******************************/ + void func_800AE2D8(void); void func_800AE374(void); void func_800AE438(void); diff --git a/undefined_syms.txt b/undefined_syms.txt index 1219c778..1fdfd62a 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,362 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/D_80126390 = 0x80126390; -/D_80126394 = 0x80126394; -/D_80126398 = 0x80126398; -/D_8012639C = 0x8012639C; -/D_801263A0 = 0x801263A0; -/D_801263A4 = 0x801263A4; -/D_801263A8 = 0x801263A8; -/D_801263AC = 0x801263AC; -/D_801263B0 = 0x801263B0; -/D_801263B4 = 0x801263B4; -/D_801263B8 = 0x801263B8; -/D_801263BC = 0x801263BC; -/D_801263C0 = 0x801263C0; -/D_801263C4 = 0x801263C4; -/D_801263C8 = 0x801263C8; -/D_801263CC = 0x801263CC; -/D_801263D0 = 0x801263D0; -/D_801263D4 = 0x801263D4; -/D_801263D8 = 0x801263D8; -/D_801263DC = 0x801263DC; -/D_801263E0 = 0x801263E0; -/players_character_array = 0x801263E8; -/D_801263F0 = 0x801263F0; -/D_801263F8 = 0x801263F8; -/D_80126418 = 0x80126418; -/D_80126420 = 0x80126420; -/D_80126428 = 0x80126428; -/D_80126430 = 0x80126430; -/D_80126431 = 0x80126431; -/D_80126438 = 0x80126438; -/D_80126448 = 0x80126448; -/D_80126450 = 0x80126450; -/D_80126454 = 0x80126454; -/D_80126458 = 0x80126458; -/D_8012645C = 0x8012645C; -/D_80126460 = 0x80126460; -/D_80126464 = 0x80126464; -/D_80126468 = 0x80126468; -/D_8012646C = 0x8012646C; -/D_80126470 = 0x80126470; -/D_80126474 = 0x80126474; -/D_80126478 = 0x80126478; -/D_8012647C = 0x8012647C; -/D_80126480 = 0x80126480; -/D_80126484 = 0x80126484; -/D_80126488 = 0x80126488; -/D_8012648C = 0x8012648C; -/D_80126490 = 0x80126490; -/D_80126494 = 0x80126494; -/D_80126498 = 0x80126498; - -/D_801264A0 = 0x801264A0; -/D_801264D0 = 0x801264D0; -/D_801264D4 = 0x801264D4; -/D_801264D8 = 0x801264D8; -/D_801264DC = 0x801264DC; -/D_801264E2 = 0x801264E2; -/D_801264E4 = 0x801264E4; -/D_801264EC = 0x801264EC; -/D_801264F8 = 0x801264F8; - -/D_80126504 = 0x80126504; -/D_80126508 = 0x80126508; -/D_8012650E = 0x8012650E; -/D_80126510 = 0x80126510; -/D_80126516 = 0x80126516; -/D_80126518 = 0x80126518; -/D_80126520 = 0x80126520; - -/D_80126530 = 0x80126530; -/D_80126540 = 0x80126540; -/D_80126541 = 0x80126541; -/D_80126548 = 0x80126548; -/D_80126550 = 0x80126550; -/D_8012665C = 0x8012665C; -/D_80126660 = 0x80126660; -/D_80126664 = 0x80126664; -/D_80126750 = 0x80126750; -/D_801267D0 = 0x801267D0; -/D_801267D8 = 0x801267D8; -/D_801267E4 = 0x801267E4; -/D_801267E8 = 0x801267E8; -/D_801267EC = 0x801267EC; -/D_801267F0 = 0x801267F0; -/D_80126804 = 0x80126804; -/D_80126808 = 0x80126808; -/D_8012680C = 0x8012680C; -/D_80126810 = 0x80126810; -/D_80126814 = 0x80126814; -/D_80126818 = 0x80126818; -/D_80126820 = 0x80126820; -/D_80126824 = 0x80126824; -/D_80126828 = 0x80126828; -/D_80126830 = 0x80126830; -/D_80126838 = 0x80126838; -/D_8012683A = 0x8012683A; -/D_8012683C = 0x8012683C; -/D_80126840 = 0x80126840; -/D_80126844 = 0x80126844; -/D_80126848 = 0x80126848; -/D_8012684C = 0x8012684C; -/D_80126850 = 0x80126850; -/D_80126854 = 0x80126854; -/D_80126858 = 0x80126858; -/D_8012685C = 0x8012685C; -/D_80126860 = 0x80126860; -/D_80126864 = 0x80126864; -/D_80126868 = 0x80126868; -/D_8012686C = 0x8012686C; -/D_80126870 = 0x80126870; -/D_80126874 = 0x80126874; -/D_80126878 = 0x80126878; -/D_801268D8 = 0x801268D8; -/D_801268DC = 0x801268DC; -/D_801268E0 = 0x801268E0; -/D_801268E8 = 0x801268E8; -/D_80126918 = 0x80126918; -/D_80126924 = 0x80126924; -/D_80126928 = 0x80126928; -/D_8012692C = 0x8012692C; -/D_80126930 = 0x80126930; -/gPlayerVehicle = 0x801269C0; -/D_801269C4 = 0x801269C4; -/D_801269C8 = 0x801269C8; -/D_801269CC = 0x801269CC; -/D_801269D0 = 0x801269D0; -/D_801269DC = 0x801269DC; -/D_801269E0 = 0x801269E0; -/D_801269E4 = 0x801269E4; -/D_801269E8 = 0x801269E8; -/D_801269EC = 0x801269EC; -/D_801269F0 = 0x801269F0; -/D_801269F4 = 0x801269F4; -/D_801269F8 = 0x801269F8; -/D_801269FC = 0x801269FC; -/D_80126A00 = 0x80126A00; -/D_80126A04 = 0x80126A04; -/D_80126A08 = 0x80126A08; -/D_80126A0C = 0x80126A0C; -/D_80126A10 = 0x80126A10; -/D_80126A14 = 0x80126A14; -/D_80126A18 = 0x80126A18; -/D_80126A1C = 0x80126A1C; -/D_80126A20 = 0x80126A20; -/D_80126A30 = 0x80126A30; -/D_80126A34 = 0x80126A34; -/D_80126A38 = 0x80126A38; -/D_80126A3C = 0x80126A3C; -/D_80126A40 = 0x80126A40; -/D_80126A60 = 0x80126A60; -/D_80126A64 = 0x80126A64; -/D_80126A68 = 0x80126A68; -/D_80126A6C = 0x80126A6C; -/D_80126A70 = 0x80126A70; -/D_80126A74 = 0x80126A74; -/D_80126A78 = 0x80126A78; -/D_80126A80 = 0x80126A80; -/D_80126A90 = 0x80126A90; -/D_80126A94 = 0x80126A94; -/D_80126A98 = 0x80126A98; -/D_80126AA0 = 0x80126AA0; -/D_80126AE0 = 0x80126AE0; -/D_80126B20 = 0x80126B20; -/D_80126B60 = 0x80126B60; -/D_80126B70 = 0x80126B70; -/D_80126BB0 = 0x80126BB0; -/D_80126BB4 = 0x80126BB4; -/D_80126BB8 = 0x80126BB8; -/D_80126BBC = 0x80126BBC; -/D_80126BC0 = 0x80126BC0; -/D_80126BC4 = 0x80126BC4; -/D_80126BC8 = 0x80126BC8; -/D_80126BCC = 0x80126BCC; -/D_80126BD0 = 0x80126BD0; -/D_80126BD4 = 0x80126BD4; -/D_80126BD8 = 0x80126BD8; -/D_80126BDC = 0x80126BDC; -/D_80126BE0 = 0x80126BE0; -/D_80126BE4 = 0x80126BE4; -/D_80126BE8 = 0x80126BE8; -/D_80126BEC = 0x80126BEC; -/D_80126BF0 = 0x80126BF0; -/D_80126C10 = 0x80126C10; -/D_80126C14 = 0x80126C14; -/D_80126C18 = 0x80126C18; -/D_80126C1C = 0x80126C1C; -/D_80126C20 = 0x80126C20; -/D_80126C24 = 0x80126C24; -/D_80126C28 = 0x80126C28; -/D_80126C2C = 0x80126C2C; -/D_80126C30 = 0x80126C30; -/D_80126C34 = 0x80126C34; -/D_80126C38 = 0x80126C38; -/D_80126C3C = 0x80126C3C; -/D_80126C40 = 0x80126C40; -/D_80126C42 = 0x80126C42; -/D_80126C44 = 0x80126C44; -/D_80126C46 = 0x80126C46; -/D_80126C48 = 0x80126C48; -/D_80126C4C = 0x80126C4C; -/D_80126C50 = 0x80126C50; -/D_80126C54 = 0x80126C54; -/D_80126C57 = 0x80126C57; -/D_80126C58 = 0x80126C58; -/D_80126C6C = 0x80126C6C; -/D_80126C70 = 0x80126C70; -/D_80126C74 = 0x80126C74; -/D_80126C78 = 0x80126C78; -/D_80126C80 = 0x80126C80; -/D_80126CC0 = 0x80126CC0; - -D_80126CD0 = 0x80126CD0; -D_80126CD1 = 0x80126CD1; -D_80126CD2 = 0x80126CD2; -D_80126CD3 = 0x80126CD3; -D_80126CD4 = 0x80126CD4; -D_80126CD5 = 0x80126CD5; -D_80126CD8 = 0x80126CD8; -D_80126CDC = 0x80126CDC; -D_80126CE0 = 0x80126CE0; -D_80126CEC = 0x80126CEC; -D_80126CF0 = 0x80126CF0; -D_80126CF4 = 0x80126CF4; -D_80126CF8 = 0x80126CF8; -D_80126CFC = 0x80126CFC; -D_80126D00 = 0x80126D00; -D_80126D04 = 0x80126D04; -D_80126D08 = 0x80126D08; -D_80126D0C = 0x80126D0C; -D_80126D10 = 0x80126D10; -D_80126D14 = 0x80126D14; -D_80126D18 = 0x80126D18; -D_80126D1C = 0x80126D1C; -D_80126D20 = 0x80126D20; -D_80126D24 = 0x80126D24; -D_80126D28 = 0x80126D28; -D_80126D2C = 0x80126D2C; -D_80126D30 = 0x80126D30; -D_80126D34 = 0x80126D34; -D_80126D35 = 0x80126D35; -D_80126D36 = 0x80126D36; -D_80126D37 = 0x80126D37; -D_80126D38 = 0x80126D38; -D_80126D3C = 0x80126D3C; -D_80126D40 = 0x80126D40; -D_80126D44 = 0x80126D44; -D_80126D48 = 0x80126D48; -D_80126D4C = 0x80126D4C; -D_80126D50 = 0x80126D50; -D_80126D54 = 0x80126D54; -D_80126D55 = 0x80126D55; -D_80126D56 = 0x80126D56; -D_80126D58 = 0x80126D58; -D_80126D5C = 0x80126D5C; -D_80126D60 = 0x80126D60; -D_80126D64 = 0x80126D64; -D_80126D65 = 0x80126D65; -D_80126D66 = 0x80126D66; -D_80126D67 = 0x80126D67; -D_80126D68 = 0x80126D68; -D_80126D69 = 0x80126D69; -D_80126D6C = 0x80126D6C; -D_80126D70 = 0x80126D70; -D_80126D71 = 0x80126D71; -D_80126D74 = 0x80126D74; -D_80126D78 = 0x80126D78; -D_80126D7C = 0x80126D7C; -D_80126D80 = 0x80126D80; -D_80127180 = 0x80127180; -D_80127184 = 0x80127184; -D_80127188 = 0x80127188; -D_80127189 = 0x80127189; -D_8012718A = 0x8012718A; -D_8012718B = 0x8012718B; -D_8012718C = 0x8012718C; -D_80127190 = 0x80127190; -D_80127194 = 0x80127194; -D_801271B0 = 0x801271B0; -D_80127BB0 = 0x80127BB0; -D_80127BB4 = 0x80127BB4; -D_80127BB8 = 0x80127BB8; -D_80127BF8 = 0x80127BF8; -D_80127C00 = 0x80127C00; -D_80127C04 = 0x80127C04; -D_80127C08 = 0x80127C08; -D_80127C0C = 0x80127C0C; -D_80127C10 = 0x80127C10; -D_80127C14 = 0x80127C14; -D_80127C18 = 0x80127C18; -D_80127C1C = 0x80127C1C; -D_80127C20 = 0x80127C20; -D_80127C24 = 0x80127C24; -D_80127C28 = 0x80127C28; -D_80127C2C = 0x80127C2C; -D_80127C30 = 0x80127C30; -D_80127C40 = 0x80127C40; -D_80127C80 = 0x80127C80; -D_80127C88 = 0x80127C88; -D_80127CA0 = 0x80127CA0; -D_80127CA4 = 0x80127CA4; -D_80127CA8 = 0x80127CA8; -D_80127CAC = 0x80127CAC; -D_80127CAE = 0x80127CAE; -D_80127CB0 = 0x80127CB0; -D_80127CB2 = 0x80127CB2; -D_80127CB4 = 0x80127CB4; -D_80127CB8 = 0x80127CB8; -D_80127CBC = 0x80127CBC; -D_80127CC0 = 0x80127CC0; -D_80127CC4 = 0x80127CC4; -D_80127CC8 = 0x80127CC8; -D_80127CCC = 0x80127CCC; -D_80127CD0 = 0x80127CD0; -D_80127CD2 = 0x80127CD2; -D_80127CD8 = 0x80127CD8; -D_801285D8 = 0x801285D8; -D_801295E0 = 0x801295E0; -D_80129790 = 0x80129790; -D_801297A8 = 0x801297A8; -D_801297C8 = 0x801297C8; -D_801297E8 = 0x801297E8; -D_80129800 = 0x80129800; -D_80129824 = 0x80129824; -D_8012982C = 0x8012982C; -D_80129834 = 0x80129834; -D_8012983C = 0x8012983C; -D_80129844 = 0x80129844; -D_8012984C = 0x8012984C; -D_80129854 = 0x80129854; -D_8012985C = 0x8012985C; -D_80129864 = 0x80129864; -D_8012986C = 0x8012986C; -D_80129874 = 0x80129874; -D_8012987C = 0x8012987C; -D_80129884 = 0x80129884; -D_8012988C = 0x8012988C; -D_80129894 = 0x80129894; -D_8012989C = 0x8012989C; -D_801298A4 = 0x801298A4; -D_801298AC = 0x801298AC; -D_801298B4 = 0x801298B4; -D_801298BC = 0x801298BC; -D_801298C4 = 0x801298C4; -D_801298CC = 0x801298CC; -D_801298D4 = 0x801298D4; -D_801298DC = 0x801298DC; -D_801298E4 = 0x801298E4; -D_801298EC = 0x801298EC; -D_801298F4 = 0x801298F4; -D_801298FC = 0x801298FC; -D_80129904 = 0x80129904; -D_80129918 = 0x80129918; -D_8012991C = 0x8012991C; -D_80129920 = 0x80129920; -D_80129924 = 0x80129924; -D_801299B0 = 0x801299B0; piThreadStack = 0x80129AB0; D_80129BB0 = 0x80129BB0; D_80129FB0 = 0x80129FB0; From 7a30c27d009f8aca27d16e8ae108741ac6d281dc Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 20:12:46 -0500 Subject: [PATCH 18/39] Added bss for unknown_0C4800 & unknown_0C7F50 --- bss.txt | 122 ---------------------------------- src/unknown_0AEE70.c | 2 +- src/unknown_0C4800.c | 155 ++++++++++++++++++++++++++++++++++++++----- src/unknown_0C7F50.c | 8 ++- undefined_syms.txt | 121 +-------------------------------- 5 files changed, 146 insertions(+), 262 deletions(-) diff --git a/bss.txt b/bss.txt index a7c9b8f0..131d7195 100644 --- a/bss.txt +++ b/bss.txt @@ -49,128 +49,6 @@ unknown_09F8F0 unknown_0AEE70 unknown_0C4800 -piThreadStack; -D_80129BB0; -D_80129FB0; -D_80129FBC; - - -unknown_0B8920 -D_80129FC0; -D_80129FC4; -D_80129FC8; -D_80129FCC; -D_80129FE8; -D_80129FF0; -D_8012A008; -D_8012A00C; -D_8012A018; -D_8012A01C; -D_8012A020; -D_8012A028; -D_8012A078; -D_8012A07C; -D_8012A080; -D_8012A084; -D_8012A088; -D_8012A08C; -D_8012A090; -D_8012A094; -D_8012A098; -D_8012A09C; -D_8012A0A0; -D_8012A0A4; -D_8012A0A8; -D_8012A0AC; -D_8012A0B0; -D_8012A0B4; -D_8012A0B8; -D_8012A0BC; -D_8012A0C0; -D_8012A0C4; -D_8012A0C8; -D_8012A0CC; -D_8012A0D0; -D_8012A0D4; -D_8012A0D8; -D_8012A0DC; -D_8012A0E0; -D_8012A0E8; -D_8012A1E8; -D_8012A5E8; -D_8012A5F4; -D_8012A600; -D_8012A720; -D_8012A724; -D_8012A728; -D_8012A730; -D_8012A734; -D_8012A735; -D_8012A736; -D_8012A737; -D_8012A738; -D_8012A73C; -D_8012A740; -D_8012A744; -D_8012A748; -D_8012A74C; -D_8012A750; -D_8012A754; -D_8012A758; -D_8012A75C; -D_8012A760; -D_8012A764; -D_8012A768; -D_8012A76C; -D_8012A770; -D_8012A774; -D_8012A778; -D_8012A77C; -D_8012A780; -D_8012A784; -D_8012A785; -D_8012A786; -D_8012A787; -D_8012A788; -D_8012A789; -D_8012A78A; -D_8012A78C; -D_8012A78E; -D_8012A790; -D_8012A798; -D_8012A7A0; -D_8012A7A4; -D_8012A7A8; -D_8012A7AA; -D_8012A7AC; -D_8012A7AE; -D_8012A7B0; -D_8012A7B2; -D_8012A7B4; -D_8012A7B6; -D_8012A7B8; -D_8012A7BA; -D_8012A7C0; -D_8012A7C8; -D_8012A7D0; -D_8012A7D4; -D_8012A7E0; -D_8012A7E4; -D_8012A7E8; -D_8012A7EC; -D_8012A7F0; -D_8012A7F4; - - -unknown_0C4800 -piThread; -piEventQueue; -piEventBuf; -gzip_bit_buffer; -gzip_num_bits; -D_8012AAD8; -D_8012AAE0; - unknown_0C7F50 D_8012AAF0; diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index a0417f2b..8f9cf5d6 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -255,7 +255,7 @@ s32 D_8012991C; s32 D_80129920; s32 D_80129924; s32 D_80129928[34]; -s32 D_801299B0; +s32 D_801299B0[64]; /******************************/ diff --git a/src/unknown_0C4800.c b/src/unknown_0C4800.c index 4cf1898a..fc62a4a7 100644 --- a/src/unknown_0C4800.c +++ b/src/unknown_0C4800.c @@ -5,17 +5,6 @@ #include "macros.h" #include "libultra_internal.h" -#define OS_PIM_STACKSIZE 4096 - -extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled -extern OSDevMgr __osPiDevMgr; -extern u8 piThreadStack[OS_PIM_STACKSIZE];//piThreadStack -extern OSThread piThread; //piThread -extern OSMesgQueue piEventQueue; //piEventQueue -extern OSMesg piEventBuf[1]; //piEventBuf -extern OSMesgQueue piAccessQueue; //piAccessQueue -void __osDevMgrMain(void); - /************ .data ************/ // Fast3D (F3DDKR) display list @@ -57,7 +46,124 @@ u8* gzip_inflate_output = NULL; /*******************************/ -extern s32 D_8012A7E0; +/************ .bss ************/ + +#define OS_PIM_STACKSIZE 4096 +u8 piThreadStack[256];//piThreadStack[OS_PIM_STACKSIZE]; + +s32 D_80129BB0[256]; +s32 D_80129FB0[3]; +s32 D_80129FBC; +s32 D_80129FC0; +s32 D_80129FC4; +s32 D_80129FC8; +s32 D_80129FCC; +s32 D_80129FD0[4]; +s32 D_80129FE0[2]; +s32 D_80129FE8; +s32 D_80129FF0[6]; +s32 D_8012A008; +s32 D_8012A00C; +s32 D_8012A010; +s32 D_8012A014; +s32 D_8012A018; +s32 D_8012A01C; +s32 D_8012A020[2]; +s32 D_8012A028[20]; +s32 D_8012A078; +s32 D_8012A07C; +s32 D_8012A080; +s32 D_8012A084; +s32 D_8012A088; +s32 D_8012A08C; +s32 D_8012A090; +s32 D_8012A094; +s32 D_8012A098; +s32 D_8012A09C; +s32 D_8012A0A0; +s32 D_8012A0A4; +s32 D_8012A0A8; +s32 D_8012A0AC; +s32 D_8012A0B0; +s32 D_8012A0B4; +s32 D_8012A0B8; +s32 D_8012A0BC; +s32 D_8012A0C0; +s32 D_8012A0C4; +s32 D_8012A0C8; +s32 D_8012A0CC; +s32 D_8012A0D0; +s32 D_8012A0D4; +s32 D_8012A0D8; +s32 D_8012A0DC; +s32 D_8012A0E0; +s32 D_8012A0E8[64]; +s32 D_8012A1E8[256]; +s32 D_8012A5E8[3]; +s32 D_8012A5F4; +s32 D_8012A5F8; +s32 D_8012A5FC; +s32 D_8012A600[72]; +s32 D_8012A720; +s32 D_8012A724; +s32 D_8012A728[2]; +s32 D_8012A730; +s8 D_8012A734; +s8 D_8012A735; +s8 D_8012A736; +s8 D_8012A737; +s32 D_8012A738; +s32 D_8012A73C; +s32 D_8012A740; +s32 D_8012A744; +s32 D_8012A748; +s32 D_8012A74C; +s32 D_8012A750; +s32 D_8012A754; +s32 D_8012A758; +s32 D_8012A75C; +s32 D_8012A760; +s32 D_8012A764; +s32 D_8012A768; +s32 D_8012A76C; +s32 D_8012A770; +s32 D_8012A774; +s32 D_8012A778; +s32 D_8012A77C; +s32 D_8012A780; +s8 D_8012A784; +s8 D_8012A785; +s8 D_8012A786; +s8 D_8012A787; +s8 D_8012A788; +s8 D_8012A789; +s8 D_8012A78A; +s16 D_8012A78C; +s16 D_8012A78E; +s32 D_8012A790[2]; +s32 D_8012A798; +s32 D_8012A79C; +s32 D_8012A7A0; +s32 D_8012A7A4; +s16 D_8012A7A8; +s16 D_8012A7AA; +s16 D_8012A7AC; +s16 D_8012A7AE; +s16 D_8012A7B0; +s16 D_8012A7B2; +s16 D_8012A7B4; +s16 D_8012A7B6; +s16 D_8012A7B8; +s16 D_8012A7BA; +s32 D_8012A7C0[2]; +s32 D_8012A7C8; +s32 D_8012A7CC; +s32 D_8012A7D0; +s32 D_8012A7D4; +s32 D_8012A7D8; +s32 D_8012A7DC; +s32 D_8012A7E0; +s32 D_8012A7E4; /* Size: 0x28 bytes */ typedef struct unk8012A7E8_24 { @@ -97,13 +203,26 @@ typedef struct unk8012A7E8 { unk8012A7E8_24 *unk24; } unk8012A7E8; -extern unk8012A7E8 (*D_8012A7E8)[1]; -extern s32 D_8012A7F0; -extern s8 D_8012A7F4; -extern s32 D_8012AAD8; -extern u32 gzip_num_bits; -extern u32 gzip_bit_buffer; +unk8012A7E8 (*D_8012A7E8)[1]; +s32 D_8012A7EC; +s32 D_8012A7F0; +s8 D_8012A7F4; +s32 D_8012A7F8; +s32 D_8012A7FC; +OSThread piThread; //piThread +s32 D_8012A9B0[64]; +OSMesgQueue piEventQueue; //piEventQueue +OSMesg piEventBuf[2]; //piEventBuf +u32 gzip_bit_buffer; +u32 gzip_num_bits; +s32 D_8012AAD8; +/******************************/ + +extern OSMesgQueue piAccessQueue; //piAccessQueue +extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled +extern OSDevMgr __osPiDevMgr; +void __osDevMgrMain(void); #if 1 GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C3C00.s") diff --git a/src/unknown_0C7F50.c b/src/unknown_0C7F50.c index d0adc4bc..abd22408 100644 --- a/src/unknown_0C7F50.c +++ b/src/unknown_0C7F50.c @@ -16,9 +16,11 @@ s32 D_800E377C = 0; /************ .bss ************/ -extern OSMesgQueue D_8012ACA0; -extern OSMesg D_8012ACB8; -extern OSThread D_8012AAF0; +s32 D_8012AAE0[4]; +OSThread D_8012AAF0; +OSMesgQueue D_8012ACA0; +OSMesg D_8012ACB8; + extern void *D_8012CCC0; /*****************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 1fdfd62a..27b204b3 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,126 +25,11 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -piThreadStack = 0x80129AB0; -D_80129BB0 = 0x80129BB0; -D_80129FB0 = 0x80129FB0; -D_80129FBC = 0x80129FBC; -D_80129FC0 = 0x80129FC0; -D_80129FC4 = 0x80129FC4; -D_80129FC8 = 0x80129FC8; -D_80129FCC = 0x80129FCC; -D_80129FE8 = 0x80129FE8; -D_80129FF0 = 0x80129FF0; -D_8012A008 = 0x8012A008; -D_8012A00C = 0x8012A00C; -D_8012A018 = 0x8012A018; -D_8012A01C = 0x8012A01C; -D_8012A020 = 0x8012A020; -D_8012A028 = 0x8012A028; -D_8012A078 = 0x8012A078; -D_8012A07C = 0x8012A07C; -D_8012A080 = 0x8012A080; -D_8012A084 = 0x8012A084; -D_8012A088 = 0x8012A088; -D_8012A08C = 0x8012A08C; -D_8012A090 = 0x8012A090; -D_8012A094 = 0x8012A094; -D_8012A098 = 0x8012A098; -D_8012A09C = 0x8012A09C; -D_8012A0A0 = 0x8012A0A0; -D_8012A0A4 = 0x8012A0A4; -D_8012A0A8 = 0x8012A0A8; -D_8012A0AC = 0x8012A0AC; -D_8012A0B0 = 0x8012A0B0; -D_8012A0B4 = 0x8012A0B4; -D_8012A0B8 = 0x8012A0B8; -D_8012A0BC = 0x8012A0BC; -D_8012A0C0 = 0x8012A0C0; -D_8012A0C4 = 0x8012A0C4; -D_8012A0C8 = 0x8012A0C8; -D_8012A0CC = 0x8012A0CC; -D_8012A0D0 = 0x8012A0D0; -D_8012A0D4 = 0x8012A0D4; -D_8012A0D8 = 0x8012A0D8; -D_8012A0DC = 0x8012A0DC; -D_8012A0E0 = 0x8012A0E0; -D_8012A0E8 = 0x8012A0E8; -D_8012A1E8 = 0x8012A1E8; -D_8012A5E8 = 0x8012A5E8; -D_8012A5F4 = 0x8012A5F4; -D_8012A600 = 0x8012A600; -D_8012A720 = 0x8012A720; -D_8012A724 = 0x8012A724; -D_8012A728 = 0x8012A728; -D_8012A730 = 0x8012A730; -D_8012A734 = 0x8012A734; -D_8012A735 = 0x8012A735; -D_8012A736 = 0x8012A736; -D_8012A737 = 0x8012A737; -D_8012A738 = 0x8012A738; -D_8012A73C = 0x8012A73C; -D_8012A740 = 0x8012A740; -D_8012A744 = 0x8012A744; -D_8012A748 = 0x8012A748; -D_8012A74C = 0x8012A74C; -D_8012A750 = 0x8012A750; -D_8012A754 = 0x8012A754; -D_8012A758 = 0x8012A758; -D_8012A75C = 0x8012A75C; -D_8012A760 = 0x8012A760; -D_8012A764 = 0x8012A764; -D_8012A768 = 0x8012A768; -D_8012A76C = 0x8012A76C; -D_8012A770 = 0x8012A770; -D_8012A774 = 0x8012A774; -D_8012A778 = 0x8012A778; -D_8012A77C = 0x8012A77C; -D_8012A780 = 0x8012A780; -D_8012A784 = 0x8012A784; -D_8012A785 = 0x8012A785; -D_8012A786 = 0x8012A786; -D_8012A787 = 0x8012A787; -D_8012A788 = 0x8012A788; -D_8012A789 = 0x8012A789; -D_8012A78A = 0x8012A78A; -D_8012A78C = 0x8012A78C; -D_8012A78E = 0x8012A78E; -D_8012A790 = 0x8012A790; -D_8012A798 = 0x8012A798; -D_8012A7A0 = 0x8012A7A0; -D_8012A7A4 = 0x8012A7A4; -D_8012A7A8 = 0x8012A7A8; -D_8012A7AA = 0x8012A7AA; -D_8012A7AC = 0x8012A7AC; -D_8012A7AE = 0x8012A7AE; -D_8012A7B0 = 0x8012A7B0; -D_8012A7B2 = 0x8012A7B2; -D_8012A7B4 = 0x8012A7B4; -D_8012A7B6 = 0x8012A7B6; -D_8012A7B8 = 0x8012A7B8; -D_8012A7BA = 0x8012A7BA; -D_8012A7C0 = 0x8012A7C0; -D_8012A7C8 = 0x8012A7C8; -D_8012A7D0 = 0x8012A7D0; -D_8012A7D4 = 0x8012A7D4; -D_8012A7E0 = 0x8012A7E0; -D_8012A7E4 = 0x8012A7E4; -D_8012A7E8 = 0x8012A7E8; -D_8012A7EC = 0x8012A7EC; -D_8012A7F0 = 0x8012A7F0; -D_8012A7F4 = 0x8012A7F4; -piThread = 0x8012A800; -piEventQueue = 0x8012AAB0; -piEventBuf = 0x8012AAC8; -gzip_bit_buffer = 0x8012AAD0; -gzip_num_bits = 0x8012AAD4; -D_8012AAD8 = 0x8012AAD8; -D_8012AAE0 = 0x8012AAE0; -D_8012AAF0 = 0x8012AAF0; -D_8012ACA0 = 0x8012ACA0; -D_8012ACB8 = 0x8012ACB8; + viThreadStack = 0x8012C130; + D_8012CCC0 = 0x8012CCC0; + __osEventStateTab = 0x8012CCD0; D_8012CD50 = 0x8012CD50; D_8012CD8C = 0x8012CD8C; From fa1ac4ec97b10e19a0fe135beabfbd9a719ca606 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 10 Jun 2021 00:39:47 -0500 Subject: [PATCH 19/39] Finished BSS sections (for now) and cleaning undefined_syms.txt --- .../unknown_005740/func_80004B40.s | 4 +- .../unknown_05F690/func_80060EA8.s | 4 +- .../unknown_072E50/func_80076C58.s | 12 +- .../unknown_080500/func_80080580.s | 12 +- .../unknown_080500/func_80080BC8.s | 12 +- .../unknown_080500/func_80080E90.s | 6 +- .../unknown_080500/func_80081C04.s | 4 +- .../unknown_080500/func_8008AD44.s | 8 +- .../unknown_0B8920/func_800B82B4.s | 4 +- .../unknown_0B8920/func_800C1130.s | 4 +- .../unknown_0B8920/func_800C3C00.s | 4 +- .../unknown_0B8920/func_800C45A4.s | 11 +- .../unknown_0B8920/func_800C5B58.s | 6 +- asm/unknown_031D30/func_80031130.s | 4 +- asm/unknown_031D30/func_80031600.s | 8 +- bss.txt | 108 ------------------ .../non_matchings/osViMgr_0D2590/viMgrMain.s | 4 +- .../unknown_0CA9A0/alResamplePull.s | 4 +- .../unknown_0CCF90/osInitialize.s | 32 +++--- .../unknown_0D23F0/osInvalDCache.s | 4 +- .../unknown_0D24A0/osWritebackDCacheAll.s | 4 +- lib/asm/osInvalICache.s | 4 +- lib/asm/osWritebackDCache.s | 4 +- lib/src/osSetEventMesg.c | 2 +- lib/src/osViMgr.c | 7 +- lib/src/unknown_0C9A20.c | 2 +- lib/src/unknown_0CD820.c | 18 +++ lib/src/unknown_0CE200.c | 25 ++++ src/unknown_0C7F50.c | 1 + tools/python/generate_ld.py | 13 ++- undefined_syms.txt | 61 ---------- 31 files changed, 149 insertions(+), 247 deletions(-) delete mode 100644 bss.txt diff --git a/asm/non_matchings/unknown_005740/func_80004B40.s b/asm/non_matchings/unknown_005740/func_80004B40.s index 7ab0bf38..f7ab0305 100644 --- a/asm/non_matchings/unknown_005740/func_80004B40.s +++ b/asm/non_matchings/unknown_005740/func_80004B40.s @@ -45,7 +45,7 @@ glabel func_80004B40 /* 0057CC 80004BCC AFA2003C */ sw $v0, 0x3c($sp) /* 0057D0 80004BD0 0019C880 */ sll $t9, $t9, 2 /* 0057D4 80004BD4 8C4F001C */ lw $t7, 0x1c($v0) -/* 0057D8 80004BD8 3C1200FF */ lui $s2, %hi(D_00FF0018) # $s2, 0xff +/* 0057D8 80004BD8 3C1200FF */ lui $s2, %hi(0x00FF0018) # $s2, 0xff /* 0057DC 80004BDC 0338C823 */ subu $t9, $t9, $t8 /* 0057E0 80004BE0 3652FFFF */ ori $s2, (0x00FFFFFF & 0xFFFF) # ori $s2, $s2, 0xffff /* 0057E4 80004BE4 0019C880 */ sll $t9, $t9, 2 @@ -163,7 +163,7 @@ glabel func_80004B40 /* 00599C 80004D9C A12F0004 */ sb $t7, 4($t1) /* 0059A0 80004DA0 96790018 */ lhu $t9, 0x18($s3) /* 0059A4 80004DA4 25850002 */ addiu $a1, $t4, 2 -/* 0059A8 80004DA8 A6590018 */ sh $t9, %lo(D_00FF0018)($s2) +/* 0059A8 80004DA8 A6590018 */ sh $t9, %lo(0x00FF0018)($s2) /* 0059AC 80004DAC 914E000E */ lbu $t6, 0xe($t2) /* 0059B0 80004DB0 25A40001 */ addiu $a0, $t5, 1 /* 0059B4 80004DB4 A12E000E */ sb $t6, 0xe($t1) diff --git a/asm/non_matchings/unknown_05F690/func_80060EA8.s b/asm/non_matchings/unknown_05F690/func_80060EA8.s index 3f9b6b0a..951c8721 100644 --- a/asm/non_matchings/unknown_05F690/func_80060EA8.s +++ b/asm/non_matchings/unknown_05F690/func_80060EA8.s @@ -241,7 +241,7 @@ glabel func_80060EA8 /* 061E34 80061234 4480A000 */ mtc1 $zero, $f20 /* 061E38 80061238 87040024 */ lh $a0, 0x24($t8) /* 061E3C 8006123C AFBF00A4 */ sw $ra, 0xa4($sp) -/* 061E40 80061240 3C05FF7F */ lui $a1, %hi(D_FF7F0001) # $a1, 0xff7f +/* 061E40 80061240 3C05FF7F */ lui $a1, %hi(0xFF7F0001) # $a1, 0xff7f /* 061E44 80061244 0004C840 */ sll $t9, $a0, 1 /* 061E48 80061248 2412000A */ li $s2, 10 /* 061E4C 8006124C 03202025 */ move $a0, $t9 @@ -361,7 +361,7 @@ glabel func_80060EA8 /* 061FEC 800613EC 04C0FFDF */ bltz $a2, .L8006136C /* 061FF0 800613F0 00000000 */ nop .L800613F4: -/* 061FF4 800613F4 24A50001 */ addiu $a1, %lo(D_FF7F0001) # addiu $a1, $a1, 1 +/* 061FF4 800613F4 24A50001 */ addiu $a1, %lo(0xFF7F0001) # addiu $a1, $a1, 1 /* 061FF8 800613F8 00057C00 */ sll $t7, $a1, 0x10 /* 061FFC 800613FC 000F2C03 */ sra $a1, $t7, 0x10 /* 062000 80061400 0225082A */ slt $at, $s1, $a1 diff --git a/asm/non_matchings/unknown_072E50/func_80076C58.s b/asm/non_matchings/unknown_072E50/func_80076C58.s index 551c3b2c..f6b8ce96 100644 --- a/asm/non_matchings/unknown_072E50/func_80076C58.s +++ b/asm/non_matchings/unknown_072E50/func_80076C58.s @@ -27,8 +27,8 @@ glabel func_80076C58 /* 0778B8 80076CB8 10000009 */ b .L80076CE0 /* 0778BC 80076CBC 00001025 */ move $v0, $zero .L80076CC0: -/* 0778C0 80076CC0 3C19000F */ lui $t9, %hi(D_000ECC30) # $t9, 0xf -/* 0778C4 80076CC4 2739CC30 */ addiu $t9, %lo(D_000ECC30) # addiu $t9, $t9, -0x33d0 +/* 0778C0 80076CC0 3C19000F */ lui $t9, %hi(__ASSETS_LUT_END) # $t9, 0xf +/* 0778C4 80076CC4 2739CC30 */ addiu $t9, %lo(__ASSETS_LUT_END) # addiu $t9, $t9, -0x33d0 /* 0778C8 80076CC8 8FA6001C */ lw $a2, 0x1c($sp) /* 0778CC 80076CCC 00F92021 */ addu $a0, $a3, $t9 /* 0778D0 80076CD0 0C01DBDE */ jal dmacopy @@ -65,8 +65,8 @@ glabel func_80076C58 /* 077940 80076D40 0C01C327 */ jal func_80070C9C /* 077944 80076D44 AFA30030 */ sw $v1, 0x30($sp) /* 077948 80076D48 8FA30030 */ lw $v1, 0x30($sp) -/* 07794C 80076D4C 3C08000F */ lui $t0, %hi(D_000ECC30) # $t0, 0xf -/* 077950 80076D50 2508CC30 */ addiu $t0, %lo(D_000ECC30) # addiu $t0, $t0, -0x33d0 +/* 07794C 80076D4C 3C08000F */ lui $t0, %hi(__ASSETS_LUT_END) # $t0, 0xf +/* 077950 80076D50 2508CC30 */ addiu $t0, %lo(__ASSETS_LUT_END) # addiu $t0, $t0, -0x33d0 /* 077954 80076D54 00682021 */ addu $a0, $v1, $t0 /* 077958 80076D58 AFA20028 */ sw $v0, 0x28($sp) /* 07795C 80076D5C AFA40020 */ sw $a0, 0x20($sp) @@ -128,8 +128,8 @@ glabel func_80076C58 /* 077A2C 80076E2C 01E81021 */ addu $v0, $t7, $t0 /* 077A30 80076E30 8C430000 */ lw $v1, ($v0) /* 077A34 80076E34 8C580004 */ lw $t8, 4($v0) -/* 077A38 80076E38 3C19000F */ lui $t9, %hi(D_000ECC30) # $t9, 0xf -/* 077A3C 80076E3C 2739CC30 */ addiu $t9, %lo(D_000ECC30) # addiu $t9, $t9, -0x33d0 +/* 077A38 80076E38 3C19000F */ lui $t9, %hi(__ASSETS_LUT_END) # $t9, 0xf +/* 077A3C 80076E3C 2739CC30 */ addiu $t9, %lo(__ASSETS_LUT_END) # addiu $t9, $t9, -0x33d0 /* 077A40 80076E40 03033023 */ subu $a2, $t8, $v1 /* 077A44 80076E44 AFA60018 */ sw $a2, 0x18($sp) /* 077A48 80076E48 0C01DBDE */ jal dmacopy diff --git a/asm/non_matchings/unknown_080500/func_80080580.s b/asm/non_matchings/unknown_080500/func_80080580.s index 8dd1e4dd..53598c02 100644 --- a/asm/non_matchings/unknown_080500/func_80080580.s +++ b/asm/non_matchings/unknown_080500/func_80080580.s @@ -286,8 +286,10 @@ glabel func_80080580 /* 0815E0 800809E0 3C0E0702 */ lui $t6, (0x07020010 >> 16) # lui $t6, 0x702 /* 0815E4 800809E4 244F0008 */ addiu $t7, $v0, 8 /* 0815E8 800809E8 AEEF0000 */ sw $t7, ($s7) -/* 0815EC 800809EC 3C18000E */ lui $t8, %hi(D_000E1CB0) # $t8, 0xe -/* 0815F0 800809F0 27181CB0 */ addiu $t8, %lo(D_000E1CB0) # addiu $t8, $t8, 0x1cb0 + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 0815EC 800809EC 3C18000E */ lui $t8, %hi(D_800E1C70 - 0x7FFFFFC0) # $t8, 0xe + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 0815F0 800809F0 27181CB0 */ addiu $t8, %lo(D_800E1C70 - 0x7FFFFFC0) # addiu $t8, $t8, 0x1cb0 /* 0815F4 800809F4 35CE0010 */ ori $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10 /* 0815F8 800809F8 AC4E0000 */ sw $t6, ($v0) /* 0815FC 800809FC AC580004 */ sw $t8, 4($v0) @@ -314,8 +316,10 @@ glabel func_80080580 /* 08164C 80080A4C 3C0E0702 */ lui $t6, (0x07020010 >> 16) # lui $t6, 0x702 /* 081650 80080A50 244F0008 */ addiu $t7, $v0, 8 /* 081654 80080A54 AEEF0000 */ sw $t7, ($s7) -/* 081658 80080A58 3C19000E */ lui $t9, %hi(D_000E1CA0) # $t9, 0xe -/* 08165C 80080A5C 27391CA0 */ addiu $t9, %lo(D_000E1CA0) # addiu $t9, $t9, 0x1ca0 + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 081658 80080A58 3C19000E */ lui $t9, %hi(D_800E1C70 - 0x7FFFFFD0) # $t9, 0xe + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 08165C 80080A5C 27391CA0 */ addiu $t9, %lo(D_800E1C70 - 0x7FFFFFD0) # addiu $t9, $t9, 0x1ca0 /* 081660 80080A60 35CE0010 */ ori $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10 /* 081664 80080A64 0000F825 */ move $ra, $zero /* 081668 80080A68 3C098000 */ lui $t1, 0x8000 diff --git a/asm/non_matchings/unknown_080500/func_80080BC8.s b/asm/non_matchings/unknown_080500/func_80080BC8.s index e5be398f..4f307d8f 100644 --- a/asm/non_matchings/unknown_080500/func_80080BC8.s +++ b/asm/non_matchings/unknown_080500/func_80080BC8.s @@ -23,16 +23,20 @@ glabel func_80080BC8 /* 08181C 80080C1C 00006825 */ move $t5, $zero /* 081820 80080C20 1920007E */ blez $t1, .L80080E1C /* 081824 80080C24 00003825 */ move $a3, $zero -/* 081828 80080C28 3C16000E */ lui $s6, %hi(D_000E1CA0) # $s6, 0xe -/* 08182C 80080C2C 3C11000E */ lui $s1, %hi(D_000E1CB0) # $s1, 0xe + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 081828 80080C28 3C16000E */ lui $s6, %hi(D_800E1C70 - 0x7FFFFFD0) # $s6, 0xe + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 08182C 80080C2C 3C11000E */ lui $s1, %hi(D_800E1C70 - 0x7FFFFFC0) # $s1, 0xe /* 081830 80080C30 3C1F0702 */ lui $ra, (0x07020010 >> 16) # lui $ra, 0x702 /* 081834 80080C34 3C0B8012 */ lui $t3, %hi(D_80126C2C) # $t3, 0x8012 /* 081838 80080C38 3C0A800E */ lui $t2, %hi(D_800E1DB4) # $t2, 0x800e /* 08183C 80080C3C 254A1DB4 */ addiu $t2, %lo(D_800E1DB4) # addiu $t2, $t2, 0x1db4 /* 081840 80080C40 256B6C2C */ addiu $t3, %lo(D_80126C2C) # addiu $t3, $t3, 0x6c2c /* 081844 80080C44 37FF0010 */ ori $ra, (0x07020010 & 0xFFFF) # ori $ra, $ra, 0x10 -/* 081848 80080C48 26311CB0 */ addiu $s1, %lo(D_000E1CB0) # addiu $s1, $s1, 0x1cb0 -/* 08184C 80080C4C 26D61CA0 */ addiu $s6, %lo(D_000E1CA0) # addiu $s6, $s6, 0x1ca0 + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 081848 80080C48 26311CB0 */ addiu $s1, %lo(D_800E1C70 - 0x7FFFFFC0) # addiu $s1, $s1, 0x1cb0 + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 08184C 80080C4C 26D61CA0 */ addiu $s6, %lo(D_800E1C70 - 0x7FFFFFD0) # addiu $s6, $s6, 0x1ca0 /* 081850 80080C50 3C150500 */ lui $s5, 0x500 /* 081854 80080C54 3C140400 */ lui $s4, 0x400 /* 081858 80080C58 3C13E700 */ lui $s3, 0xe700 diff --git a/asm/non_matchings/unknown_080500/func_80080E90.s b/asm/non_matchings/unknown_080500/func_80080E90.s index 2ea5c8c7..0886cc4d 100644 --- a/asm/non_matchings/unknown_080500/func_80080E90.s +++ b/asm/non_matchings/unknown_080500/func_80080E90.s @@ -19,12 +19,14 @@ glabel func_80080E90 /* 081AD4 80080ED4 AC6F0000 */ sw $t7, ($v1) /* 081AD8 80080ED8 AC780004 */ sw $t8, 4($v1) /* 081ADC 80080EDC 8C830000 */ lw $v1, ($a0) -/* 081AE0 80080EE0 3C0F000E */ lui $t7, %hi(D_000E1CC0) # $t7, 0xe + # D_800E1C70 - 0x7FFFFFB0 = 0xE1CC0 +/* 081AE0 80080EE0 3C0F000E */ lui $t7, %hi(D_800E1C70 - 0x7FFFFFB0) # $t7, 0xe /* 081AE4 80080EE4 24790008 */ addiu $t9, $v1, 8 /* 081AE8 80080EE8 AC990000 */ sw $t9, ($a0) /* 081AEC 80080EEC 3C0E0702 */ lui $t6, (0x07020010 >> 16) # lui $t6, 0x702 /* 081AF0 80080EF0 35CE0010 */ ori $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10 -/* 081AF4 80080EF4 25EF1CC0 */ addiu $t7, %lo(D_000E1CC0) # addiu $t7, $t7, 0x1cc0 + # D_800E1C70 - 0x7FFFFFB0 = 0xE1CC0 +/* 081AF4 80080EF4 25EF1CC0 */ addiu $t7, %lo(D_800E1C70 - 0x7FFFFFB0) # addiu $t7, $t7, 0x1cc0 /* 081AF8 80080EF8 AC6F0004 */ sw $t7, 4($v1) /* 081AFC 80080EFC AC6E0000 */ sw $t6, ($v1) /* 081B00 80080F00 8FB70058 */ lw $s7, 0x58($sp) diff --git a/asm/non_matchings/unknown_080500/func_80081C04.s b/asm/non_matchings/unknown_080500/func_80081C04.s index e10df426..dcda4470 100644 --- a/asm/non_matchings/unknown_080500/func_80081C04.s +++ b/asm/non_matchings/unknown_080500/func_80081C04.s @@ -5,7 +5,7 @@ glabel func_80081C04 /* 082810 80081C10 00A0A025 */ move $s4, $a1 /* 082814 80081C14 AFB30024 */ sw $s3, 0x24($sp) /* 082818 80081C18 AFB1001C */ sw $s1, 0x1c($sp) -/* 08281C 80081C1C 3C103B9A */ lui $s0, %hi(D_3B9A0001) # $s0, 0x3b9a +/* 08281C 80081C1C 3C103B9A */ lui $s0, %hi(0x3B9A0001) # $s0, 0x3b9a /* 082820 80081C20 00808825 */ move $s1, $a0 /* 082824 80081C24 AFBF002C */ sw $ra, 0x2c($sp) /* 082828 80081C28 AFB20020 */ sw $s2, 0x20($sp) @@ -135,7 +135,7 @@ glabel func_80081C04 /* 0829E0 80081DE0 92290000 */ lbu $t1, ($s1) /* 0829E4 80081DE4 0C027298 */ jal func_8009CA60 /* 0829E8 80081DE8 A5490018 */ sh $t1, 0x18($t2) -/* 0829EC 80081DEC 26100001 */ addiu $s0, %lo(D_3B9A0001) # addiu $s0, $s0, 1 +/* 0829EC 80081DEC 26100001 */ addiu $s0, %lo(0x3B9A0001) # addiu $s0, $s0, 1 /* 0829F0 80081DF0 26310001 */ addiu $s1, $s1, 1 /* 0829F4 80081DF4 1613FFF4 */ bne $s0, $s3, .L80081DC8 /* 0829F8 80081DF8 2694000C */ addiu $s4, $s4, 0xc diff --git a/asm/non_matchings/unknown_080500/func_8008AD44.s b/asm/non_matchings/unknown_080500/func_8008AD44.s index 0828fffa..90710aba 100644 --- a/asm/non_matchings/unknown_080500/func_8008AD44.s +++ b/asm/non_matchings/unknown_080500/func_8008AD44.s @@ -9,8 +9,8 @@ glabel func_8008AD44 /* 08B960 8008AD60 AFB1001C */ sw $s1, 0x1c($sp) /* 08B964 8008AD64 15C0003B */ bnez $t6, .L8008AE54 /* 08B968 8008AD68 AFB00018 */ sw $s0, 0x18($sp) -/* 08B96C 8008AD6C 3C1000AD */ lui $s0, %hi(D_00AC9630) # $s0, 0xad -/* 08B970 8008AD70 26109630 */ addiu $s0, %lo(D_00AC9630) # addiu $s0, $s0, -0x69d0 +/* 08B96C 8008AD6C 3C1000AD */ lui $s0, %hi(__ROM_END) # $s0, 0xad +/* 08B970 8008AD70 26109630 */ addiu $s0, %lo(__ROM_END) # addiu $s0, $s0, -0x69d0 /* 08B974 8008AD74 2610F000 */ addiu $s0, $s0, -0x1000 /* 08B978 8008AD78 24131000 */ li $s3, 4096 /* 08B97C 8008AD7C 02009025 */ move $s2, $s0 @@ -75,8 +75,8 @@ glabel func_8008AD44 /* 08BA4C 8008AE4C 3C01800E */ lui $at, %hi(D_800E1E18) # $at, 0x800e /* 08BA50 8008AE50 AC2A1E18 */ sw $t2, %lo(D_800E1E18)($at) .L8008AE54: -/* 08BA54 8008AE54 3C1000AD */ lui $s0, %hi(D_00AC9630) # $s0, 0xad -/* 08BA58 8008AE58 26109630 */ addiu $s0, %lo(D_00AC9630) # addiu $s0, $s0, -0x69d0 +/* 08BA54 8008AE54 3C1000AD */ lui $s0, %hi(__ROM_END) # $s0, 0xad +/* 08BA58 8008AE58 26109630 */ addiu $s0, %lo(__ROM_END) # addiu $s0, $s0, -0x69d0 /* 08BA5C 8008AE5C 00002025 */ move $a0, $zero /* 08BA60 8008AE60 00002825 */ move $a1, $zero /* 08BA64 8008AE64 00003025 */ move $a2, $zero diff --git a/asm/non_matchings/unknown_0B8920/func_800B82B4.s b/asm/non_matchings/unknown_0B8920/func_800B82B4.s index ddd79fb5..6408d34a 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B82B4.s +++ b/asm/non_matchings/unknown_0B8920/func_800B82B4.s @@ -238,7 +238,7 @@ glabel func_800B82B4 .L800B8618: /* 0B9218 800B8618 0C01BE46 */ jal save_rng_seed /* 0B921C 800B861C 00000000 */ nop -/* 0B9220 800B8620 3C045741 */ lui $a0, %hi(D_57410001) # $a0, 0x5741 +/* 0B9220 800B8620 3C045741 */ lui $a0, %hi(0x57410001) # $a0, 0x5741 /* 0B9224 800B8624 0C01BE43 */ jal set_rng_seed /* 0B9228 800B8628 34845646 */ ori $a0, (0x57415646 & 0xFFFF) # ori $a0, $a0, 0x5646 /* 0B922C 800B862C 8E830004 */ lw $v1, 4($s4) @@ -318,7 +318,7 @@ glabel func_800B82B4 /* 0B932C 800B872C 8C4E0000 */ lw $t6, ($v0) /* 0B9330 800B8730 460A1402 */ mul.s $f16, $f2, $f10 /* 0B9334 800B8734 01C37821 */ addu $t7, $t6, $v1 -/* 0B9338 800B8738 24840001 */ addiu $a0, %lo(D_57410001) # addiu $a0, $a0, 1 +/* 0B9338 800B8738 24840001 */ addiu $a0, %lo(0x57410001) # addiu $a0, $a0, 1 /* 0B933C 800B873C 460084A1 */ cvt.d.s $f18, $f16 /* 0B9340 800B8740 46209180 */ add.d $f6, $f18, $f0 /* 0B9344 800B8744 444CF800 */ cfc1 $t4, $31 diff --git a/asm/non_matchings/unknown_0B8920/func_800C1130.s b/asm/non_matchings/unknown_0B8920/func_800C1130.s index e7c777d0..c2bc4259 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C1130.s +++ b/asm/non_matchings/unknown_0B8920/func_800C1130.s @@ -3,7 +3,7 @@ glabel func_800C1130 /* 0C1D34 800C1134 24E731B0 */ addiu $a3, %lo(D_800E31B0) # addiu $a3, $a3, 0x31b0 /* 0C1D38 800C1138 44842000 */ mtc1 $a0, $f4 /* 0C1D3C 800C113C 94E20000 */ lhu $v0, ($a3) -/* 0C1D40 800C1140 3C03800E */ lui $v1, %hi(D_800E0001) # $v1, 0x800e +/* 0C1D40 800C1140 3C03800E */ lui $v1, 0x800e /* 0C1D44 800C1144 1840009B */ blez $v0, .L800C13B4 /* 0C1D48 800C1148 46802020 */ cvt.s.w $f0, $f4 /* 0C1D4C 800C114C 0082082A */ slt $at, $a0, $v0 @@ -26,7 +26,7 @@ glabel func_800C1130 /* 0C1D8C 800C118C 01C23021 */ addu $a2, $t6, $v0 /* 0C1D90 800C1190 46080282 */ mul.s $f10, $f0, $f8 /* 0C1D94 800C1194 C4C60000 */ lwc1 $f6, ($a2) -/* 0C1D98 800C1198 24630001 */ addiu $v1, %lo(D_800E0001) # addiu $v1, $v1, 1 +/* 0C1D98 800C1198 24630001 */ addiu $v1, $v1, 1 /* 0C1D9C 800C119C 460A3400 */ add.s $f16, $f6, $f10 /* 0C1DA0 800C11A0 E4D00000 */ swc1 $f16, ($a2) /* 0C1DA4 800C11A4 8D4B0000 */ lw $t3, ($t2) diff --git a/asm/non_matchings/unknown_0B8920/func_800C3C00.s b/asm/non_matchings/unknown_0B8920/func_800C3C00.s index 038c5dfc..d62f7168 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C3C00.s +++ b/asm/non_matchings/unknown_0B8920/func_800C3C00.s @@ -26,7 +26,7 @@ glabel func_800C3C00 /* 0C485C 800C3C5C 1420FFF8 */ bnez $at, .L800C3C40 /* 0C4860 800C3C60 00000000 */ nop .L800C3C64: -/* 0C4864 800C3C64 3C05FFFF */ lui $a1, %hi(D_FFFF0028) # $a1, 0xffff +/* 0C4864 800C3C64 3C05FFFF */ lui $a1, %hi(0xFFFF0028) # $a1, 0xffff /* 0C4868 800C3C68 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff /* 0C486C 800C3C6C 0C01C327 */ jal func_80070C9C /* 0C4870 800C3C70 24040940 */ li $a0, 2368 @@ -156,7 +156,7 @@ glabel func_800C3C00 /* 0C4A54 800C3E54 8CCB0000 */ lw $t3, ($a2) /* 0C4A58 800C3E58 00000000 */ nop /* 0C4A5C 800C3E5C 01656021 */ addu $t4, $t3, $a1 -/* 0C4A60 800C3E60 24A50028 */ addiu $a1, %lo(D_FFFF0028) # addiu $a1, $a1, 0x28 +/* 0C4A60 800C3E60 24A50028 */ addiu $a1, %lo(0xFFFF0028) # addiu $a1, $a1, 0x28 /* 0C4A64 800C3E64 28A10140 */ slti $at, $a1, 0x140 /* 0C4A68 800C3E68 1420FF90 */ bnez $at, .L800C3CAC /* 0C4A6C 800C3E6C AD800024 */ sw $zero, 0x24($t4) diff --git a/asm/non_matchings/unknown_0B8920/func_800C45A4.s b/asm/non_matchings/unknown_0B8920/func_800C45A4.s index 0c0c54fe..d284a76d 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C45A4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C45A4.s @@ -201,8 +201,9 @@ glabel func_800C45A4 /* 0C5494 800C4894 24790008 */ addiu $t9, $v1, 8 /* 0C5498 800C4898 AE390000 */ sw $t9, ($s1) /* 0C549C 800C489C 3C180702 */ lui $t8, (0x07020010 >> 16) # lui $t8, 0x702 -/* 0C54A0 800C48A0 3C0E000E */ lui $t6, %hi(D_000E36D8) # $t6, 0xe -/* 0C54A4 800C48A4 25CE36D8 */ addiu $t6, %lo(D_000E36D8) # addiu $t6, $t6, 0x36d8 + # D_800E3690 - 0x7FFFFFB8 = 0xE36D8 +/* 0C54A0 800C48A0 3C0E000E */ lui $t6, %hi(D_800E3690 - 0x7FFFFFB8) # $t6, 0xe +/* 0C54A4 800C48A4 25CE36D8 */ addiu $t6, %lo(D_800E3690 - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8 /* 0C54A8 800C48A8 37180010 */ ori $t8, (0x07020010 & 0xFFFF) # ori $t8, $t8, 0x10 /* 0C54AC 800C48AC AC780000 */ sw $t8, ($v1) /* 0C54B0 800C48B0 AC6E0004 */ sw $t6, 4($v1) @@ -271,12 +272,14 @@ glabel func_800C45A4 /* 0C55A8 800C49A8 032FC025 */ or $t8, $t9, $t7 /* 0C55AC 800C49AC AC780004 */ sw $t8, 4($v1) /* 0C55B0 800C49B0 8E230000 */ lw $v1, ($s1) -/* 0C55B4 800C49B4 3C0F000E */ lui $t7, %hi(D_000E36C8) # $t7, 0xe + # D_800E3690 - 0x7FFFFFC8 = 0xE36C8 +/* 0C55B4 800C49B4 3C0F000E */ lui $t7, %hi(D_800E3690 - 0x7FFFFFC8) # $t7, 0xe /* 0C55B8 800C49B8 246E0008 */ addiu $t6, $v1, 8 /* 0C55BC 800C49BC AE2E0000 */ sw $t6, ($s1) /* 0C55C0 800C49C0 3C190702 */ lui $t9, (0x07020010 >> 16) # lui $t9, 0x702 /* 0C55C4 800C49C4 37390010 */ ori $t9, (0x07020010 & 0xFFFF) # ori $t9, $t9, 0x10 -/* 0C55C8 800C49C8 25EF36C8 */ addiu $t7, %lo(D_000E36C8) # addiu $t7, $t7, 0x36c8 + # D_800E3690 - 0x7FFFFFC8 = 0xE36C8 +/* 0C55C8 800C49C8 25EF36C8 */ addiu $t7, %lo(D_800E3690 - 0x7FFFFFC8) # addiu $t7, $t7, 0x36c8 /* 0C55CC 800C49CC AC6F0004 */ sw $t7, 4($v1) /* 0C55D0 800C49D0 AC790000 */ sw $t9, ($v1) /* 0C55D4 800C49D4 8E230000 */ lw $v1, ($s1) diff --git a/asm/non_matchings/unknown_0B8920/func_800C5B58.s b/asm/non_matchings/unknown_0B8920/func_800C5B58.s index 1bfbb0c2..018214fe 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C5B58.s +++ b/asm/non_matchings/unknown_0B8920/func_800C5B58.s @@ -30,8 +30,10 @@ glabel func_800C5B58 /* 0C67C8 800C5BC8 3C0D0702 */ lui $t5, (0x07020010 >> 16) # lui $t5, 0x702 /* 0C67CC 800C5BCC 244C0008 */ addiu $t4, $v0, 8 /* 0C67D0 800C5BD0 AE6C0000 */ sw $t4, ($s3) -/* 0C67D4 800C5BD4 3C0E000E */ lui $t6, %hi(D_000E36D8) # $t6, 0xe -/* 0C67D8 800C5BD8 25CE36D8 */ addiu $t6, %lo(D_000E36D8) # addiu $t6, $t6, 0x36d8 + # D_800E3690 - 0x7FFFFFB8 = 0xE36D8 +/* 0C67D4 800C5BD4 3C0E000E */ lui $t6, %hi(D_800E3690 - 0x7FFFFFB8) # $t6, 0xe + # D_800E3690 - 0x7FFFFFB8 = 0xE36D8 +/* 0C67D8 800C5BD8 25CE36D8 */ addiu $t6, %lo(D_800E3690 - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8 /* 0C67DC 800C5BDC 35AD0010 */ ori $t5, (0x07020010 & 0xFFFF) # ori $t5, $t5, 0x10 /* 0C67E0 800C5BE0 AC4D0000 */ sw $t5, ($v0) /* 0C67E4 800C5BE4 AC4E0004 */ sw $t6, 4($v0) diff --git a/asm/unknown_031D30/func_80031130.s b/asm/unknown_031D30/func_80031130.s index 3db8cfdf..16215e95 100644 --- a/asm/unknown_031D30/func_80031130.s +++ b/asm/unknown_031D30/func_80031130.s @@ -1,7 +1,7 @@ glabel func_80031130 /* 031D30 80031130 27BDFF90 */ addiu $sp, $sp, -0x70 /* 031D34 80031134 3C080001 */ lui $t0, (0x000186A0 >> 16) # lui $t0, 1 -/* 031D38 80031138 3C09FFFE */ lui $t1, %hi(D_FFFDFFFB) # $t1, 0xfffe +/* 031D38 80031138 3C09FFFE */ lui $t1, %hi(0xFFFDFFFB) # $t1, 0xfffe /* 031D3C 8003113C AFB6002C */ sw $s6, 0x2c($sp) /* 031D40 80031140 AFB50028 */ sw $s5, 0x28($sp) /* 031D44 80031144 AFB40024 */ sw $s4, 0x24($sp) @@ -121,7 +121,7 @@ glabel func_80031130 /* 031ED8 800312D8 25080005 */ addiu $t0, $t0, 5 /* 031EDC 800312DC 0113082A */ slt $at, $t0, $s3 /* 031EE0 800312E0 14200010 */ bnez $at, .L80031324 -/* 031EE4 800312E4 2529FFFB */ addiu $t1, %lo(D_FFFDFFFB) # addiu $t1, $t1, -5 +/* 031EE4 800312E4 2529FFFB */ addiu $t1, %lo(0xFFFDFFFB) # addiu $t1, $t1, -5 /* 031EE8 800312E8 0249082A */ slt $at, $s2, $t1 /* 031EEC 800312EC 5420000E */ bnezl $at, .L80031328 /* 031EF0 800312F0 25EFFFFF */ addiu $t7, $t7, -1 diff --git a/asm/unknown_031D30/func_80031600.s b/asm/unknown_031D30/func_80031600.s index e3081a99..0d1aadda 100644 --- a/asm/unknown_031D30/func_80031600.s +++ b/asm/unknown_031D30/func_80031600.s @@ -21,10 +21,10 @@ glabel func_80031600 /* 032240 80031640 8D2A0000 */ lw $t2, ($t1) /* 032244 80031644 59400006 */ blezl $t2, .L80031660 /* 032248 80031648 95420000 */ lhu $v0, ($t2) -/* 03224C 8003164C 3C0B8000 */ lui $t3, %hi(D_80000018) # $t3, 0x8000 +/* 03224C 8003164C 3C0B8000 */ lui $t3, 0x8000 /* 032250 80031650 016A5825 */ or $t3, $t3, $t2 /* 032254 80031654 0800C651 */ j .L80031944 -/* 032258 80031658 8D6B0018 */ lw $t3, %lo(D_80000018)($t3) +/* 032258 80031658 8D6B0018 */ lw $t3, 0x18($t3) /* 03225C 8003165C 95420000 */ lhu $v0, ($t2) .L80031660: @@ -257,10 +257,10 @@ glabel func_80031954 /* 0325A0 800319A0 8D2A0000 */ lw $t2, ($t1) /* 0325A4 800319A4 59400006 */ blezl $t2, .L800319C0 /* 0325A8 800319A8 95420000 */ lhu $v0, ($t2) -/* 0325AC 800319AC 3C0B8000 */ lui $t3, %hi(D_80000018) # $t3, 0x8000 +/* 0325AC 800319AC 3C0B8000 */ lui $t3, 0x8000 /* 0325B0 800319B0 016A5825 */ or $t3, $t3, $t2 /* 0325B4 800319B4 0800C6C6 */ j .L80031B18 -/* 0325B8 800319B8 8D6B0018 */ lw $t3, %lo(D_80000018)($t3) +/* 0325B8 800319B8 8D6B0018 */ lw $t3, 0x18($t3) /* 0325BC 800319BC 95420000 */ lhu $v0, ($t2) .L800319C0: diff --git a/bss.txt b/bss.txt deleted file mode 100644 index 131d7195..00000000 --- a/bss.txt +++ /dev/null @@ -1,108 +0,0 @@ -unknown_001050 - -unknown_003260 - -unknown_005740 - -unknown_00BC20 - -unknown_0255E0 - -unknown_032760 - -unknown_0348C0 - -unknown_043920 - -unknown_05CEF0 - -unknown_05DCD0 - -unknown_05F0C0 - -unknown_05F690 - -unknown_0667D0 - -unknown_066AA0 - -unknown_06B2B0 - -unknown_071730 - -unknown_072E50 - -unknown_0777A0 - -unknown_078050 - -unknown_079F50 - -unknown_07AF10 - -unknown_07B870 - -unknown_080500 - -unknown_09F8F0 - -unknown_0AEE70 - -unknown_0C4800 - -unknown_0C7F50 -D_8012AAF0; -D_8012ACA0; -D_8012ACB8; - - -osViMgr -viThreadStack; -D_8012CCC0; -__osEventStateTab; - - -unknown_0CD820 -D_8012CD50; -D_8012CD8C; -D_8012CD90; -__osMaxControllers; -D_8012CDB8; -D_8012CDD0; -__osPfsPifRam; -D_8012CE1C; - - -unknown_0CE200 -D_8012CE20; -D_8012CE28; -D_8012CE40; -D_8012CE7C; - - -osViMgr -viThread; -viEventQueue; -viEventBuf; -viRetraceMsg; -viCounterMsg; -D_8012D190; - - -unknown_0D29F0 -D_8012D1A0; - - -unknown_0D3020 -D_8012D1E0; -piAccessQueue; -__osCurrentTime; -D_8012D224; -__osBaseCounter; -D_8012D22C; -D_8012D230; -D_8012D240; - - -unknown_071730 -D_8012D3F0; \ No newline at end of file diff --git a/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s b/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s index 7c902d6c..9f605f94 100644 --- a/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s +++ b/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s @@ -46,10 +46,10 @@ glabel viMgrMain .L800D1BAC: /* 0D27AC 800D1BAC 0C035824 */ jal __osViSwapContext /* 0D27B0 800D1BB0 00000000 */ nop -/* 0D27B4 800D1BB4 3C038013 */ lui $v1, %hi(D_8012FFFF) # $v1, 0x8013 +/* 0D27B4 800D1BB4 3C038013 */ lui $v1, %hi(D_8012D190) # $v1, 0x8013 /* 0D27B8 800D1BB8 9463D190 */ lhu $v1, %lo(D_8012D190)($v1) /* 0D27BC 800D1BBC 3C018013 */ lui $at, %hi(D_8012D190) # $at, 0x8013 -/* 0D27C0 800D1BC0 2463FFFF */ addiu $v1, %lo(D_8012FFFF) # addiu $v1, $v1, -1 +/* 0D27C0 800D1BC0 2463FFFF */ addiu $v1, $v1, -1 /* 0D27C4 800D1BC4 306FFFFF */ andi $t7, $v1, 0xffff /* 0D27C8 800D1BC8 15E0000E */ bnez $t7, .L800D1C04 /* 0D27CC 800D1BCC A42FD190 */ sh $t7, %lo(D_8012D190)($at) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s index 913eafb3..c6586ff6 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s @@ -55,8 +55,8 @@ glabel alResamplePull /* 0CCE2C 800CC22C 4626203C */ c.lt.d $f4, $f6 /* 0CCE30 800CC230 00000000 */ nop /* 0CCE34 800CC234 45020005 */ bc1fl .L800CC24C -/* 0CCE38 800CC238 3C014700 */ lui $at, %hi(D_46FF9630) # $at, 0x4700 -/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(D_46FF9630)($at) +/* 0CCE38 800CC238 3C014700 */ lui $at, %hi(0x46FF9630) # $at, 0x4700 +/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(0x46FF9630)($at) /* 0CCE40 800CC240 E5080018 */ swc1 $f8, 0x18($t0) /* 0CCE44 800CC244 C5020018 */ lwc1 $f2, 0x18($t0) /* 0CCE48 800CC248 3C014700 */ li $at, 0x47000000 # 32768.000000 diff --git a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s index 49e78744..764b8d57 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s +++ b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s @@ -49,53 +49,53 @@ glabel osInitialize /* 0CD24C 800CC64C 3C08800D */ lui $t0, %hi(__osExceptionPreamble) # $t0, 0x800d /* 0CD250 800CC650 25082CB0 */ addiu $t0, %lo(__osExceptionPreamble) # addiu $t0, $t0, 0x2cb0 /* 0CD254 800CC654 8D010000 */ lw $at, ($t0) -/* 0CD258 800CC658 3C198000 */ lui $t9, %hi(D_8000000C) # $t9, 0x8000 +/* 0CD258 800CC658 3C198000 */ lui $t9, 0x8000 /* 0CD25C 800CC65C 3C0D800D */ lui $t5, %hi(__osExceptionPreamble) # $t5, 0x800d /* 0CD260 800CC660 AF210000 */ sw $at, ($t9) /* 0CD264 800CC664 8D0B0004 */ lw $t3, 4($t0) /* 0CD268 800CC668 25AD2CB0 */ addiu $t5, %lo(__osExceptionPreamble) # addiu $t5, $t5, 0x2cb0 -/* 0CD26C 800CC66C 3C0C8000 */ lui $t4, %hi(D_8000000C) # $t4, 0x8000 -/* 0CD270 800CC670 AF2B0004 */ sw $t3, %lo(D_80000004)($t9) +/* 0CD26C 800CC66C 3C0C8000 */ lui $t4, 0x8000 +/* 0CD270 800CC670 AF2B0004 */ sw $t3, 4($t9) /* 0CD274 800CC674 8D010008 */ lw $at, 8($t0) /* 0CD278 800CC678 358C0080 */ ori $t4, (0x80000080 & 0xFFFF) # ori $t4, $t4, 0x80 /* 0CD27C 800CC67C 3C09800D */ lui $t1, %hi(__osExceptionPreamble) # $t1, 0x800d -/* 0CD280 800CC680 AF210008 */ sw $at, %lo(D_80000008)($t9) +/* 0CD280 800CC680 AF210008 */ sw $at, 8($t9) /* 0CD284 800CC684 8D0B000C */ lw $t3, 0xc($t0) /* 0CD288 800CC688 25292CB0 */ addiu $t1, %lo(__osExceptionPreamble) # addiu $t1, $t1, 0x2cb0 -/* 0CD28C 800CC68C 3C0A8000 */ lui $t2, %hi(D_8000000C) # $t2, 0x8000 -/* 0CD290 800CC690 AF2B000C */ sw $t3, %lo(D_8000000C)($t9) +/* 0CD28C 800CC68C 3C0A8000 */ lui $t2, 0x8000 +/* 0CD290 800CC690 AF2B000C */ sw $t3, 0xc($t9) /* 0CD294 800CC694 8DA10000 */ lw $at, ($t5) /* 0CD298 800CC698 354A0100 */ ori $t2, (0x80000100 & 0xFFFF) # ori $t2, $t2, 0x100 /* 0CD29C 800CC69C 3C0E800D */ lui $t6, %hi(__osExceptionPreamble) # $t6, 0x800d /* 0CD2A0 800CC6A0 AD810000 */ sw $at, ($t4) /* 0CD2A4 800CC6A4 8DB80004 */ lw $t8, 4($t5) /* 0CD2A8 800CC6A8 25CE2CB0 */ addiu $t6, %lo(__osExceptionPreamble) # addiu $t6, $t6, 0x2cb0 -/* 0CD2AC 800CC6AC 3C0F8000 */ lui $t7, %hi(D_8000000C) # $t7, 0x8000 -/* 0CD2B0 800CC6B0 AD980004 */ sw $t8, %lo(D_80000004)($t4) +/* 0CD2AC 800CC6AC 3C0F8000 */ lui $t7, 0x8000 +/* 0CD2B0 800CC6B0 AD980004 */ sw $t8, 4($t4) /* 0CD2B4 800CC6B4 8DA10008 */ lw $at, 8($t5) /* 0CD2B8 800CC6B8 35EF0180 */ ori $t7, (0x80000180 & 0xFFFF) # ori $t7, $t7, 0x180 /* 0CD2BC 800CC6BC 3C048000 */ lui $a0, 0x8000 -/* 0CD2C0 800CC6C0 AD810008 */ sw $at, %lo(D_80000008)($t4) +/* 0CD2C0 800CC6C0 AD810008 */ sw $at, 8($t4) /* 0CD2C4 800CC6C4 8DB8000C */ lw $t8, 0xc($t5) /* 0CD2C8 800CC6C8 24050190 */ li $a1, 400 -/* 0CD2CC 800CC6CC AD98000C */ sw $t8, %lo(D_8000000C)($t4) +/* 0CD2CC 800CC6CC AD98000C */ sw $t8, 0xc($t4) /* 0CD2D0 800CC6D0 8D210000 */ lw $at, ($t1) /* 0CD2D4 800CC6D4 AD410000 */ sw $at, ($t2) /* 0CD2D8 800CC6D8 8D2B0004 */ lw $t3, 4($t1) -/* 0CD2DC 800CC6DC AD4B0004 */ sw $t3, %lo(D_80000004)($t2) +/* 0CD2DC 800CC6DC AD4B0004 */ sw $t3, 4($t2) /* 0CD2E0 800CC6E0 8D210008 */ lw $at, 8($t1) -/* 0CD2E4 800CC6E4 AD410008 */ sw $at, %lo(D_80000008)($t2) +/* 0CD2E4 800CC6E4 AD410008 */ sw $at, 8($t2) /* 0CD2E8 800CC6E8 8D2B000C */ lw $t3, 0xc($t1) -/* 0CD2EC 800CC6EC AD4B000C */ sw $t3, %lo(D_8000000C)($t2) +/* 0CD2EC 800CC6EC AD4B000C */ sw $t3, 0xc($t2) /* 0CD2F0 800CC6F0 8DC10000 */ lw $at, ($t6) /* 0CD2F4 800CC6F4 ADE10000 */ sw $at, ($t7) /* 0CD2F8 800CC6F8 8DD80004 */ lw $t8, 4($t6) -/* 0CD2FC 800CC6FC ADF80004 */ sw $t8, %lo(D_80000004)($t7) +/* 0CD2FC 800CC6FC ADF80004 */ sw $t8, 4($t7) /* 0CD300 800CC700 8DC10008 */ lw $at, 8($t6) -/* 0CD304 800CC704 ADE10008 */ sw $at, %lo(D_80000008)($t7) +/* 0CD304 800CC704 ADE10008 */ sw $at, 8($t7) /* 0CD308 800CC708 8DD8000C */ lw $t8, 0xc($t6) /* 0CD30C 800CC70C 0C03518C */ jal osWritebackDCache -/* 0CD310 800CC710 ADF8000C */ sw $t8, %lo(D_8000000C)($t7) +/* 0CD310 800CC710 ADF8000C */ sw $t8, 0xC($t7) /* 0CD314 800CC714 3C048000 */ lui $a0, 0x8000 /* 0CD318 800CC718 0C0351AC */ jal osInvalICache /* 0CD31C 800CC71C 24050190 */ li $a1, 400 diff --git a/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s b/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s index 19ea5b4e..24dffdac 100644 --- a/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s +++ b/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s @@ -38,14 +38,14 @@ glabel osInvalDCache /* 0D2474 800D1874 00000000 */ nop .L800D1878: -/* 0D2478 800D1878 3C088000 */ lui $t0, %hi(D_80000010) # $t0, 0x8000 +/* 0D2478 800D1878 3C088000 */ lui $t0, 0x8000 /* 0D247C 800D187C 010B4821 */ addu $t1, $t0, $t3 /* 0D2480 800D1880 2529FFF0 */ addiu $t1, $t1, -0x10 .L800D1884: /* 0D2484 800D1884 BD010000 */ cache 1, ($t0) /* 0D2488 800D1888 0109082B */ sltu $at, $t0, $t1 /* 0D248C 800D188C 1420FFFD */ bnez $at, .L800D1884 -/* 0D2490 800D1890 25080010 */ addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10 +/* 0D2490 800D1890 25080010 */ addiu $t0, $t0, 0x10 /* 0D2494 800D1894 03E00008 */ jr $ra /* 0D2498 800D1898 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s b/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s index 4ec747ea..e89e3996 100644 --- a/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s +++ b/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s @@ -1,5 +1,5 @@ glabel osWritebackDCacheAll -/* 0D24A0 800D18A0 3C088000 */ lui $t0, %hi(D_80000010) # $t0, 0x8000 +/* 0D24A0 800D18A0 3C088000 */ lui $t0, 0x8000 /* 0D24A4 800D18A4 240A2000 */ li $t2, 8192 /* 0D24A8 800D18A8 010A4821 */ addu $t1, $t0, $t2 /* 0D24AC 800D18AC 2529FFF0 */ addiu $t1, $t1, -0x10 @@ -7,7 +7,7 @@ glabel osWritebackDCacheAll /* 0D24B0 800D18B0 BD010000 */ cache 1, ($t0) /* 0D24B4 800D18B4 0109082B */ sltu $at, $t0, $t1 /* 0D24B8 800D18B8 1420FFFD */ bnez $at, .L800D18B0 -/* 0D24BC 800D18BC 25080010 */ addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10 +/* 0D24BC 800D18BC 25080010 */ addiu $t0, $t0, 0x10 /* 0D24C0 800D18C0 03E00008 */ jr $ra /* 0D24C4 800D18C4 00000000 */ nop diff --git a/lib/asm/osInvalICache.s b/lib/asm/osInvalICache.s index dec7d2dd..4e23d32e 100644 --- a/lib/asm/osInvalICache.s +++ b/lib/asm/osInvalICache.s @@ -33,14 +33,14 @@ glabel osInvalICache /* 0D52FC 800D46FC 00000000 */ nop .L800D4700: -/* 0D5300 800D4700 3C088000 */ lui $t0, %hi(D_80000020) # $t0, 0x8000 +/* 0D5300 800D4700 3C088000 */ lui $t0, 0x8000 /* 0D5304 800D4704 010B4821 */ addu $t1, $t0, $t3 /* 0D5308 800D4708 2529FFE0 */ addiu $t1, $t1, -0x20 .L800D470C: /* 0D530C 800D470C BD000000 */ cache 0, ($t0) /* 0D5310 800D4710 0109082B */ sltu $at, $t0, $t1 /* 0D5314 800D4714 1420FFFD */ bnez $at, .L800D470C -/* 0D5318 800D4718 25080020 */ addiu $t0, %lo(D_80000020) # addiu $t0, $t0, 0x20 +/* 0D5318 800D4718 25080020 */ addiu $t0, $t0, 0x20 /* 0D531C 800D471C 03E00008 */ jr $ra /* 0D5320 800D4720 00000000 */ nop diff --git a/lib/asm/osWritebackDCache.s b/lib/asm/osWritebackDCache.s index db6ff14f..5b9a25fc 100644 --- a/lib/asm/osWritebackDCache.s +++ b/lib/asm/osWritebackDCache.s @@ -34,14 +34,14 @@ glabel osWritebackDCache /* 0D527C 800D467C 00000000 */ nop .L800D4680: -/* 0D5280 800D4680 3C088000 */ lui $t0, %hi(D_80000010) # $t0, 0x8000 +/* 0D5280 800D4680 3C088000 */ lui $t0, 0x8000 /* 0D5284 800D4684 010B4821 */ addu $t1, $t0, $t3 /* 0D5288 800D4688 2529FFF0 */ addiu $t1, $t1, -0x10 .L800D468C: /* 0D528C 800D468C BD010000 */ cache 1, ($t0) /* 0D5290 800D4690 0109082B */ sltu $at, $t0, $t1 /* 0D5294 800D4694 1420FFFD */ bnez $at, .L800D468C -/* 0D5298 800D4698 25080010 */ addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10 +/* 0D5298 800D4698 25080010 */ addiu $t0, $t0, 0x10 /* 0D529C 800D469C 03E00008 */ jr $ra /* 0D52A0 800D46A0 00000000 */ nop diff --git a/lib/src/osSetEventMesg.c b/lib/src/osSetEventMesg.c index 347200fa..82424c45 100644 --- a/lib/src/osSetEventMesg.c +++ b/lib/src/osSetEventMesg.c @@ -10,7 +10,7 @@ typedef struct __OSEventState } __OSEventState; -__OSEventState __osEventStateTab[OS_NUM_EVENTS];//__osEventStateTab[OS_NUM_EVENTS]; +__OSEventState __osEventStateTab[15]; // __osEventStateTab[OS_NUM_EVENTS]; void osSetEventMesg(OSEvent event, OSMesgQueue *mq, OSMesg msg) { register u32 saveMask = __osDisableInt(); diff --git a/lib/src/osViMgr.c b/lib/src/osViMgr.c index 36b45803..ae2185dc 100644 --- a/lib/src/osViMgr.c +++ b/lib/src/osViMgr.c @@ -5,7 +5,6 @@ #include "macros.h" #include "libultra_internal.h" -#define OS_VIM_STACKSIZE 4096 extern OSTime __osCurrentTime; extern u32 __osBaseCounter; @@ -13,7 +12,11 @@ extern u32 D_8012D22C; //__osViIntrCount OSDevMgr __osViDevMgr = {0}; -extern u8 viThreadStack[OS_VIM_STACKSIZE]; +#define OS_VIM_STACKSIZE 4096 +u8 viThreadStack[2960]; // viThreadStack[OS_VIM_STACKSIZE]; + +s32 D_8012CCC0; + extern OSThread viThread; extern OSMesgQueue viEventQueue; extern OSMesg viEventBuf[5]; //viEventBuf; diff --git a/lib/src/unknown_0C9A20.c b/lib/src/unknown_0C9A20.c index c63fb58a..3d802000 100644 --- a/lib/src/unknown_0C9A20.c +++ b/lib/src/unknown_0C9A20.c @@ -6,7 +6,7 @@ // This probably does not belong here. Please move it to the appropriate place! #define EQPOWER_LENGTH 128 -static s16 eqpower[ EQPOWER_LENGTH ] = { +s16 eqpower[ EQPOWER_LENGTH ] = { 32767, 32764, 32757, 32744, 32727, 32704, 32677, 32644, 32607, 32564, 32517, 32464, 32407, 32344, 32277, 32205, 32127, 32045, diff --git a/lib/src/unknown_0CD820.c b/lib/src/unknown_0CD820.c index 4adbd683..d09539a8 100644 --- a/lib/src/unknown_0CD820.c +++ b/lib/src/unknown_0CD820.c @@ -6,6 +6,24 @@ s32 D_800E38C0 = 0; +s32 D_8012CD50[15]; +s32 D_8012CD8C; +s8 D_8012CD90; +s8 __osMaxControllers; // 8012CD91 +s32 D_8012CD94; +s32 D_8012CD98[6]; +s32 D_8012CDB0; +s32 D_8012CDB4; +s32 D_8012CDB8; +s32 D_8012CDBC; +s32 D_8012CDC0[4]; +s32 D_8012CDD0[4]; +s32 __osPfsPifRam; // 8012CDE0 +s32 D_8012CDE4; +s32 D_8012CDE8[12]; +s32 D_8012CE18; +s32 D_8012CE1C; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s") diff --git a/lib/src/unknown_0CE200.c b/lib/src/unknown_0CE200.c index 23bcf4eb..757a3e77 100644 --- a/lib/src/unknown_0CE200.c +++ b/lib/src/unknown_0CE200.c @@ -6,6 +6,31 @@ s32 D_800E38D0 = 0; +// Ok, so I completely gave up on the rest of these bss variables. +// This is probably not the right place for them, but we can always +// fix that later. ¯\_(ツ)_/¯ + +s32 D_8012CE20[2]; +s32 D_8012CE28[6]; +s32 D_8012CE40[15]; +s32 D_8012CE7C; +s32 viThread[172]; +s32 viEventQueue[6]; +s32 viEventBuf[6]; +s32 viRetraceMsg[6]; +s32 viCounterMsg[6]; +s32 D_8012D190[4]; +s32 D_8012D1A0[16]; +s32 D_8012D1E0[2]; +s32 piAccessQueue[14]; +s32 __osCurrentTime; +s32 D_8012D224; +s32 __osBaseCounter; +s32 D_8012D22C; +s32 D_8012D230[4]; +s32 D_8012D240[108]; +s32 D_8012D3F0; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiCreateAccessQueue.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiGetAccess.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiRelAccess.s") diff --git a/src/unknown_0C7F50.c b/src/unknown_0C7F50.c index abd22408..3662e251 100644 --- a/src/unknown_0C7F50.c +++ b/src/unknown_0C7F50.c @@ -20,6 +20,7 @@ s32 D_8012AAE0[4]; OSThread D_8012AAF0; OSMesgQueue D_8012ACA0; OSMesg D_8012ACB8; +s32 D_8012ACC0[1306]; extern void *D_8012CCC0; diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 4c67e61a..568a1df7 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -26,6 +26,13 @@ LATE_DATA_FILES = [ BUILD_DIR + '/lib/src/unknown_0D3020.o' ] +BSS_LIB_ORDER_FILES = [ + BUILD_DIR + '/lib/src/osViMgr.o', + BUILD_DIR + '/lib/src/osSetEventMesg.o', + BUILD_DIR + '/lib/src/unknown_0CD820.o', + BUILD_DIR + '/lib/src/unknown_0CE200.o' +] + class GenerateLD: def __init__(self, file): print('Generating linker file...') @@ -53,6 +60,8 @@ class GenerateLD: self.gen_ucode_data_section() self.gen_bss_section() self.gen_assets_section() + self.gen_line('__ROM_END = romPos;') + self.gen_newline() self.gen_discard() self.gen_close_block() @@ -130,9 +139,9 @@ class GenerateLD: self.gen_line('.bss.noload . (NOLOAD): SUBALIGN(4)') self.gen_open_block() for file in self.files: - if file[0] not in LATE_DATA_FILES: + if file[0] not in BSS_LIB_ORDER_FILES: self.gen_line(file[0] + '(.bss);') - for file in LATE_DATA_FILES: + for file in BSS_LIB_ORDER_FILES: self.gen_line(file + '(.bss);') self.gen_close_block() self.gen_newline() diff --git a/undefined_syms.txt b/undefined_syms.txt index 27b204b3..528174a5 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1,66 +1,9 @@ -D_000E1CA0 = 0x000E1CA0; -D_000E1CB0 = 0x000E1CB0; -D_000E1CC0 = 0x000E1CC0; -D_000E36C8 = 0x000E36C8; -D_000E36D8 = 0x000E36D8; -D_000ECC30 = 0x000ECC30; -D_00AC9630 = 0x00AC9630; -D_00FF0018 = 0x00FF0018; -D_3B9A0001 = 0x3B9A0001; -D_46FF9630 = 0x46FF9630; -D_57410001 = 0x57410001; - -D_80000004 = 0x80000004; -D_80000008 = 0x80000008; -D_8000000C = 0x8000000C; -D_80000010 = 0x80000010; -D_80000018 = 0x80000018; -D_80000020 = 0x80000020; osTvType = 0x80000300; osRomBase = 0x80000308; osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -D_800E0001 = 0x800E0001; -eqpower = 0x800E37A0; - - -viThreadStack = 0x8012C130; - -D_8012CCC0 = 0x8012CCC0; - -__osEventStateTab = 0x8012CCD0; -D_8012CD50 = 0x8012CD50; -D_8012CD8C = 0x8012CD8C; -D_8012CD90 = 0x8012CD90; -__osMaxControllers = 0x8012CD91; -D_8012CDB8 = 0x8012CDB8; -D_8012CDD0 = 0x8012CDD0; -__osPfsPifRam = 0x8012CDE0; -D_8012CE1C = 0x8012CE1C; -D_8012CE20 = 0x8012CE20; -D_8012CE28 = 0x8012CE28; -D_8012CE40 = 0x8012CE40; -D_8012CE7C = 0x8012CE7C; -viThread = 0x8012CE80; -viEventQueue = 0x8012D130; -viEventBuf = 0x8012D148; -viRetraceMsg = 0x8012D160; -viCounterMsg = 0x8012D178; -D_8012D190 = 0x8012D190; -D_8012D1A0 = 0x8012D1A0; -D_8012D1E0 = 0x8012D1E0; -piAccessQueue = 0x8012D1E8; -__osCurrentTime = 0x8012D220; -D_8012D224 = 0x8012D224; -__osBaseCounter = 0x8012D228; -D_8012D22C = 0x8012D22C; -D_8012D230 = 0x8012D230; -D_8012D240 = 0x8012D240; -D_8012D3F0 = 0x8012D3F0; -D_8012FFFF = 0x8012FFFF; - D_A0000200 = 0xA0000200; D_A0000284 = 0xA0000284; SP_IMEM = 0xA4001000; @@ -101,7 +44,3 @@ D_A5000508 = 0xA5000508; D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; - -D_FF7F0001 = 0xFF7F0001; -D_FFFDFFFB = 0xFFFDFFFB; -D_FFFF0028 = 0xFFFF0028; \ No newline at end of file From e455921fb35d901abf107765d68073665ef35cb9 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 14:26:03 -0500 Subject: [PATCH 20/39] Making progress with undefined_syms --- .../unknown_066AA0/func_80068158.s | 4 +- .../unknown_066AA0/func_800682AC.s | 4 +- src/unknown_0348C0.c | 3 + src/unknown_043920.c | 28 +- src/unknown_0C4800.c | 2 + tools/python/check_undefined_syms.py | 37 + undefined_syms.txt | 1212 +---------------- 7 files changed, 74 insertions(+), 1216 deletions(-) create mode 100644 tools/python/check_undefined_syms.py diff --git a/asm/non_matchings/unknown_066AA0/func_80068158.s b/asm/non_matchings/unknown_066AA0/func_80068158.s index 592326a1..04c58b7d 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068158.s +++ b/asm/non_matchings/unknown_066AA0/func_80068158.s @@ -25,14 +25,14 @@ glabel func_80068158 /* 068DAC 800681AC 00053023 */ negu $a2, $a1 .L800681B0: /* 068DB0 800681B0 8CE50000 */ lw $a1, ($a3) -/* 068DB4 800681B4 3C19800E */ lui $t9, %hi(D_800DD064+0x30) # $t9, 0x800e +/* 068DB4 800681B4 3C19800E */ lui $t9, %hi(D_800DD064 + 0x30) # $t9, 0x800e /* 068DB8 800681B8 0005C080 */ sll $t8, $a1, 2 /* 068DBC 800681BC 0305C023 */ subu $t8, $t8, $a1 /* 068DC0 800681C0 0018C080 */ sll $t8, $t8, 2 /* 068DC4 800681C4 0305C021 */ addu $t8, $t8, $a1 /* 068DC8 800681C8 0018C080 */ sll $t8, $t8, 2 /* 068DCC 800681CC 0338C821 */ addu $t9, $t9, $t8 -/* 068DD0 800681D0 8F39D094 */ lw $t9, %lo(D_800DD064+0x30)($t9) +/* 068DD0 800681D0 8F39D094 */ lw $t9, %lo(D_800DD064 + 0x30)($t9) /* 068DD4 800681D4 3C0A800E */ lui $t2, %hi(D_800DD148) # $t2, 0x800e /* 068DD8 800681D8 332B0001 */ andi $t3, $t9, 1 /* 068DDC 800681DC 1560001A */ bnez $t3, .L80068248 diff --git a/asm/non_matchings/unknown_066AA0/func_800682AC.s b/asm/non_matchings/unknown_066AA0/func_800682AC.s index ff85466f..e232409a 100644 --- a/asm/non_matchings/unknown_066AA0/func_800682AC.s +++ b/asm/non_matchings/unknown_066AA0/func_800682AC.s @@ -8,14 +8,14 @@ glabel func_800682AC /* 068EC4 800682C4 AFA40020 */ sw $a0, 0x20($sp) /* 068EC8 800682C8 3C0F8012 */ lui $t7, %hi(D_80120CE4) # $t7, 0x8012 /* 068ECC 800682CC 8DEF0CE4 */ lw $t7, %lo(D_80120CE4)($t7) -/* 068ED0 800682D0 3C19800E */ lui $t9, %hi(D_800DD064+0x30) # $t9, 0x800e +/* 068ED0 800682D0 3C19800E */ lui $t9, %hi(D_800DD064 + 0x30) # $t9, 0x800e /* 068ED4 800682D4 000FC080 */ sll $t8, $t7, 2 /* 068ED8 800682D8 030FC023 */ subu $t8, $t8, $t7 /* 068EDC 800682DC 0018C080 */ sll $t8, $t8, 2 /* 068EE0 800682E0 030FC021 */ addu $t8, $t8, $t7 /* 068EE4 800682E4 0018C080 */ sll $t8, $t8, 2 /* 068EE8 800682E8 0338C821 */ addu $t9, $t9, $t8 -/* 068EEC 800682EC 8F39D094 */ lw $t9, %lo(D_800DD064+0x30)($t9) +/* 068EEC 800682EC 8F39D094 */ lw $t9, %lo(D_800DD064 + 0x30)($t9) /* 068EF0 800682F0 8FA40020 */ lw $a0, 0x20($sp) /* 068EF4 800682F4 332A0001 */ andi $t2, $t9, 1 /* 068EF8 800682F8 00024402 */ srl $t0, $v0, 0x10 diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 4bc02caa..7865610b 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -66,13 +66,16 @@ s32 D_800DCA7C[3] = { // Not sure about typing s32 D_800DCA88[3] = { // Not sure about typing 0, 0, 0 }; + s8 D_800DCA94[8] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00 }; + s8 D_800DCA9C[12] = { 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + u16 D_800DCAA8[64] = { 0x0000, 0x0301, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 181e6a64..d449b844 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -47,32 +47,34 @@ s32 D_800DCC34[19] = { 0, 0, 0 }; -s32 D_800DCC80[19] = { +s32 D_800DCC80[13] = { 0, 26, 27, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0, 0 +}; + +// Unused? +s16 D_800DCCB4[12] = { + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }; u16 D_800DCCCC[20] = { 0x010C, 0x010B, 0x0009, 0x010C, - 0x010C, 0x010C, 0x010C, 0x010C, - 0x010C, 0x010C, 0x010C, 0x0005, + 0x010C, 0x010C, 0x010C, 0x010C, + 0x010C, 0x010C, 0x010C, 0x0005, 0x010C, 0x010C, 0x010C, 0x010C, 0x010C, 0x010C, 0x010C, 0x0000 }; -// Used for some sort of bit mask s32 D_800DCCF4[19] = { - 1, 4, 16, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 0x100, 1, 1, - 1, 1, 1 + 1, 4, 16, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0x100, 1, 1, 1, 1, 1, }; -// Used for some sort of bit mask s32 D_800DCD40[20] = { - 0, 4, 16, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0x100, 0, 0, - 0, 0, 0, 0 + 0, 4, 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0x100, 0, 0, 0, 0, + 0, 0 }; s8 D_800DCD90[15] = { diff --git a/src/unknown_0C4800.c b/src/unknown_0C4800.c index f0f25f09..4cf1898a 100644 --- a/src/unknown_0C4800.c +++ b/src/unknown_0C4800.c @@ -48,6 +48,8 @@ s8 D_800E3710[48] = { OSDevMgr __osPiDevMgr = { 0, NULL, NULL, NULL, NULL, NULL, NULL }; +s32 pad800E375C = 0; // File boundary? + u8* D_800E3760 = NULL; u8* D_800E3764 = NULL; u8* gzip_inflate_input = NULL; diff --git a/tools/python/check_undefined_syms.py b/tools/python/check_undefined_syms.py new file mode 100644 index 00000000..a4096be4 --- /dev/null +++ b/tools/python/check_undefined_syms.py @@ -0,0 +1,37 @@ +import subprocess +import sys + +syms = None + +def main(): + load_syms() + index = 0 + while index < len(syms): + index = test_index(index) + print('Done!') + +def load_syms(): + global syms + with open('undefined_syms.txt', 'r') as inFile: + syms = inFile.read().split('\n') + +def save_syms(): + with open('undefined_syms.txt', 'w') as outFile: + outFile.write('\n'.join(syms)) + +def test_index(index): + val = syms.pop(index) + save_syms() + command = subprocess.run(['make', 'clean'], capture_output=True) + command = subprocess.run(['make', '-j12'], capture_output=True) + out = str(command.stdout)[-5:] + if out.startswith('OK'): + print(val + ' is NOT needed! Removing!') + return index + else: + print(val + ' is needed! Keeping!') + syms.insert(index, val) + save_syms() + return index + 1 + +main() diff --git a/undefined_syms.txt b/undefined_syms.txt index 237e087a..e4bb112a 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -3,13 +3,10 @@ D_000E1CB0 = 0x000E1CB0; D_000E1CC0 = 0x000E1CC0; D_000E36C8 = 0x000E36C8; D_000E36D8 = 0x000E36D8; -D_000ECB60 = 0x000ECB60; D_000ECC30 = 0x000ECC30; D_00AC9630 = 0x00AC9630; -D_00FF0004 = 0x00FF0004; D_00FF0018 = 0x00FF0018; D_3B9A0001 = 0x3B9A0001; -D_3FC069AC = 0x3FC069AC; D_46FF9630 = 0x46FF9630; D_57410001 = 0x57410001; D_80000004 = 0x80000004; @@ -23,1529 +20,367 @@ osRomBase = 0x80000308; osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -func_80002A98 = 0x80002A98; -D_80002E38 = 0x80002E38; -D_80003008 = 0x80003008; -_sndpVoiceHandler = 0x800033C8; -D_80019808 = 0x80019808; -D_80024D54 = 0x80024D54; -__CSPVoiceHandler = 0x80062408; -alFxPull = 0x80063C30; -alFxParam = 0x80063F94; -alFxParamHdl = 0x80063FAC; -alAuxBusPull = 0x80065900; -alAuxBusParam = 0x800659D4; + D_80065D40 = 0x80065D40; -D_80065D98 = 0x80065D98; -D_8006C330 = 0x8006C330; -__scMain = 0x800795AC; -D_8008F618 = 0x8008F618; -D_800B6FC4 = 0x800B6FC4; -func_800C7340 = 0x800C7340; -D_800C74A0 = 0x800C74A0; -D_800C9D40 = 0x800C9D40; -alEnvMixerPull = 0x800CA0D0; -alEnvmixerParam = 0x800CAA7C; -alLoadParam = 0x800CB540; -D_800CB714 = 0x800CB714; -alLoadPull = 0x800CBBEC; -alResampleParam = 0x800CC090; -alResamplePull = 0x800CC17C; -alMainBusParam = 0x800CC390; -alMainBusPull = 0x800CC3C0; -alSaveParam = 0x800CC4E0; -alSavePull = 0x800CC514; -viMgrMain = 0x800D1B08; -osPiRawStartDma = 0x800D25A0; -osEPiRawStartDma = 0x800D2680; -__osDevMgrMain = 0x800D2760; -__osExceptionPreamble = 0x800D2CB0; -__osException = 0x800D2CC0; __osCleanupThread = 0x800D35A0; D_800D7600 = 0x800D7600; D_800D84C0 = 0x800D84C0; D_800D8590 = 0x800D8590; D_800D9790 = 0x800D9790; D_800DA970 = 0x800DA970; -D_800DD430 = 0x800DD430; -D_800DD434 = 0x800DD434; -D_800DD438 = 0x800DD438; -D_800DD43C = 0x800DD43C; +D_800DD407 = 0x800DD407; D_800DDC3E = 0x800DDC3E; +D_800DF598 = 0x800DF598; +D_800DF763 = 0x800DF763; +D_800DF7C6 = 0x800DF7C6; +D_800DF7C8 = 0x800DF7C8; +D_800DF7CA = 0x800DF7CA; +D_800DF7DA = 0x800DF7DA; +D_800DF7E4 = 0x800DF7E4; +D_800DF7EC = 0x800DF7EC; +D_800DF7F4 = 0x800DF7F4; D_800DFA14 = 0x800DFA14; -D_800DFA2C = 0x800DFA2C; -D_800DFA38 = 0x800DFA38; -D_800DFA3C = 0x800DFA3C; D_800DFA48 = 0x800DFA48; -D_800DFABC = 0x800DFABC; -D_800DFAC0 = 0x800DFAC0; -D_800DFAC4 = 0x800DFAC4; -D_800DFAC8 = 0x800DFAC8; -D_800DFADC = 0x800DFADC; -D_800DFAE0 = 0x800DFAE0; -D_800DFAE4 = 0x800DFAE4; -D_800DFAFC = 0x800DFAFC; -D_800DFB14 = 0x800DFB14; -D_800DFB2C = 0x800DFB2C; -D_800DFB40 = 0x800DFB40; -D_800DFB5C = 0x800DFB5C; -D_800DFB74 = 0x800DFB74; -D_800DFB8C = 0x800DFB8C; -D_800DFBA4 = 0x800DFBA4; -D_800DFBBC = 0x800DFBBC; -D_800DFBDC = 0x800DFBDC; -D_800DFC10 = 0x800DFC10; -D_800DFC20 = 0x800DFC20; -D_800DFC30 = 0x800DFC30; -D_800DFC40 = 0x800DFC40; -D_800DFC50 = 0x800DFC50; -D_800DFC60 = 0x800DFC60; -D_800DFC78 = 0x800DFC78; -D_800DFCAC = 0x800DFCAC; -D_800DFCB4 = 0x800DFCB4; -D_800DFD94 = 0x800DFD94; -gActiveMagicCodes = 0x800DFD98; -gUnlockedMagicCodes = 0x800DFD9C; -D_800DFDA0 = 0x800DFDA0; -D_800DFDB4 = 0x800DFDB4; D_800DFDB5 = 0x800DFDB5; -D_800DFDC8 = 0x800DFDC8; -D_800DFDCC = 0x800DFDCC; -D_800DFDD0 = 0x800DFDD0; -D_800DFE40 = 0x800DFE40; -D_800DFEC0 = 0x800DFEC0; -D_800DFF40 = 0x800DFF40; -D_800DFFD0 = 0x800DFFD0; -D_800DFFD4 = 0x800DFFD4; -D_800DFFD8 = 0x800DFFD8; D_800E0001 = 0x800E0001; D_800E002C = 0x800E002C; D_800E0038 = 0x800E0038; D_800E004C = 0x800E004C; D_800E006C = 0x800E006C; D_800E0138 = 0x800E0138; -D_800E0198 = 0x800E0198; D_800E0235 = 0x800E0235; -D_800E0278 = 0x800E0278; -D_800E0398 = 0x800E0398; -D_800E03A4 = 0x800E03A4; -D_800E03B0 = 0x800E03B0; -D_800E03CC = 0x800E03CC; -D_800E03FC = 0x800E03FC; -D_800E0410 = 0x800E0410; -D_800E0414 = 0x800E0414; -D_800E0418 = 0x800E0418; -D_800E041C = 0x800E041C; -D_800E042C = 0x800E042C; -D_800E043C = 0x800E043C; -D_800E044C = 0x800E044C; -D_800E045C = 0x800E045C; -D_800E0474 = 0x800E0474; -D_800E048C = 0x800E048C; -D_800E04A4 = 0x800E04A4; -D_800E04BC = 0x800E04BC; -D_800E04D4 = 0x800E04D4; -D_800E04E4 = 0x800E04E4; -D_800E04F4 = 0x800E04F4; -D_800E0504 = 0x800E0504; -D_800E0514 = 0x800E0514; -D_800E0524 = 0x800E0524; -D_800E0534 = 0x800E0534; -D_800E0544 = 0x800E0544; -D_800E0554 = 0x800E0554; -D_800E0564 = 0x800E0564; -D_800E0574 = 0x800E0574; -D_800E0584 = 0x800E0584; -D_800E0594 = 0x800E0594; -D_800E05A4 = 0x800E05A4; -D_800E05B4 = 0x800E05B4; -D_800E05C4 = 0x800E05C4; -D_800E05D4 = 0x800E05D4; -D_800E05F4 = 0x800E05F4; -D_800E0614 = 0x800E0614; -D_800E0624 = 0x800E0624; -D_800E0648 = 0x800E0648; -D_800E0660 = 0x800E0660; -D_800E0678 = 0x800E0678; -D_800E0688 = 0x800E0688; -D_800E06B0 = 0x800E06B0; -D_800E06C4 = 0x800E06C4; -D_800E06D4 = 0x800E06D4; -D_800E06E4 = 0x800E06E4; -D_800E0700 = 0x800E0700; -D_800E0710 = 0x800E0710; -D_800E072E = 0x800E072E; -D_800E0730 = 0x800E0730; D_800E0758 = 0x800E0758; -D_800E07C4 = 0x800E07C4; -D_800E07E0 = 0x800E07E0; -D_800E07E8 = 0x800E07E8; -D_800E0830 = 0x800E0830; -D_800E0840 = 0x800E0840; -D_800E0968 = 0x800E0968; -D_800E096C = 0x800E096C; -D_800E0970 = 0x800E0970; -D_800E0974 = 0x800E0974; -D_800E0978 = 0x800E0978; -D_800E097C = 0x800E097C; -D_800E0980 = 0x800E0980; -D_800E0984 = 0x800E0984; -D_800E0988 = 0x800E0988; -D_800E098C = 0x800E098C; -D_800E0990 = 0x800E0990; -D_800E09A0 = 0x800E09A0; -D_800E09B0 = 0x800E09B0; -D_800E09C4 = 0x800E09C4; -D_800E09D8 = 0x800E09D8; -D_800E09EC = 0x800E09EC; -D_800E09F8 = 0x800E09F8; -D_800E0A04 = 0x800E0A04; -D_800E0A10 = 0x800E0A10; -D_800E0A14 = 0x800E0A14; -D_800E0A24 = 0x800E0A24; -D_800E0A40 = 0x800E0A40; -D_800E0A50 = 0x800E0A50; -D_800E0A60 = 0x800E0A60; -D_800E0A70 = 0x800E0A70; D_800E0A80 = 0x800E0A80; D_800E0A90 = 0x800E0A90; -D_800E0AA0 = 0x800E0AA0; -D_800E0AB0 = 0x800E0AB0; -D_800E0AC0 = 0x800E0AC0; -D_800E0AD0 = 0x800E0AD0; -D_800E0AE0 = 0x800E0AE0; -D_800E0AF0 = 0x800E0AF0; -D_800E0B18 = 0x800E0B18; -D_800E0BCC = 0x800E0BCC; -D_800E0BEC = 0x800E0BEC; D_800E0C00 = 0x800E0C00; -D_800E0CEC = 0x800E0CEC; D_800E0D20 = 0x800E0D20; D_800E0D40 = 0x800E0D40; D_800E0D60 = 0x800E0D60; D_800E0DCC = 0x800E0DCC; -D_800E0E4C = 0x800E0E4C; -D_800E0F6C = 0x800E0F6C; -D_800E0F8C = 0x800E0F8C; -D_800E0F90 = 0x800E0F90; -D_800E0F94 = 0x800E0F94; -D_800E0F98 = 0x800E0F98; -D_800E0F9C = 0x800E0F9C; -D_800E0FA0 = 0x800E0FA0; -D_800E0FA4 = 0x800E0FA4; -D_800E0FA8 = 0x800E0FA8; -D_800E0FAC = 0x800E0FAC; -D_800E0FB0 = 0x800E0FB0; -D_800E0FB4 = 0x800E0FB4; -D_800E0FD8 = 0x800E0FD8; -D_800E0FE4 = 0x800E0FE4; -gTrophyRaceWorldId = 0x800E0FE8; -D_800E0FEC = 0x800E0FEC; -D_800E0FF0 = 0x800E0FF0; -D_800E1004 = 0x800E1004; -D_800E1024 = 0x800E1024; -D_800E1040 = 0x800E1040; -D_800E1048 = 0x800E1048; D_800E1088 = 0x800E1088; -D_800E14BC = 0x800E14BC; -D_800E153C = 0x800E153C; -D_800E1564 = 0x800E1564; -D_800E1594 = 0x800E1594; -D_800E15BC = 0x800E15BC; -D_800E15EC = 0x800E15EC; -D_800E1614 = 0x800E1614; -D_800E1644 = 0x800E1644; -D_800E166C = 0x800E166C; -D_800E169C = 0x800E169C; -D_800E16C4 = 0x800E16C4; -D_800E16F4 = 0x800E16F4; -D_800E1708 = 0x800E1708; -D_800E174C = 0x800E174C; -D_800E1754 = 0x800E1754; -D_800E1768 = 0x800E1768; -D_800E1780 = 0x800E1780; -D_800E17D8 = 0x800E17D8; -D_800E17F0 = 0x800E17F0; -D_800E17F4 = 0x800E17F4; -D_800E18F8 = 0x800E18F8; -D_800E1938 = 0x800E1938; -D_800E1A94 = 0x800E1A94; -D_800E1AE4 = 0x800E1AE4; -D_800E1AF8 = 0x800E1AF8; -D_800E1B4C = 0x800E1B4C; -D_800E1B50 = 0x800E1B50; D_800E1B58 = 0x800E1B58; -D_800E1C70 = 0x800E1C70; -D_800E1CD0 = 0x800E1CD0; -D_800E1CF0 = 0x800E1CF0; -D_800E1D2C = 0x800E1D2C; -D_800E1D7C = 0x800E1D7C; -D_800E1DA4 = 0x800E1DA4; D_800E1DA8 = 0x800E1DA8; -D_800E1DAC = 0x800E1DAC; D_800E1DB0 = 0x800E1DB0; -D_800E1DB4 = 0x800E1DB4; -D_800E1DB8 = 0x800E1DB8; -D_800E1DBC = 0x800E1DBC; -D_800E1DC0 = 0x800E1DC0; -D_800E1DC4 = 0x800E1DC4; -D_800E1DC8 = 0x800E1DC8; -D_800E1DE8 = 0x800E1DE8; -D_800E1DF0 = 0x800E1DF0; -D_800E1E08 = 0x800E1E08; -D_800E1E10 = 0x800E1E10; -D_800E1E14 = 0x800E1E14; -D_800E1E18 = 0x800E1E18; -D_800E1E1C = 0x800E1E1C; -D_800E1E20 = 0x800E1E20; -D_800E1E28 = 0x800E1E28; -D_800E1E2C = 0x800E1E2C; -D_800E1E40 = 0x800E1E40; -D_800E1E64 = 0x800E1E64; -D_800E25C4 = 0x800E25C4; -D_800E2684 = 0x800E2684; -D_800E2770 = 0x800E2770; D_800E2772 = 0x800E2772; -D_800E2790 = 0x800E2790; -D_800E2794 = 0x800E2794; -D_800E27A4 = 0x800E27A4; -D_800E27A8 = 0x800E27A8; -D_800E27AC = 0x800E27AC; -D_800E27B8 = 0x800E27B8; -D_800E27BC = 0x800E27BC; -D_800E2834 = 0x800E2834; -D_800E2838 = 0x800E2838; -D_800E2850 = 0x800E2850; -D_800E28D4 = 0x800E28D4; -D_800E28D8 = 0x800E28D8; -D_800E2904 = 0x800E2904; -D_800E2908 = 0x800E2908; -D_800E290C = 0x800E290C; -D_800E2910 = 0x800E2910; -D_800E2914 = 0x800E2914; -D_800E291C = 0x800E291C; -D_800E2920 = 0x800E2920; -D_800E2928 = 0x800E2928; -D_800E2980 = 0x800E2980; -D_800E29A0 = 0x800E29A0; -D_800E29E0 = 0x800E29E0; -D_800E2A30 = 0x800E2A30; -D_800E2A80 = 0x800E2A80; -D_800E2A84 = 0x800E2A84; -D_800E2A88 = 0x800E2A88; -D_800E2A8C = 0x800E2A8C; -D_800E2A90 = 0x800E2A90; -D_800E2A94 = 0x800E2A94; -D_800E2A98 = 0x800E2A98; -D_800E2A9C = 0x800E2A9C; -D_800E2AA0 = 0x800E2AA0; -D_800E2AA4 = 0x800E2AA4; -D_800E2AA8 = 0x800E2AA8; -D_800E2AAC = 0x800E2AAC; -D_800E2B4C = 0x800E2B4C; -D_800E2C2C = 0x800E2C2C; D_800E2C38 = 0x800E2C38; D_800E2C50 = 0x800E2C50; -D_800E2C5C = 0x800E2C5C; -D_800E2C60 = 0x800E2C60; -D_800E2C64 = 0x800E2C64; -D_800E2C68 = 0x800E2C68; -D_800E2C6C = 0x800E2C6C; -D_800E2C70 = 0x800E2C70; -D_800E2C74 = 0x800E2C74; -D_800E2C78 = 0x800E2C78; -D_800E2C7C = 0x800E2C7C; -D_800E2C80 = 0x800E2C80; -D_800E2C84 = 0x800E2C84; -D_800E2C88 = 0x800E2C88; -D_800E2C8C = 0x800E2C8C; -D_800E2C90 = 0x800E2C90; -D_800E2C94 = 0x800E2C94; -D_800E2C98 = 0x800E2C98; -D_800E2CA0 = 0x800E2CA0; -D_800E2CA4 = 0x800E2CA4; -D_800E2CA8 = 0x800E2CA8; -D_800E2CAC = 0x800E2CAC; -D_800E2CB0 = 0x800E2CB0; -D_800E2CB4 = 0x800E2CB4; -D_800E2CB8 = 0x800E2CB8; -D_800E2CBC = 0x800E2CBC; -D_800E2CC0 = 0x800E2CC0; -D_800E2CC4 = 0x800E2CC4; -D_800E2CC8 = 0x800E2CC8; -D_800E2CCC = 0x800E2CCC; -D_800E2CD0 = 0x800E2CD0; -D_800E2CD4 = 0x800E2CD4; -D_800E2CD8 = 0x800E2CD8; -D_800E2CDC = 0x800E2CDC; -D_800E2CE0 = 0x800E2CE0; -D_800E2CE4 = 0x800E2CE4; -D_800E2CE8 = 0x800E2CE8; -D_800E2CEC = 0x800E2CEC; -D_800E2CF0 = 0x800E2CF0; -D_800E2CF4 = 0x800E2CF4; -D_800E2CF8 = 0x800E2CF8; -D_800E2CFC = 0x800E2CFC; -D_800E2D00 = 0x800E2D00; -D_800E2D08 = 0x800E2D08; -D_800E2D58 = 0x800E2D58; -D_800E2D78 = 0x800E2D78; -D_800E2DF8 = 0x800E2DF8; -D_800E2E28 = 0x800E2E28; -D_800E2E2C = 0x800E2E2C; -D_800E2E4C = 0x800E2E4C; -D_800E2E50 = 0x800E2E50; -D_800E2E54 = 0x800E2E54; -D_800E2E58 = 0x800E2E58; -D_800E2E5C = 0x800E2E5C; -D_800E2E60 = 0x800E2E60; -D_800E2E64 = 0x800E2E64; -D_800E2E68 = 0x800E2E68; -D_800E2E74 = 0x800E2E74; -D_800E2E84 = 0x800E2E84; -D_800E2EC4 = 0x800E2EC4; -D_800E2EEC = 0x800E2EEC; -D_800E2EF0 = 0x800E2EF0; -D_800E2EF4 = 0x800E2EF4; -D_800E2FB8 = 0x800E2FB8; -D_800E3020 = 0x800E3020; -D_800E3024 = 0x800E3024; -D_800E3028 = 0x800E3028; -D_800E302C = 0x800E302C; -D_800E3040 = 0x800E3040; -D_800E3044 = 0x800E3044; -D_800E3048 = 0x800E3048; -D_800E304C = 0x800E304C; -D_800E3050 = 0x800E3050; -D_800E3070 = 0x800E3070; -D_800E3078 = 0x800E3078; -D_800E3080 = 0x800E3080; -D_800E3090 = 0x800E3090; -D_800E30D0 = 0x800E30D0; -D_800E30D4 = 0x800E30D4; -D_800E30D8 = 0x800E30D8; -D_800E30DC = 0x800E30DC; -D_800E30E0 = 0x800E30E0; -D_800E30E4 = 0x800E30E4; -D_800E30E8 = 0x800E30E8; -D_800E30FC = 0x800E30FC; -D_800E3110 = 0x800E3110; -D_800E3144 = 0x800E3144; -D_800E3178 = 0x800E3178; -D_800E317C = 0x800E317C; -D_800E3180 = 0x800E3180; -D_800E3184 = 0x800E3184; -D_800E3188 = 0x800E3188; -D_800E318C = 0x800E318C; -D_800E3190 = 0x800E3190; -D_800E3194 = 0x800E3194; -D_800E3198 = 0x800E3198; -D_800E31A0 = 0x800E31A0; -D_800E31A4 = 0x800E31A4; -D_800E31A8 = 0x800E31A8; -D_800E31AC = 0x800E31AC; -D_800E31B0 = 0x800E31B0; -D_800E31B4 = 0x800E31B4; -D_800E31B8 = 0x800E31B8; -D_800E31BC = 0x800E31BC; -D_800E31C0 = 0x800E31C0; -D_800E31C4 = 0x800E31C4; -D_800E31C8 = 0x800E31C8; -D_800E31CC = 0x800E31CC; -D_800E31D0 = 0x800E31D0; -D_800E31D8 = 0x800E31D8; -D_800E3230 = 0x800E3230; -D_800E3268 = 0x800E3268; -D_800E32A0 = 0x800E32A0; -D_800E32AC = 0x800E32AC; -D_800E32B8 = 0x800E32B8; -D_800E32D0 = 0x800E32D0; -D_800E32DC = 0x800E32DC; -D_800E330C = 0x800E330C; -D_800E3318 = 0x800E3318; -D_800E3324 = 0x800E3324; -D_800E3338 = 0x800E3338; -D_800E3344 = 0x800E3344; -D_800E3440 = 0x800E3440; -D_800E349C = 0x800E349C; -D_800E34F8 = 0x800E34F8; -D_800E3554 = 0x800E3554; -D_800E3648 = 0x800E3648; -D_800E3670 = 0x800E3670; -D_800E3674 = 0x800E3674; -D_800E3678 = 0x800E3678; -D_800E367C = 0x800E367C; -D_800E3680 = 0x800E3680; -D_800E3690 = 0x800E3690; -D_800E36E8 = 0x800E36E8; -D_800E36EC = 0x800E36EC; -D_800E3710 = 0x800E3710; -__osPiDevMgr = 0x800E3740; -D_800E3748 = 0x800E3748; -D_800E3760 = 0x800E3760; -D_800E3764 = 0x800E3764; -gzip_inflate_input = 0x800E3768; -gzip_inflate_output = 0x800E376C; -D_800E3770 = 0x800E3770; -D_800E3774 = 0x800E3774; -D_800E3778 = 0x800E3778; -D_800E377C = 0x800E377C; -alGlobals = 0x800E3780; -D_800E3790 = 0x800E3790; eqpower = 0x800E37A0; -D_800E38A0 = 0x800E38A0; -D_800E38A4 = 0x800E38A4; -D_800E38A8 = 0x800E38A8; -D_800E38AC = 0x800E38AC; -D_800E38B0 = 0x800E38B0; -D_800E38C0 = 0x800E38C0; -D_800E38D0 = 0x800E38D0; -__osViDevMgr = 0x800E38E0; -D_800E3900 = 0x800E3900; -D_800E4620 = 0x800E4620; -D_800E4670 = 0x800E4670; -D_800E46C0 = 0x800E46C0; -D_800E4710 = 0x800E4710; -D_800E4760 = 0x800E4760; -D_800E47B0 = 0x800E47B0; -__osPiAccessQueueEnabled = 0x800E4800; D_800E4810 = 0x800E4810; -__osViCurr = 0x800E4870; -__osViNext = 0x800E4874; D_800E4878 = 0x800E4878; -__osThreadTail = 0x800E4880; __RunQueue = 0x800E4888; __osActiveQueue = 0x800E488C; -__osRunningThread = 0x800E4890; -D_800E4894 = 0x800E4894; -D_800E48C0 = 0x800E48C0; -D_800E48E4 = 0x800E48E4; -D_800E4910 = 0x800E4910; -D_800E4920 = 0x800E4920; -D_800E4934 = 0x800E4934; -D_800E49DC = 0x800E49DC; -D_800E49E0 = 0x800E49E0; -D_800E49E4 = 0x800E49E4; -D_800E49E8 = 0x800E49E8; -D_800E49EC = 0x800E49EC; -D_800E4BB0 = 0x800E4BB0; -D_800E4BF0 = 0x800E4BF0; -D_800E4BF8 = 0x800E4BF8; D_800E4BFC = 0x800E4BFC; -D_800E4C00 = 0x800E4C00; -D_800E4C08 = 0x800E4C08; D_800E4C0C = 0x800E4C0C; -D_800E4C10 = 0x800E4C10; D_800E4C14 = 0x800E4C14; -D_800E4C18 = 0x800E4C18; D_800E4C1C = 0x800E4C1C; -D_800E4C20 = 0x800E4C20; D_800E4C24 = 0x800E4C24; -D_800E4C28 = 0x800E4C28; D_800E4C2C = 0x800E4C2C; -D_800E4C30 = 0x800E4C30; D_800E4C34 = 0x800E4C34; -D_800E4C38 = 0x800E4C38; -D_800E4C40 = 0x800E4C40; D_800E4C44 = 0x800E4C44; -D_800E4C48 = 0x800E4C48; D_800E4C4C = 0x800E4C4C; -D_800E4C50 = 0x800E4C50; D_800E4C54 = 0x800E4C54; -D_800E4C58 = 0x800E4C58; D_800E4C5C = 0x800E4C5C; -D_800E4C60 = 0x800E4C60; D_800E4C64 = 0x800E4C64; -D_800E4C68 = 0x800E4C68; D_800E4C6C = 0x800E4C6C; -D_800E4C70 = 0x800E4C70; -D_800E4C74 = 0x800E4C74; -D_800E4C78 = 0x800E4C78; -D_800E4C80 = 0x800E4C80; D_800E4C84 = 0x800E4C84; -D_800E4C88 = 0x800E4C88; D_800E4C8C = 0x800E4C8C; -D_800E4C90 = 0x800E4C90; D_800E4C94 = 0x800E4C94; -D_800E4C98 = 0x800E4C98; -D_800E4CA0 = 0x800E4CA0; D_800E4CA4 = 0x800E4CA4; -D_800E4CA8 = 0x800E4CA8; D_800E4CAC = 0x800E4CAC; -D_800E4CB0 = 0x800E4CB0; -D_800E4CB8 = 0x800E4CB8; D_800E4CBC = 0x800E4CBC; -D_800E4CC0 = 0x800E4CC0; -D_800E4CC4 = 0x800E4CC4; -D_800E4CC8 = 0x800E4CC8; D_800E4CCC = 0x800E4CCC; -D_800E4CD0 = 0x800E4CD0; -D_800E4CD4 = 0x800E4CD4; -D_800E4CD8 = 0x800E4CD8; D_800E4CDC = 0x800E4CDC; -D_800E4CE0 = 0x800E4CE0; -D_800E4CE8 = 0x800E4CE8; D_800E4CEC = 0x800E4CEC; -D_800E4CF0 = 0x800E4CF0; -D_800E4CF4 = 0x800E4CF4; -D_800E4CF8 = 0x800E4CF8; D_800E4CFC = 0x800E4CFC; -D_800E4F10 = 0x800E4F10; -D_800E4F14 = 0x800E4F14; -D_800E4F18 = 0x800E4F18; D_800E4F1C = 0x800E4F1C; -D_800E4F20 = 0x800E4F20; D_800E4F24 = 0x800E4F24; -D_800E50D4 = 0x800E50D4; -D_800E5130 = 0x800E5130; -D_800E5134 = 0x800E5134; -D_800E5138 = 0x800E5138; -D_800E513C = 0x800E513C; -D_800E5140 = 0x800E5140; -D_800E5144 = 0x800E5144; -D_800E5148 = 0x800E5148; -D_800E514C = 0x800E514C; -D_800E5150 = 0x800E5150; -D_800E5154 = 0x800E5154; -D_800E5178 = 0x800E5178; -D_800E517C = 0x800E517C; -D_800E5180 = 0x800E5180; -D_800E5184 = 0x800E5184; -D_800E5188 = 0x800E5188; -D_800E51AC = 0x800E51AC; -D_800E51B0 = 0x800E51B0; -D_800E51B4 = 0x800E51B4; -D_800E5250 = 0x800E5250; -D_800E5420 = 0x800E5420; -D_800E5538 = 0x800E5538; D_800E553C = 0x800E553C; -D_800E5540 = 0x800E5540; D_800E5544 = 0x800E5544; -D_800E5548 = 0x800E5548; D_800E554C = 0x800E554C; -D_800E5550 = 0x800E5550; -D_800E5554 = 0x800E5554; -D_800E5558 = 0x800E5558; -D_800E555C = 0x800E555C; -D_800E5560 = 0x800E5560; -D_800E5564 = 0x800E5564; -D_800E5568 = 0x800E5568; -D_800E556C = 0x800E556C; -D_800E5570 = 0x800E5570; -D_800E5578 = 0x800E5578; D_800E557C = 0x800E557C; -D_800E5580 = 0x800E5580; -D_800E5584 = 0x800E5584; -D_800E5588 = 0x800E5588; -D_800E55B8 = 0x800E55B8; D_800E55BC = 0x800E55BC; -D_800E55C0 = 0x800E55C0; D_800E55C4 = 0x800E55C4; -D_800E55C8 = 0x800E55C8; D_800E55CC = 0x800E55CC; -D_800E55D0 = 0x800E55D0; D_800E55D4 = 0x800E55D4; -D_800E55D8 = 0x800E55D8; D_800E55DC = 0x800E55DC; -D_800E55E0 = 0x800E55E0; D_800E55E4 = 0x800E55E4; -D_800E55E8 = 0x800E55E8; D_800E55EC = 0x800E55EC; -D_800E55F0 = 0x800E55F0; D_800E55F4 = 0x800E55F4; -D_800E55F8 = 0x800E55F8; D_800E55FC = 0x800E55FC; -D_800E5600 = 0x800E5600; D_800E5604 = 0x800E5604; -D_800E5608 = 0x800E5608; D_800E560C = 0x800E560C; -D_800E5610 = 0x800E5610; D_800E5614 = 0x800E5614; -D_800E5618 = 0x800E5618; D_800E561C = 0x800E561C; -D_800E5620 = 0x800E5620; D_800E5624 = 0x800E5624; -D_800E5628 = 0x800E5628; D_800E562C = 0x800E562C; -D_800E5630 = 0x800E5630; D_800E5634 = 0x800E5634; -D_800E5638 = 0x800E5638; -D_800E563C = 0x800E563C; -D_800E5640 = 0x800E5640; -D_800E5644 = 0x800E5644; -D_800E5648 = 0x800E5648; D_800E564C = 0x800E564C; -D_800E5650 = 0x800E5650; -D_800E5658 = 0x800E5658; D_800E565C = 0x800E565C; -D_800E5660 = 0x800E5660; -D_800E5668 = 0x800E5668; D_800E566C = 0x800E566C; -D_800E5670 = 0x800E5670; D_800E5674 = 0x800E5674; -D_800E5678 = 0x800E5678; -D_800E5680 = 0x800E5680; D_800E5684 = 0x800E5684; -D_800E5688 = 0x800E5688; -D_800E5864 = 0x800E5864; -D_800E5A3C = 0x800E5A3C; -D_800E5C0C = 0x800E5C0C; -D_800E5DF0 = 0x800E5DF0; -D_800E5E38 = 0x800E5E38; -D_800E5E60 = 0x800E5E60; D_800E5E64 = 0x800E5E64; -D_800E5E68 = 0x800E5E68; D_800E5E6C = 0x800E5E6C; -D_800E5E70 = 0x800E5E70; D_800E5E74 = 0x800E5E74; -D_800E5E78 = 0x800E5E78; D_800E5E7C = 0x800E5E7C; -D_800E5E80 = 0x800E5E80; D_800E5E84 = 0x800E5E84; -D_800E5E88 = 0x800E5E88; D_800E5E8C = 0x800E5E8C; -D_800E5E90 = 0x800E5E90; D_800E5E94 = 0x800E5E94; -D_800E5E98 = 0x800E5E98; D_800E5E9C = 0x800E5E9C; -D_800E5EA0 = 0x800E5EA0; D_800E5EA4 = 0x800E5EA4; -D_800E5EA8 = 0x800E5EA8; D_800E5EAC = 0x800E5EAC; -D_800E5EB0 = 0x800E5EB0; D_800E5EB4 = 0x800E5EB4; -D_800E5EB8 = 0x800E5EB8; D_800E5EBC = 0x800E5EBC; -D_800E5EC0 = 0x800E5EC0; -D_800E5F40 = 0x800E5F40; D_800E5F44 = 0x800E5F44; -D_800E5F48 = 0x800E5F48; -D_800E5F4C = 0x800E5F4C; -D_800E5F50 = 0x800E5F50; -D_800E5F54 = 0x800E5F54; -D_800E5F58 = 0x800E5F58; -D_800E5F5C = 0x800E5F5C; -D_800E5F60 = 0x800E5F60; -D_800E5F64 = 0x800E5F64; -D_800E5F68 = 0x800E5F68; -D_800E5F6C = 0x800E5F6C; -D_800E5F70 = 0x800E5F70; -D_800E5F80 = 0x800E5F80; -D_800E5FA0 = 0x800E5FA0; -D_800E5FB4 = 0x800E5FB4; -D_800E5FC8 = 0x800E5FC8; -D_800E5FE0 = 0x800E5FE0; D_800E5FE4 = 0x800E5FE4; -D_800E5FE8 = 0x800E5FE8; D_800E5FEC = 0x800E5FEC; -D_800E5FF0 = 0x800E5FF0; D_800E5FF4 = 0x800E5FF4; -D_800E5FF8 = 0x800E5FF8; D_800E5FFC = 0x800E5FFC; -D_800E6000 = 0x800E6000; -D_800E6004 = 0x800E6004; -D_800E6008 = 0x800E6008; -D_800E6010 = 0x800E6010; D_800E6014 = 0x800E6014; -D_800E6018 = 0x800E6018; D_800E601C = 0x800E601C; -D_800E6020 = 0x800E6020; D_800E6024 = 0x800E6024; -D_800E6028 = 0x800E6028; D_800E602C = 0x800E602C; -D_800E6030 = 0x800E6030; D_800E6034 = 0x800E6034; -D_800E6038 = 0x800E6038; D_800E603C = 0x800E603C; -D_800E6040 = 0x800E6040; D_800E6044 = 0x800E6044; -D_800E6048 = 0x800E6048; -D_800E6050 = 0x800E6050; D_800E6054 = 0x800E6054; -D_800E6058 = 0x800E6058; D_800E605C = 0x800E605C; -D_800E6060 = 0x800E6060; D_800E6064 = 0x800E6064; -D_800E6068 = 0x800E6068; D_800E606C = 0x800E606C; -D_800E6070 = 0x800E6070; -D_800E60C4 = 0x800E60C4; -D_800E6140 = 0x800E6140; D_800E6144 = 0x800E6144; -D_800E6148 = 0x800E6148; -D_800E6150 = 0x800E6150; D_800E6154 = 0x800E6154; -D_800E6158 = 0x800E6158; D_800E615C = 0x800E615C; -D_800E6160 = 0x800E6160; D_800E6164 = 0x800E6164; -D_800E6168 = 0x800E6168; D_800E616C = 0x800E616C; -D_800E6170 = 0x800E6170; D_800E6174 = 0x800E6174; -D_800E6178 = 0x800E6178; D_800E617C = 0x800E617C; -D_800E6180 = 0x800E6180; -D_800E6188 = 0x800E6188; D_800E618C = 0x800E618C; -D_800E6190 = 0x800E6190; D_800E6194 = 0x800E6194; -D_800E6198 = 0x800E6198; D_800E619C = 0x800E619C; -D_800E61A0 = 0x800E61A0; -D_800E61A8 = 0x800E61A8; D_800E61AC = 0x800E61AC; -D_800E61B0 = 0x800E61B0; -D_800E61B8 = 0x800E61B8; D_800E61BC = 0x800E61BC; -D_800E61C0 = 0x800E61C0; -D_800E61F0 = 0x800E61F0; D_800E61F4 = 0x800E61F4; -D_800E61F8 = 0x800E61F8; D_800E61FC = 0x800E61FC; -D_800E6200 = 0x800E6200; D_800E6204 = 0x800E6204; -D_800E6208 = 0x800E6208; -D_800E620C = 0x800E620C; -D_800E6210 = 0x800E6210; -D_800E6214 = 0x800E6214; -D_800E6218 = 0x800E6218; -D_800E621C = 0x800E621C; -D_800E6220 = 0x800E6220; -D_800E6224 = 0x800E6224; -D_800E6228 = 0x800E6228; -D_800E623C = 0x800E623C; -D_800E6240 = 0x800E6240; -D_800E6244 = 0x800E6244; -D_800E6248 = 0x800E6248; -D_800E6250 = 0x800E6250; D_800E6254 = 0x800E6254; -D_800E6258 = 0x800E6258; -D_800E626C = 0x800E626C; -D_800E6270 = 0x800E6270; -D_800E6274 = 0x800E6274; -D_800E6278 = 0x800E6278; -D_800E6280 = 0x800E6280; -D_800E62A8 = 0x800E62A8; D_800E62AC = 0x800E62AC; -D_800E62B0 = 0x800E62B0; D_800E62B4 = 0x800E62B4; -D_800E62B8 = 0x800E62B8; D_800E62BC = 0x800E62BC; -D_800E62C0 = 0x800E62C0; D_800E62C4 = 0x800E62C4; -D_800E62C8 = 0x800E62C8; D_800E62CC = 0x800E62CC; -D_800E62D0 = 0x800E62D0; D_800E62D4 = 0x800E62D4; -D_800E62D8 = 0x800E62D8; D_800E62DC = 0x800E62DC; -D_800E62E0 = 0x800E62E0; D_800E62E4 = 0x800E62E4; -D_800E62E8 = 0x800E62E8; D_800E62EC = 0x800E62EC; -D_800E62F0 = 0x800E62F0; D_800E62F4 = 0x800E62F4; -D_800E62F8 = 0x800E62F8; D_800E62FC = 0x800E62FC; -D_800E6300 = 0x800E6300; D_800E6304 = 0x800E6304; -D_800E6308 = 0x800E6308; D_800E630C = 0x800E630C; -D_800E6310 = 0x800E6310; D_800E6314 = 0x800E6314; -D_800E6318 = 0x800E6318; -D_800E6334 = 0x800E6334; -D_800E6350 = 0x800E6350; D_800E6354 = 0x800E6354; -D_800E6358 = 0x800E6358; -D_800E6378 = 0x800E6378; -D_800E637C = 0x800E637C; -D_800E63A0 = 0x800E63A0; D_800E63A4 = 0x800E63A4; -D_800E63A8 = 0x800E63A8; D_800E63AC = 0x800E63AC; -D_800E63B0 = 0x800E63B0; D_800E63B4 = 0x800E63B4; -D_800E63B8 = 0x800E63B8; D_800E63BC = 0x800E63BC; -D_800E63C0 = 0x800E63C0; D_800E63C4 = 0x800E63C4; -D_800E63C8 = 0x800E63C8; D_800E63CC = 0x800E63CC; -D_800E63D0 = 0x800E63D0; D_800E63D4 = 0x800E63D4; -D_800E63D8 = 0x800E63D8; -D_800E63E0 = 0x800E63E0; D_800E63E4 = 0x800E63E4; -D_800E63E8 = 0x800E63E8; D_800E63EC = 0x800E63EC; -D_800E63F0 = 0x800E63F0; -D_800E63F8 = 0x800E63F8; D_800E63FC = 0x800E63FC; -D_800E6400 = 0x800E6400; D_800E6404 = 0x800E6404; -D_800E6408 = 0x800E6408; D_800E640C = 0x800E640C; -D_800E6410 = 0x800E6410; D_800E6414 = 0x800E6414; -D_800E6418 = 0x800E6418; D_800E641C = 0x800E641C; -D_800E6420 = 0x800E6420; D_800E6424 = 0x800E6424; -D_800E6428 = 0x800E6428; D_800E642C = 0x800E642C; -D_800E6430 = 0x800E6430; D_800E6434 = 0x800E6434; -D_800E6438 = 0x800E6438; D_800E643C = 0x800E643C; -D_800E6440 = 0x800E6440; D_800E6444 = 0x800E6444; -D_800E6448 = 0x800E6448; D_800E644C = 0x800E644C; -D_800E6450 = 0x800E6450; -D_800E6458 = 0x800E6458; D_800E645C = 0x800E645C; -D_800E6460 = 0x800E6460; D_800E6464 = 0x800E6464; -D_800E6468 = 0x800E6468; -D_800E646C = 0x800E646C; -D_800E6488 = 0x800E6488; D_800E648C = 0x800E648C; -D_800E6490 = 0x800E6490; D_800E6494 = 0x800E6494; -D_800E6498 = 0x800E6498; D_800E649C = 0x800E649C; -D_800E64A0 = 0x800E64A0; D_800E64A4 = 0x800E64A4; -D_800E64A8 = 0x800E64A8; D_800E64AC = 0x800E64AC; -D_800E64B0 = 0x800E64B0; D_800E64B4 = 0x800E64B4; -D_800E64B8 = 0x800E64B8; D_800E64BC = 0x800E64BC; -D_800E64C0 = 0x800E64C0; D_800E64C4 = 0x800E64C4; -D_800E64C8 = 0x800E64C8; D_800E64CC = 0x800E64CC; -D_800E64D0 = 0x800E64D0; D_800E64D4 = 0x800E64D4; -D_800E64D8 = 0x800E64D8; -D_800E64E0 = 0x800E64E0; D_800E64E4 = 0x800E64E4; -D_800E64E8 = 0x800E64E8; -D_800E64EC = 0x800E64EC; -D_800E64F0 = 0x800E64F0; -D_800E64F4 = 0x800E64F4; -D_800E64F8 = 0x800E64F8; D_800E64FC = 0x800E64FC; -D_800E6500 = 0x800E6500; D_800E6504 = 0x800E6504; -D_800E6508 = 0x800E6508; -D_800E6510 = 0x800E6510; D_800E6514 = 0x800E6514; -D_800E6518 = 0x800E6518; D_800E651C = 0x800E651C; -D_800E6520 = 0x800E6520; D_800E6524 = 0x800E6524; -D_800E6528 = 0x800E6528; -D_800E6530 = 0x800E6530; D_800E6534 = 0x800E6534; -D_800E6538 = 0x800E6538; D_800E653C = 0x800E653C; -D_800E6540 = 0x800E6540; D_800E6544 = 0x800E6544; -D_800E6548 = 0x800E6548; D_800E654C = 0x800E654C; -D_800E6550 = 0x800E6550; D_800E6554 = 0x800E6554; -D_800E6558 = 0x800E6558; D_800E655C = 0x800E655C; -D_800E6560 = 0x800E6560; D_800E6564 = 0x800E6564; -D_800E6568 = 0x800E6568; -D_800E6570 = 0x800E6570; D_800E6574 = 0x800E6574; -D_800E6578 = 0x800E6578; D_800E657C = 0x800E657C; -D_800E6580 = 0x800E6580; -D_800E6584 = 0x800E6584; -D_800E6588 = 0x800E6588; -D_800E658C = 0x800E658C; -D_800E6590 = 0x800E6590; D_800E6594 = 0x800E6594; -D_800E6598 = 0x800E6598; D_800E659C = 0x800E659C; -D_800E65A0 = 0x800E65A0; -D_800E65A4 = 0x800E65A4; -D_800E65A8 = 0x800E65A8; -D_800E65AC = 0x800E65AC; -D_800E65B0 = 0x800E65B0; -D_800E65E8 = 0x800E65E8; -D_800E65EC = 0x800E65EC; -D_800E65F0 = 0x800E65F0; -D_800E65F4 = 0x800E65F4; -D_800E65F8 = 0x800E65F8; D_800E65FC = 0x800E65FC; -D_800E6600 = 0x800E6600; D_800E6604 = 0x800E6604; -D_800E6608 = 0x800E6608; D_800E660C = 0x800E660C; -D_800E6610 = 0x800E6610; D_800E6614 = 0x800E6614; -D_800E6618 = 0x800E6618; D_800E661C = 0x800E661C; -D_800E6620 = 0x800E6620; D_800E6624 = 0x800E6624; -D_800E6628 = 0x800E6628; D_800E662C = 0x800E662C; -D_800E6630 = 0x800E6630; D_800E6634 = 0x800E6634; -D_800E6638 = 0x800E6638; D_800E663C = 0x800E663C; -D_800E6640 = 0x800E6640; D_800E6644 = 0x800E6644; -D_800E6648 = 0x800E6648; D_800E664C = 0x800E664C; -D_800E6650 = 0x800E6650; D_800E6654 = 0x800E6654; -D_800E6658 = 0x800E6658; D_800E665C = 0x800E665C; -D_800E6660 = 0x800E6660; -D_800E6668 = 0x800E6668; D_800E666C = 0x800E666C; -D_800E6670 = 0x800E6670; D_800E6674 = 0x800E6674; -D_800E6678 = 0x800E6678; D_800E667C = 0x800E667C; -D_800E6680 = 0x800E6680; D_800E6684 = 0x800E6684; -D_800E6688 = 0x800E6688; D_800E668C = 0x800E668C; -D_800E6690 = 0x800E6690; D_800E6694 = 0x800E6694; -D_800E6698 = 0x800E6698; D_800E669C = 0x800E669C; -D_800E66A0 = 0x800E66A0; D_800E66A4 = 0x800E66A4; -D_800E66A8 = 0x800E66A8; D_800E66AC = 0x800E66AC; -D_800E66B0 = 0x800E66B0; D_800E66B4 = 0x800E66B4; -D_800E66B8 = 0x800E66B8; D_800E66BC = 0x800E66BC; -D_800E66C0 = 0x800E66C0; -D_800E66C8 = 0x800E66C8; D_800E66CC = 0x800E66CC; -D_800E66D0 = 0x800E66D0; -D_800E66F0 = 0x800E66F0; D_800E66F4 = 0x800E66F4; -D_800E66F8 = 0x800E66F8; D_800E66FC = 0x800E66FC; -D_800E6700 = 0x800E6700; D_800E6704 = 0x800E6704; -D_800E6708 = 0x800E6708; D_800E670C = 0x800E670C; -D_800E6710 = 0x800E6710; D_800E6714 = 0x800E6714; -D_800E6718 = 0x800E6718; D_800E671C = 0x800E671C; -D_800E6720 = 0x800E6720; -D_800E6728 = 0x800E6728; D_800E672C = 0x800E672C; -D_800E6730 = 0x800E6730; D_800E6734 = 0x800E6734; -D_800E6738 = 0x800E6738; D_800E673C = 0x800E673C; -D_800E6740 = 0x800E6740; D_800E6744 = 0x800E6744; -D_800E6748 = 0x800E6748; D_800E674C = 0x800E674C; -D_800E6750 = 0x800E6750; D_800E6754 = 0x800E6754; -D_800E6758 = 0x800E6758; -D_800E6760 = 0x800E6760; D_800E6764 = 0x800E6764; -D_800E6768 = 0x800E6768; -D_800E676C = 0x800E676C; -D_800E6770 = 0x800E6770; -D_800E6778 = 0x800E6778; -D_800E6780 = 0x800E6780; -D_800E6784 = 0x800E6784; -D_800E6788 = 0x800E6788; D_800E678C = 0x800E678C; -D_800E6790 = 0x800E6790; D_800E6794 = 0x800E6794; -D_800E6798 = 0x800E6798; D_800E679C = 0x800E679C; -D_800E67A0 = 0x800E67A0; -D_800E67A4 = 0x800E67A4; -D_800E67C0 = 0x800E67C0; D_800E67C4 = 0x800E67C4; -D_800E67C8 = 0x800E67C8; D_800E67CC = 0x800E67CC; -D_800E67D0 = 0x800E67D0; D_800E67D4 = 0x800E67D4; -D_800E67D8 = 0x800E67D8; D_800E67DC = 0x800E67DC; -D_800E67E0 = 0x800E67E0; D_800E67E4 = 0x800E67E4; -D_800E67E8 = 0x800E67E8; D_800E67EC = 0x800E67EC; -D_800E67F0 = 0x800E67F0; D_800E67F4 = 0x800E67F4; -D_800E67F8 = 0x800E67F8; D_800E67FC = 0x800E67FC; -D_800E6800 = 0x800E6800; -D_800E6808 = 0x800E6808; D_800E680C = 0x800E680C; -D_800E6810 = 0x800E6810; D_800E6814 = 0x800E6814; -D_800E6818 = 0x800E6818; D_800E681C = 0x800E681C; -D_800E6820 = 0x800E6820; D_800E6824 = 0x800E6824; -D_800E6828 = 0x800E6828; D_800E682C = 0x800E682C; -D_800E6830 = 0x800E6830; D_800E6834 = 0x800E6834; -D_800E6838 = 0x800E6838; D_800E683C = 0x800E683C; -D_800E6840 = 0x800E6840; D_800E6844 = 0x800E6844; -D_800E6848 = 0x800E6848; D_800E684C = 0x800E684C; -D_800E6850 = 0x800E6850; -D_800E6854 = 0x800E6854; -D_800E6894 = 0x800E6894; -D_800E68C4 = 0x800E68C4; -D_800E68C8 = 0x800E68C8; -D_800E68CC = 0x800E68CC; -D_800E68D0 = 0x800E68D0; -D_800E68F0 = 0x800E68F0; D_800E68F4 = 0x800E68F4; -D_800E68F8 = 0x800E68F8; D_800E68FC = 0x800E68FC; -D_800E6900 = 0x800E6900; D_800E6904 = 0x800E6904; -D_800E6908 = 0x800E6908; D_800E690C = 0x800E690C; -D_800E6910 = 0x800E6910; D_800E6914 = 0x800E6914; -D_800E6918 = 0x800E6918; D_800E691C = 0x800E691C; -D_800E6920 = 0x800E6920; D_800E6924 = 0x800E6924; -D_800E6928 = 0x800E6928; D_800E692C = 0x800E692C; -D_800E6930 = 0x800E6930; D_800E6934 = 0x800E6934; -D_800E6938 = 0x800E6938; D_800E693C = 0x800E693C; -D_800E6940 = 0x800E6940; D_800E6944 = 0x800E6944; -D_800E6948 = 0x800E6948; -D_800E694C = 0x800E694C; -D_800E6950 = 0x800E6950; D_800E6954 = 0x800E6954; -D_800E6958 = 0x800E6958; -D_800E6960 = 0x800E6960; D_800E6964 = 0x800E6964; -D_800E6968 = 0x800E6968; -D_800E69A0 = 0x800E69A0; D_800E69A4 = 0x800E69A4; -D_800E69A8 = 0x800E69A8; -D_800E69AC = 0x800E69AC; -D_800E69B0 = 0x800E69B0; -D_800E69B8 = 0x800E69B8; D_800E69BC = 0x800E69BC; -D_800E69C0 = 0x800E69C0; D_800E69C4 = 0x800E69C4; -D_800E69C8 = 0x800E69C8; D_800E69CC = 0x800E69CC; -D_800E69D0 = 0x800E69D0; D_800E69D4 = 0x800E69D4; -D_800E69D8 = 0x800E69D8; D_800E69DC = 0x800E69DC; -D_800E69E0 = 0x800E69E0; D_800E69E4 = 0x800E69E4; -D_800E69E8 = 0x800E69E8; -D_800E69F0 = 0x800E69F0; D_800E69F4 = 0x800E69F4; -D_800E69F8 = 0x800E69F8; D_800E69FC = 0x800E69FC; -D_800E6A00 = 0x800E6A00; -D_800E6A10 = 0x800E6A10; D_800E6A14 = 0x800E6A14; -D_800E6A18 = 0x800E6A18; D_800E6A1C = 0x800E6A1C; -D_800E6A20 = 0x800E6A20; D_800E6A24 = 0x800E6A24; -D_800E6A28 = 0x800E6A28; D_800E6A2C = 0x800E6A2C; -D_800E6A30 = 0x800E6A30; D_800E6A34 = 0x800E6A34; -D_800E6A38 = 0x800E6A38; D_800E6A3C = 0x800E6A3C; -D_800E6A40 = 0x800E6A40; D_800E6A44 = 0x800E6A44; -D_800E6A48 = 0x800E6A48; D_800E6A4C = 0x800E6A4C; -D_800E6A50 = 0x800E6A50; D_800E6A54 = 0x800E6A54; -D_800E6A58 = 0x800E6A58; D_800E6A5C = 0x800E6A5C; -D_800E6A60 = 0x800E6A60; D_800E6A64 = 0x800E6A64; -D_800E6A68 = 0x800E6A68; D_800E6A6C = 0x800E6A6C; -D_800E6A70 = 0x800E6A70; -D_800E6A88 = 0x800E6A88; D_800E6A8C = 0x800E6A8C; -D_800E6A90 = 0x800E6A90; D_800E6A94 = 0x800E6A94; -D_800E6A98 = 0x800E6A98; D_800E6A9C = 0x800E6A9C; -D_800E6AA0 = 0x800E6AA0; D_800E6AA4 = 0x800E6AA4; -D_800E6AA8 = 0x800E6AA8; D_800E6AAC = 0x800E6AAC; -D_800E6AB0 = 0x800E6AB0; D_800E6AB4 = 0x800E6AB4; -D_800E6AB8 = 0x800E6AB8; D_800E6ABC = 0x800E6ABC; -D_800E6AC0 = 0x800E6AC0; D_800E6AC4 = 0x800E6AC4; -D_800E6AC8 = 0x800E6AC8; D_800E6ACC = 0x800E6ACC; -D_800E6AD0 = 0x800E6AD0; -D_800E6AE8 = 0x800E6AE8; D_800E6AEC = 0x800E6AEC; -D_800E6AF0 = 0x800E6AF0; D_800E6AF4 = 0x800E6AF4; -D_800E6B00 = 0x800E6B00; D_800E6B04 = 0x800E6B04; -D_800E6B08 = 0x800E6B08; D_800E6B0C = 0x800E6B0C; -D_800E6B10 = 0x800E6B10; D_800E6B14 = 0x800E6B14; -D_800E6C30 = 0x800E6C30; -D_800E6C90 = 0x800E6C90; -D_800E6CE0 = 0x800E6CE0; -D_800E6E70 = 0x800E6E70; -D_800E6E90 = 0x800E6E90; -D_800E6E94 = 0x800E6E94; -D_800E6EA0 = 0x800E6EA0; -D_800E6EB8 = 0x800E6EB8; -D_800E6EBC = 0x800E6EBC; -D_800E6EC0 = 0x800E6EC0; D_800E6EC4 = 0x800E6EC4; -D_800E6ED0 = 0x800E6ED0; -D_800E7078 = 0x800E7078; -D_800E707C = 0x800E707C; -D_800E7084 = 0x800E7084; -D_800E7088 = 0x800E7088; -D_800E708C = 0x800E708C; -D_800E7094 = 0x800E7094; -D_800E7098 = 0x800E7098; -D_800E709C = 0x800E709C; -D_800E70A0 = 0x800E70A0; -D_800E70A4 = 0x800E70A4; -D_800E7134 = 0x800E7134; -D_800E7154 = 0x800E7154; -D_800E7188 = 0x800E7188; -D_800E71B8 = 0x800E71B8; -D_800E71D8 = 0x800E71D8; -D_800E7528 = 0x800E7528; -D_800E7530 = 0x800E7530; -D_800E753C = 0x800E753C; -D_800E7548 = 0x800E7548; -D_800E7554 = 0x800E7554; -D_800E7560 = 0x800E7560; -D_800E756C = 0x800E756C; -D_800E7578 = 0x800E7578; -D_800E7584 = 0x800E7584; -D_800E7630 = 0x800E7630; -D_800E7640 = 0x800E7640; -D_800E7650 = 0x800E7650; -D_800E7660 = 0x800E7660; -D_800E7670 = 0x800E7670; -D_800E7680 = 0x800E7680; -D_800E7690 = 0x800E7690; -D_800E76A0 = 0x800E76A0; -D_800E773C = 0x800E773C; D_800E774C = 0x800E774C; -D_800E7768 = 0x800E7768; D_800E7778 = 0x800E7778; -D_800E777C = 0x800E777C; D_800E778C = 0x800E778C; -D_800E7790 = 0x800E7790; D_800E77A0 = 0x800E77A0; -D_800E77A4 = 0x800E77A4; D_800E77B4 = 0x800E77B4; -D_800E77B8 = 0x800E77B8; D_800E77C8 = 0x800E77C8; -D_800E77CC = 0x800E77CC; D_800E77DC = 0x800E77DC; -D_800E77E0 = 0x800E77E0; D_800E77E4 = 0x800E77E4; -D_800E77E8 = 0x800E77E8; D_800E77EC = 0x800E77EC; -D_800E77F0 = 0x800E77F0; D_800E77F4 = 0x800E77F4; -D_800E796C = 0x800E796C; -D_800E7970 = 0x800E7970; -D_800E7AFC = 0x800E7AFC; -D_800E7B00 = 0x800E7B00; -D_800E7B04 = 0x800E7B04; -D_800E7B08 = 0x800E7B08; -D_800E7B0C = 0x800E7B0C; -D_800E7C90 = 0x800E7C90; -D_800E8208 = 0x800E8208; -D_800E820C = 0x800E820C; -D_800E8210 = 0x800E8210; -D_800E8214 = 0x800E8214; -D_800E8218 = 0x800E8218; -D_800E8230 = 0x800E8230; -D_800E8234 = 0x800E8234; -D_800E8238 = 0x800E8238; -D_800E823C = 0x800E823C; -D_800E8240 = 0x800E8240; -D_800E8244 = 0x800E8244; -D_800E8248 = 0x800E8248; -D_800E824C = 0x800E824C; -D_800E8284 = 0x800E8284; -D_800E82F8 = 0x800E82F8; -D_800E836C = 0x800E836C; -D_800E838C = 0x800E838C; -D_800E8390 = 0x800E8390; -D_800E8398 = 0x800E8398; D_800E839C = 0x800E839C; -D_800E83A0 = 0x800E83A0; D_800E83A4 = 0x800E83A4; -D_800E83A8 = 0x800E83A8; D_800E83AC = 0x800E83AC; -D_800E83B0 = 0x800E83B0; -D_800E83B4 = 0x800E83B4; -D_800E83B8 = 0x800E83B8; -D_800E83E0 = 0x800E83E0; -D_800E8400 = 0x800E8400; -D_800E8414 = 0x800E8414; -D_800E8418 = 0x800E8418; -D_800E8440 = 0x800E8440; -D_800E8464 = 0x800E8464; - -D_800E8488 = 0x800E8488; -D_800E84B0 = 0x800E84B0; -D_800E84D0 = 0x800E84D0; D_800E84D4 = 0x800E84D4; -D_800E84D8 = 0x800E84D8; -D_800E84E0 = 0x800E84E0; D_800E84E4 = 0x800E84E4; -D_800E84E8 = 0x800E84E8; D_800E84EC = 0x800E84EC; -D_800E84F0 = 0x800E84F0; -D_800E84F4 = 0x800E84F4; -D_800E8508 = 0x800E8508; -D_800E8520 = 0x800E8520; -D_800E8524 = 0x800E8524; -D_800E8548 = 0x800E8548; -D_800E856C = 0x800E856C; -D_800E8570 = 0x800E8570; -D_800E8574 = 0x800E8574; -D_800E8588 = 0x800E8588; -D_800E85A0 = 0x800E85A0; -D_800E85E0 = 0x800E85E0; -D_800E860C = 0x800E860C; -D_800E8640 = 0x800E8640; -D_800E8648 = 0x800E8648; -D_800E8650 = 0x800E8650; -D_800E8658 = 0x800E8658; -D_800E8664 = 0x800E8664; -D_800E8668 = 0x800E8668; -D_800E8670 = 0x800E8670; -D_800E867C = 0x800E867C; -D_800E8680 = 0x800E8680; -D_800E8688 = 0x800E8688; -D_800E8690 = 0x800E8690; -D_800E8694 = 0x800E8694; -D_800E86A8 = 0x800E86A8; D_800E86AC = 0x800E86AC; -D_800E86B8 = 0x800E86B8; -D_800E86BC = 0x800E86BC; -D_800E86C0 = 0x800E86C0; -D_800E86E8 = 0x800E86E8; D_800E86EC = 0x800E86EC; -D_800E86F0 = 0x800E86F0; D_800E86F4 = 0x800E86F4; -D_800E86F8 = 0x800E86F8; -D_800E8718 = 0x800E8718; -D_800E8720 = 0x800E8720; D_800E8724 = 0x800E8724; -D_800E8728 = 0x800E8728; D_800E872C = 0x800E872C; -D_800E8730 = 0x800E8730; D_800E8734 = 0x800E8734; -D_800E8738 = 0x800E8738; D_800E873C = 0x800E873C; -D_800E8740 = 0x800E8740; -D_800E8744 = 0x800E8744; -D_800E8758 = 0x800E8758; D_800E875C = 0x800E875C; -D_800E8760 = 0x800E8760; D_800E8764 = 0x800E8764; -D_800E8768 = 0x800E8768; -D_800E8780 = 0x800E8780; D_800E8784 = 0x800E8784; -D_800E8788 = 0x800E8788; D_800E878C = 0x800E878C; -D_800E8790 = 0x800E8790; D_800E8794 = 0x800E8794; -D_800E8798 = 0x800E8798; D_800E879C = 0x800E879C; -D_800E87A0 = 0x800E87A0; D_800E87A4 = 0x800E87A4; -D_800E87A8 = 0x800E87A8; -D_800E87B8 = 0x800E87B8; D_800E87BC = 0x800E87BC; -D_800E87C0 = 0x800E87C0; D_800E87C4 = 0x800E87C4; -D_800E87C8 = 0x800E87C8; D_800E87CC = 0x800E87CC; -D_800E87D0 = 0x800E87D0; -D_800E87D4 = 0x800E87D4; -D_800E87D8 = 0x800E87D8; -D_800E87E0 = 0x800E87E0; D_800E87E4 = 0x800E87E4; -D_800E8B98 = 0x800E8B98; D_800E8B9C = 0x800E8B9C; -D_800E8BA0 = 0x800E8BA0; D_800E8BA4 = 0x800E8BA4; -D_800E8BA8 = 0x800E8BA8; D_800E8BAC = 0x800E8BAC; -D_800E8BB0 = 0x800E8BB0; D_800E8BB4 = 0x800E8BB4; -D_800E8BB8 = 0x800E8BB8; D_800E8BBC = 0x800E8BBC; -D_800E8BC0 = 0x800E8BC0; D_800E8BC4 = 0x800E8BC4; -D_800E8BC8 = 0x800E8BC8; D_800E8BCC = 0x800E8BCC; -D_800E8BD0 = 0x800E8BD0; D_800E8BD4 = 0x800E8BD4; -D_800E8BD8 = 0x800E8BD8; -D_800E8BDC = 0x800E8BDC; -D_800E8BF0 = 0x800E8BF0; -D_800E8BF4 = 0x800E8BF4; -D_800E8C00 = 0x800E8C00; -D_800E8C28 = 0x800E8C28; -D_800E8C50 = 0x800E8C50; -D_800E8C54 = 0x800E8C54; -D_800E8C5C = 0x800E8C5C; -D_800E8CAC = 0x800E8CAC; -D_800E8CF0 = 0x800E8CF0; -D_800E8D88 = 0x800E8D88; -D_800E8E58 = 0x800E8E58; -D_800E8EDC = 0x800E8EDC; D_800E8EE4 = 0x800E8EE4; -D_800E8EE8 = 0x800E8EE8; D_800E8EF0 = 0x800E8EF0; -D_800E8EF4 = 0x800E8EF4; D_800E8EFC = 0x800E8EFC; -D_800E8F18 = 0x800E8F18; -D_800E8F28 = 0x800E8F28; -D_800E8F44 = 0x800E8F44; -D_800E8F50 = 0x800E8F50; -D_800E8F58 = 0x800E8F58; -D_800E8F5C = 0x800E8F5C; -D_800E8F6C = 0x800E8F6C; -D_800E8F84 = 0x800E8F84; -D_800E8F94 = 0x800E8F94; -D_800E8FA4 = 0x800E8FA4; -D_800E8FB4 = 0x800E8FB4; -D_800E8FC8 = 0x800E8FC8; -D_800E8FD4 = 0x800E8FD4; -D_800E8FDC = 0x800E8FDC; -D_800E8FE0 = 0x800E8FE0; -D_800E9000 = 0x800E9000; -D_800E9020 = 0x800E9020; -D_800E9040 = 0x800E9040; -D_800E9060 = 0x800E9060; -D_800E9080 = 0x800E9080; -D_800E90A0 = 0x800E90A0; -D_800E90C0 = 0x800E90C0; -D_800E90E0 = 0x800E90E0; -D_800E9100 = 0x800E9100; -D_800E9118 = 0x800E9118; -D_800E912C = 0x800E912C; -D_800E9130 = 0x800E9130; -D_800E9138 = 0x800E9138; -D_800E913C = 0x800E913C; -D_800E92A0 = 0x800E92A0; -D_800E92A4 = 0x800E92A4; -D_800E92A8 = 0x800E92A8; -D_800E92AC = 0x800E92AC; -D_800E92B0 = 0x800E92B0; -D_800E92B4 = 0x800E92B4; -D_800E92B8 = 0x800E92B8; -D_800E92BC = 0x800E92BC; -D_800E92C0 = 0x800E92C0; -D_800E92C4 = 0x800E92C4; -D_800E92D0 = 0x800E92D0; -D_800E92EC = 0x800E92EC; -D_800E9308 = 0x800E9308; -D_800E930C = 0x800E930C; -D_800E9310 = 0x800E9310; -D_800E932C = 0x800E932C; -D_800E9330 = 0x800E9330; -D_800E9360 = 0x800E9360; -gzip_border = 0x800E93C0; -gzip_cplens = 0x800E93D4; -gzip_cplext = 0x800E9412; -gzip_cpdist = 0x800E9432; -gzip_cpdext = 0x800E946E; -gzip_mask_bits = 0x800E948C; -D_800E94C0 = 0x800E94C0; -D_800E94C4 = 0x800E94C4; -D_800E94D0 = 0x800E94D0; -D_800E9550 = 0x800E9550; -D_800E9558 = 0x800E9558; -D_800E9560 = 0x800E9560; -D_800E9570 = 0x800E9570; -D_800E9578 = 0x800E9578; -D_800E9598 = 0x800E9598; -D_800E95A0 = 0x800E95A0; -D_800E95A8 = 0x800E95A8; -D_800E95B0 = 0x800E95B0; -D_800E95F8 = 0x800E95F8; D_800E95FC = 0x800E95FC; -D_800E9600 = 0x800E9600; -D_800E9628 = 0x800E9628; -D_800E9640 = 0x800E9640; -D_800E9650 = 0x800E9650; -D_800E9670 = 0x800E9670; -D_800E9690 = 0x800E9690; -D_800E96C0 = 0x800E96C0; -D_800E96C4 = 0x800E96C4; -D_800E96CC = 0x800E96CC; -D_800E96E4 = 0x800E96E4; -D_800E97C0 = 0x800E97C0; -D_800E97E8 = 0x800E97E8; -D_800E97F0 = 0x800E97F0; -D_800E97F8 = 0x800E97F8; -D_800E9800 = 0x800E9800; -D_800E9810 = 0x800E9810; -D_800E9838 = 0x800E9838; -D_800E9840 = 0x800E9840; -D_800E9848 = 0x800E9848; -D_800E9850 = 0x800E9850; -D_800E9860 = 0x800E9860; -D_800E98A8 = 0x800E98A8; -D_800E98AC = 0x800E98AC; -D_800E98B0 = 0x800E98B0; -D_800E98B8 = 0x800E98B8; -D_800E98C0 = 0x800E98C0; -D_800E98D0 = 0x800E98D0; + D_800EA3A0 = 0x800EA3A0; D_800EABA0 = 0x800EABA0; D_800EBF60 = 0x800EBF60; @@ -1592,7 +427,6 @@ D_80116198 = 0x80116198; D_801161B0 = 0x801161B0; ALGlobals_801161D0 = 0x801161D0; D_80116220 = 0x80116220; -D_801183B4 = 0x801183B4; D_80119230 = 0x80119230; D_80119240 = 0x80119240; D_80119254 = 0x80119254; @@ -2026,7 +860,6 @@ D_80121220 = 0x80121220; D_80121224 = 0x80121224; D_80121228 = 0x80121228; D_80121250 = 0x80121250; -D_80121252 = 0x80121252; D_80121260 = 0x80121260; D_801234E8 = 0x801234E8; D_801234EC = 0x801234EC; @@ -2193,30 +1026,14 @@ D_80126448 = 0x80126448; D_8012644C = 0x8012644C; D_80126450 = 0x80126450; D_80126454 = 0x80126454; -D_80126455 = 0x80126455; -D_80126456 = 0x80126456; -D_80126457 = 0x80126457; D_80126458 = 0x80126458; -D_80126459 = 0x80126459; -D_8012645A = 0x8012645A; -D_8012645B = 0x8012645B; D_8012645C = 0x8012645C; D_8012645D = 0x8012645D; -D_8012645E = 0x8012645E; -D_8012645F = 0x8012645F; D_80126460 = 0x80126460; D_80126464 = 0x80126464; D_80126465 = 0x80126465; -D_80126466 = 0x80126466; -D_80126467 = 0x80126467; D_80126468 = 0x80126468; -D_80126469 = 0x80126469; -D_8012646A = 0x8012646A; -D_8012646B = 0x8012646B; D_8012646C = 0x8012646C; -D_8012646D = 0x8012646D; -D_8012646E = 0x8012646E; -D_8012646F = 0x8012646F; D_80126470 = 0x80126470; D_80126474 = 0x80126474; D_80126478 = 0x80126478; @@ -2329,7 +1146,6 @@ D_80126A38 = 0x80126A38; D_80126A3C = 0x80126A3C; D_80126A40 = 0x80126A40; D_80126A60 = 0x80126A60; -D_80126A61 = 0x80126A61; D_80126A64 = 0x80126A64; D_80126A68 = 0x80126A68; D_80126A6C = 0x80126A6C; @@ -2341,7 +1157,6 @@ D_80126A90 = 0x80126A90; D_80126A94 = 0x80126A94; D_80126A98 = 0x80126A98; D_80126AA0 = 0x80126AA0; -D_80126AA4 = 0x80126AA4; D_80126AE0 = 0x80126AE0; D_80126B20 = 0x80126B20; D_80126B60 = 0x80126B60; @@ -2688,7 +1503,6 @@ D_8012D3F0 = 0x8012D3F0; D_8012FFFF = 0x8012FFFF; D_A0000200 = 0xA0000200; D_A0000284 = 0xA0000284; -D_A4000000 = 0xA4000000; SP_IMEM = 0xA4001000; D_A4040004 = 0xA4040004; D_A4040008 = 0xA4040008; @@ -2728,4 +1542,4 @@ D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; D_FF7F0001 = 0xFF7F0001; D_FFFDFFFB = 0xFFFDFFFB; -D_FFFF0028 = 0xFFFF0028; +D_FFFF0028 = 0xFFFF0028; \ No newline at end of file From ca7c49fb9084c4a4bfa4974a9d683b4bbde4c514 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 15:57:42 -0500 Subject: [PATCH 21/39] more progress with undefined_syms --- asm/assets/ucode_data.s | 7 ++ asm/assets/ucode_text.s | 9 +++ asm/entrypoint.s | 4 +- .../unknown_003260/func_80002C00.s | 12 ++-- .../unknown_066AA0/func_8006C60C.s | 5 +- .../unknown_078050/setupOSTasks.s | 64 +++++++++---------- .../unknown_080500/MenuBootInit.s | 9 ++- .../unknown_080500/MenuTitleScreenInit.s | 9 ++- .../unknown_080500/MenuTitleScreenLoop.s | 5 +- .../unknown_080500/func_80094D28.s | 4 +- .../unknown_080500/func_80095728.s | 4 +- asm/unknown_070110.s | 4 +- lib/asm/exception.s | 2 +- .../{D_800D35A0.s => __osCleanupThread.s} | 2 +- src/unknown_06B2B0.c | 15 ++++- tools/python/generate_assets.py | 28 +++++--- undefined_syms.txt | 24 ++----- 17 files changed, 111 insertions(+), 96 deletions(-) rename lib/asm/exception/{D_800D35A0.s => __osCleanupThread.s} (87%) diff --git a/asm/assets/ucode_data.s b/asm/assets/ucode_data.s index 150b43bf..740cfcaa 100644 --- a/asm/assets/ucode_data.s +++ b/asm/assets/ucode_data.s @@ -1,6 +1,13 @@ # This file was generated by generate_ld.py +.include "globals.inc" +.include "macros.inc" + +glabel rspF3DDKRDataDramStart .incbin "./build/us_1.0/ucode/data_f3ddkr_dram.bin" +glabel rspF3DDKRDataFifoStart .incbin "./build/us_1.0/ucode/data_f3ddkr_fifo.bin" +glabel rspF3DDKRDataXbusStart .incbin "./build/us_1.0/ucode/data_f3ddkr_xbus.bin" +glabel rspUnknownDataStart .incbin "./build/us_1.0/ucode/data_unknown.bin" diff --git a/asm/assets/ucode_text.s b/asm/assets/ucode_text.s index 11ae9d94..4480ce61 100644 --- a/asm/assets/ucode_text.s +++ b/asm/assets/ucode_text.s @@ -1,8 +1,17 @@ # This file was generated by generate_ld.py +.include "globals.inc" +.include "macros.inc" + +glabel rspUnknownStart .incbin "./build/us_1.0/ucode/ucode_unknown.bin" +glabel rspF3DDKRBootStart .incbin "./build/us_1.0/ucode/ucode_boot.bin" +glabel rspF3DDKRDramStart .incbin "./build/us_1.0/ucode/ucode_f3ddkr_dram.bin" +glabel rspF3DDKRFifoStart .incbin "./build/us_1.0/ucode/ucode_f3ddkr_fifo.bin" +glabel rspF3DDKRXbusStart .incbin "./build/us_1.0/ucode/ucode_f3ddkr_xbus.bin" +glabel rspUnknown2Start .incbin "./build/us_1.0/ucode/ucode_unknown_2.bin" diff --git a/asm/entrypoint.s b/asm/entrypoint.s index 907491b8..1adf1b38 100644 --- a/asm/entrypoint.s +++ b/asm/entrypoint.s @@ -19,9 +19,9 @@ glabel entrypoint /* 001018 80000418 AD000004 */ sw $zero, 4($t0) /* 00101C 8000041C 1520FFFC */ bnez $t1, .L80000410 /* 001020 80000420 21080008 */ addi $t0, $t0, 8 -/* 001024 80000424 3C0A8006 */ lui $t2, %hi(D_80065D40) # $t2, 0x8006 +/* 001024 80000424 3C0A8006 */ lui $t2, %hi(func_80065D40) # $t2, 0x8006 /* 001028 80000428 3C1D8012 */ lui $sp, %hi(D_80120AC0) # $sp, 0x8012 -/* 00102C 8000042C 254A5D40 */ addiu $t2, %lo(D_80065D40) # addiu $t2, $t2, 0x5d40 +/* 00102C 8000042C 254A5D40 */ addiu $t2, %lo(func_80065D40) # addiu $t2, $t2, 0x5d40 /* 001030 80000430 01400008 */ jr $t2 /* 001034 80000434 27BD0AC0 */ addiu $sp, %lo(D_80120AC0) # addiu $sp, $sp, 0xac0 /* 001038 80000438 00000000 */ nop diff --git a/asm/non_matchings/unknown_003260/func_80002C00.s b/asm/non_matchings/unknown_003260/func_80002C00.s index eb4e0731..3a1d64c2 100644 --- a/asm/non_matchings/unknown_003260/func_80002C00.s +++ b/asm/non_matchings/unknown_003260/func_80002C00.s @@ -80,22 +80,22 @@ glabel func_80002C00 /* 003930 80002D30 0018C880 */ sll $t9, $t8, 2 /* 003934 80002D34 00F94021 */ addu $t0, $a3, $t9 /* 003938 80002D38 8D090000 */ lw $t1, ($t0) -/* 00393C 80002D3C 3C05800E */ lui $a1, %hi(D_800D84C0) # $a1, 0x800e +/* 00393C 80002D3C 3C05800E */ lui $a1, %hi(rspF3DDKRBootStart) # $a1, 0x800e /* 003940 80002D40 AE090048 */ sw $t1, 0x48($s0) /* 003944 80002D44 8CCA0000 */ lw $t2, ($a2) -/* 003948 80002D48 3C19800E */ lui $t9, %hi(D_800D8590) # $t9, 0x800e +/* 003948 80002D48 3C19800E */ lui $t9, %hi(rspF3DDKRDramStart) # $t9, 0x800e /* 00394C 80002D4C 000A5880 */ sll $t3, $t2, 2 /* 003950 80002D50 00EB6021 */ addu $t4, $a3, $t3 /* 003954 80002D54 8D8D0000 */ lw $t5, ($t4) -/* 003958 80002D58 24A584C0 */ addiu $a1, %lo(D_800D84C0) # addiu $a1, $a1, -0x7b40 +/* 003958 80002D58 24A584C0 */ addiu $a1, %lo(rspF3DDKRBootStart) # addiu $a1, $a1, -0x7b40 /* 00395C 80002D5C 004D7023 */ subu $t6, $v0, $t5 /* 003960 80002D60 000E78C3 */ sra $t7, $t6, 3 -/* 003964 80002D64 27398590 */ addiu $t9, %lo(D_800D8590) # addiu $t9, $t9, -0x7a70 -/* 003968 80002D68 3C09800D */ lui $t1, %hi(D_800D7600) # $t1, 0x800d +/* 003964 80002D64 27398590 */ addiu $t9, %lo(rspF3DDKRDramStart) # addiu $t9, $t9, -0x7a70 +/* 003968 80002D68 3C09800D */ lui $t1, %hi(rspUnknownStart) # $t1, 0x800d /* 00396C 80002D6C 3C0A800F */ lui $t2, %hi(D_800E98D0) # $t2, 0x800f /* 003970 80002D70 000FC0C0 */ sll $t8, $t7, 3 /* 003974 80002D74 03254023 */ subu $t0, $t9, $a1 -/* 003978 80002D78 25297600 */ addiu $t1, %lo(D_800D7600) # addiu $t1, $t1, 0x7600 +/* 003978 80002D78 25297600 */ addiu $t1, %lo(rspUnknownStart) # addiu $t1, $t1, 0x7600 /* 00397C 80002D7C 254A98D0 */ addiu $t2, %lo(D_800E98D0) # addiu $t2, $t2, -0x6730 /* 003980 80002D80 240B0800 */ li $t3, 2048 /* 003984 80002D84 240C0001 */ li $t4, 1 diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index 80292d59..b1205f7f 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -202,9 +202,8 @@ glabel func_8006C60C /* 06D504 8006C904 0C02DDF5 */ jal func_800B77D4 /* 06D508 8006C908 00000000 */ nop .L8006C90C: -# Casting D_800DD404 to u8. -/* 06D50C 8006C90C 3C04800E */ lui $a0, %hi(D_800DD404) # $a0, 0x800e -/* 06D510 8006C910 9084D407 */ lbu $a0, -0x2bf9($a0) +/* 06D50C 8006C90C 3C04800E */ lui $a0, %hi(D_800DD404+3) # $a0, 0x800e +/* 06D510 8006C910 9084D407 */ lbu $a0, %lo(D_800DD404+3)($a0) /* 06D514 8006C914 0C000340 */ jal func_80000D00 /* 06D518 8006C918 00000000 */ nop /* 06D51C 8006C91C 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_078050/setupOSTasks.s b/asm/non_matchings/unknown_078050/setupOSTasks.s index 016fa8ce..cc747c6d 100644 --- a/asm/non_matchings/unknown_078050/setupOSTasks.s +++ b/asm/non_matchings/unknown_078050/setupOSTasks.s @@ -21,17 +21,17 @@ glabel setupOSTasks /* 07809C 8007749C AC600000 */ sw $zero, ($v1) .L800774A0: /* 0780A0 800774A0 00A45823 */ subu $t3, $a1, $a0 -/* 0780A4 800774A4 3C03800E */ lui $v1, %hi(D_800D84C0) # $v1, 0x800e +/* 0780A4 800774A4 3C03800E */ lui $v1, %hi(rspF3DDKRBootStart) # $v1, 0x800e /* 0780A8 800774A8 3C0A8012 */ lui $t2, %hi(D_80125ED8) # $t2, 0x8012 /* 0780AC 800774AC 000B60C3 */ sra $t4, $t3, 3 /* 0780B0 800774B0 240D0001 */ li $t5, 1 -/* 0780B4 800774B4 3C0F800E */ lui $t7, %hi(D_800D8590) # $t7, 0x800e -/* 0780B8 800774B8 246384C0 */ addiu $v1, %lo(D_800D84C0) # addiu $v1, $v1, -0x7b40 +/* 0780B4 800774B4 3C0F800E */ lui $t7, %hi(rspF3DDKRDramStart) # $t7, 0x800e +/* 0780B8 800774B8 246384C0 */ addiu $v1, %lo(rspF3DDKRBootStart) # addiu $v1, $v1, -0x7b40 /* 0780BC 800774BC 254A5ED8 */ addiu $t2, %lo(D_80125ED8) # addiu $t2, $t2, 0x5ed8 /* 0780C0 800774C0 ACEC0044 */ sw $t4, 0x44($a3) /* 0780C4 800774C4 ACED0010 */ sw $t5, 0x10($a3) /* 0780C8 800774C8 240E0002 */ li $t6, 2 -/* 0780CC 800774CC 25EF8590 */ addiu $t7, %lo(D_800D8590) # addiu $t7, $t7, -0x7a70 +/* 0780CC 800774CC 25EF8590 */ addiu $t7, %lo(rspF3DDKRDramStart) # addiu $t7, $t7, -0x7a70 /* 0780D0 800774D0 3C02FF00 */ lui $v0, (0xFF0000FF >> 16) # lui $v0, 0xff00 /* 0780D4 800774D4 24090023 */ li $t1, 35 /* 0780D8 800774D8 ACEA0050 */ sw $t2, 0x50($a3) @@ -41,15 +41,15 @@ glabel setupOSTasks /* 0780E8 800774E8 3C0D8012 */ lui $t5, %hi(D_80125EA0) # $t5, 0x8012 /* 0780EC 800774EC 344200FF */ ori $v0, (0xFF0000FF & 0xFFFF) # ori $v0, $v0, 0xff /* 0780F0 800774F0 ACE90008 */ sw $t1, 8($a3) -/* 0780F4 800774F4 3C19800E */ lui $t9, %hi(D_800DA970) # $t9, 0x800e -/* 0780F8 800774F8 3C08800F */ lui $t0, %hi(D_800EABA0) # $t0, 0x800f +/* 0780F4 800774F4 3C19800E */ lui $t9, %hi(rspF3DDKRXbusStart) # $t9, 0x800e +/* 0780F8 800774F8 3C08800F */ lui $t0, %hi(rspF3DDKRDataXbusStart) # $t0, 0x800f /* 0780FC 800774FC 3C0A8012 */ lui $t2, %hi(D_801242A0) # $t2, 0x8012 /* 078100 80077500 258C46A0 */ addiu $t4, %lo(D_801246A0) # addiu $t4, $t4, 0x46a0 /* 078104 80077504 25AD5EA0 */ addiu $t5, %lo(D_80125EA0) # addiu $t5, $t5, 0x5ea0 /* 078108 80077508 3C0E8012 */ lui $t6, %hi(D_801271B0) # $t6, 0x8012 /* 07810C 8007750C ACF8001C */ sw $t8, 0x1c($a3) -/* 078110 80077510 2739A970 */ addiu $t9, %lo(D_800DA970) # addiu $t9, $t9, -0x5690 -/* 078114 80077514 2508ABA0 */ addiu $t0, %lo(D_800EABA0) # addiu $t0, $t0, -0x5460 +/* 078110 80077510 2739A970 */ addiu $t9, %lo(rspF3DDKRXbusStart) # addiu $t9, $t9, -0x5690 +/* 078114 80077514 2508ABA0 */ addiu $t0, %lo(rspF3DDKRDataXbusStart) # addiu $t0, $t0, -0x5460 /* 078118 80077518 24090800 */ li $t1, 2048 /* 07811C 8007751C 254A42A0 */ addiu $t2, %lo(D_801242A0) # addiu $t2, $t2, 0x42a0 /* 078120 80077520 240B0400 */ li $t3, 1024 @@ -108,11 +108,11 @@ glabel setupOSTasks /* 0781F0 800775F0 AC780000 */ sw $t8, ($v1) /* 0781F4 800775F4 AC600000 */ sw $zero, ($v1) .L800775F8: -/* 0781F8 800775F8 3C02800E */ lui $v0, %hi(D_800D84C0) # $v0, 0x800e -/* 0781FC 800775FC 3C0D800E */ lui $t5, %hi(D_800D8590) # $t5, 0x800e -/* 078200 80077600 244284C0 */ addiu $v0, %lo(D_800D84C0) # addiu $v0, $v0, -0x7b40 +/* 0781F8 800775F8 3C02800E */ lui $v0, %hi(rspF3DDKRBootStart) # $v0, 0x800e +/* 0781FC 800775FC 3C0D800E */ lui $t5, %hi(rspF3DDKRDramStart) # $t5, 0x800e +/* 078200 80077600 244284C0 */ addiu $v0, %lo(rspF3DDKRBootStart) # addiu $v0, $v0, -0x7b40 /* 078204 80077604 00A44023 */ subu $t0, $a1, $a0 -/* 078208 80077608 25AD8590 */ addiu $t5, %lo(D_800D8590) # addiu $t5, $t5, -0x7a70 +/* 078208 80077608 25AD8590 */ addiu $t5, %lo(rspF3DDKRDramStart) # addiu $t5, $t5, -0x7a70 /* 07820C 8007760C 000848C3 */ sra $t1, $t0, 3 /* 078210 80077610 01A27023 */ subu $t6, $t5, $v0 /* 078214 80077614 000950C0 */ sll $t2, $t1, 3 @@ -120,17 +120,17 @@ glabel setupOSTasks /* 07821C 8007761C 240B0001 */ li $t3, 1 /* 078220 80077620 240C0002 */ li $t4, 2 /* 078224 80077624 ACEE001C */ sw $t6, 0x1c($a3) -/* 078228 80077628 3C0F800E */ lui $t7, %hi(D_800DA970) # $t7, 0x800e +/* 078228 80077628 3C0F800E */ lui $t7, %hi(rspF3DDKRXbusStart) # $t7, 0x800e /* 07822C 8007762C ACEB0010 */ sw $t3, 0x10($a3) /* 078230 80077630 ACEC0014 */ sw $t4, 0x14($a3) -/* 078234 80077634 25EFA970 */ addiu $t7, %lo(D_800DA970) # addiu $t7, $t7, -0x5690 -/* 078238 80077638 3C18800F */ lui $t8, %hi(D_800EABA0) # $t8, 0x800f +/* 078234 80077634 25EFA970 */ addiu $t7, %lo(rspF3DDKRXbusStart) # addiu $t7, $t7, -0x5690 +/* 078238 80077638 3C18800F */ lui $t8, %hi(rspF3DDKRDataXbusStart) # $t8, 0x800f /* 07823C 8007763C 3C088012 */ lui $t0, %hi(D_801242A0) # $t0, 0x8012 /* 078240 80077640 3C0A8012 */ lui $t2, %hi(D_801271B0) # $t2, 0x8012 /* 078244 80077644 3C0D8012 */ lui $t5, %hi(D_80125ED8) # $t5, 0x8012 /* 078248 80077648 3C0E800E */ lui $t6, %hi(D_800DE490) # $t6, 0x800e /* 07824C 8007764C ACEF0020 */ sw $t7, 0x20($a3) -/* 078250 80077650 2718ABA0 */ addiu $t8, %lo(D_800EABA0) # addiu $t8, $t8, -0x5460 +/* 078250 80077650 2718ABA0 */ addiu $t8, %lo(rspF3DDKRDataXbusStart) # addiu $t8, $t8, -0x5460 /* 078254 80077654 24190800 */ li $t9, 2048 /* 078258 80077658 250842A0 */ addiu $t0, %lo(D_801242A0) # addiu $t0, $t0, 0x42a0 /* 07825C 8007765C 24090400 */ li $t1, 1024 @@ -209,20 +209,20 @@ glabel setupOSTasks /* 078374 80077774 AC780000 */ sw $t8, ($v1) /* 078378 80077778 AC600000 */ sw $zero, ($v1) .L8007777C: -/* 07837C 8007777C 3C02800E */ lui $v0, %hi(D_800D84C0) # $v0, 0x800e +/* 07837C 8007777C 3C02800E */ lui $v0, %hi(rspF3DDKRBootStart) # $v0, 0x800e /* 078380 80077780 00A44023 */ subu $t0, $a1, $a0 -/* 078384 80077784 3C0D800E */ lui $t5, %hi(D_800D8590) # $t5, 0x800e -/* 078388 80077788 244284C0 */ addiu $v0, %lo(D_800D84C0) # addiu $v0, $v0, -0x7b40 +/* 078384 80077784 3C0D800E */ lui $t5, %hi(rspF3DDKRDramStart) # $t5, 0x800e +/* 078388 80077788 244284C0 */ addiu $v0, %lo(rspF3DDKRBootStart) # addiu $v0, $v0, -0x7b40 /* 07838C 8007778C 000848C3 */ sra $t1, $t0, 3 -/* 078390 80077790 25AD8590 */ addiu $t5, %lo(D_800D8590) # addiu $t5, $t5, -0x7a70 -/* 078394 80077794 3C0F800E */ lui $t7, %hi(D_800D9790) # $t7, 0x800e -/* 078398 80077798 3C18800F */ lui $t8, %hi(D_800EA3A0) # $t8, 0x800f +/* 078390 80077790 25AD8590 */ addiu $t5, %lo(rspF3DDKRDramStart) # addiu $t5, $t5, -0x7a70 +/* 078394 80077794 3C0F800E */ lui $t7, %hi(rspF3DDKRFifoStart) # $t7, 0x800e +/* 078398 80077798 3C18800F */ lui $t8, %hi(rspF3DDKRDataFifoStart) # $t8, 0x800f /* 07839C 8007779C 000950C0 */ sll $t2, $t1, 3 /* 0783A0 800777A0 240B0001 */ li $t3, 1 /* 0783A4 800777A4 240C0002 */ li $t4, 2 /* 0783A8 800777A8 01A27023 */ subu $t6, $t5, $v0 -/* 0783AC 800777AC 25EF9790 */ addiu $t7, %lo(D_800D9790) # addiu $t7, $t7, -0x6870 -/* 0783B0 800777B0 2718A3A0 */ addiu $t8, %lo(D_800EA3A0) # addiu $t8, $t8, -0x5c60 +/* 0783AC 800777AC 25EF9790 */ addiu $t7, %lo(rspF3DDKRFifoStart) # addiu $t7, $t7, -0x6870 +/* 0783B0 800777B0 2718A3A0 */ addiu $t8, %lo(rspF3DDKRDataFifoStart) # addiu $t8, $t8, -0x5c60 /* 0783B4 800777B4 ACEA0044 */ sw $t2, 0x44($a3) /* 0783B8 800777B8 ACEB0010 */ sw $t3, 0x10($a3) /* 0783BC 800777BC ACEC0014 */ sw $t4, 0x14($a3) @@ -314,20 +314,20 @@ glabel setupOSTasks /* 078508 80077908 AC780000 */ sw $t8, ($v1) /* 07850C 8007790C AC600000 */ sw $zero, ($v1) .L80077910: -/* 078510 80077910 3C02800E */ lui $v0, %hi(D_800D84C0) # $v0, 0x800e +/* 078510 80077910 3C02800E */ lui $v0, %hi(rspF3DDKRBootStart) # $v0, 0x800e /* 078514 80077914 00A44023 */ subu $t0, $a1, $a0 -/* 078518 80077918 3C0D800E */ lui $t5, %hi(D_800D8590) # $t5, 0x800e -/* 07851C 8007791C 244284C0 */ addiu $v0, %lo(D_800D84C0) # addiu $v0, $v0, -0x7b40 +/* 078518 80077918 3C0D800E */ lui $t5, %hi(rspF3DDKRDramStart) # $t5, 0x800e +/* 07851C 8007791C 244284C0 */ addiu $v0, %lo(rspF3DDKRBootStart) # addiu $v0, $v0, -0x7b40 /* 078520 80077920 000848C3 */ sra $t1, $t0, 3 -/* 078524 80077924 25AD8590 */ addiu $t5, %lo(D_800D8590) # addiu $t5, $t5, -0x7a70 -/* 078528 80077928 3C0F800E */ lui $t7, %hi(D_800D9790) # $t7, 0x800e -/* 07852C 8007792C 3C18800F */ lui $t8, %hi(D_800EA3A0) # $t8, 0x800f +/* 078524 80077924 25AD8590 */ addiu $t5, %lo(rspF3DDKRDramStart) # addiu $t5, $t5, -0x7a70 +/* 078528 80077928 3C0F800E */ lui $t7, %hi(rspF3DDKRFifoStart) # $t7, 0x800e +/* 07852C 8007792C 3C18800F */ lui $t8, %hi(rspF3DDKRDataFifoStart) # $t8, 0x800f /* 078530 80077930 000950C0 */ sll $t2, $t1, 3 /* 078534 80077934 240B0001 */ li $t3, 1 /* 078538 80077938 240C0002 */ li $t4, 2 /* 07853C 8007793C 01A27023 */ subu $t6, $t5, $v0 -/* 078540 80077940 25EF9790 */ addiu $t7, %lo(D_800D9790) # addiu $t7, $t7, -0x6870 -/* 078544 80077944 2718A3A0 */ addiu $t8, %lo(D_800EA3A0) # addiu $t8, $t8, -0x5c60 +/* 078540 80077940 25EF9790 */ addiu $t7, %lo(rspF3DDKRFifoStart) # addiu $t7, $t7, -0x6870 +/* 078544 80077944 2718A3A0 */ addiu $t8, %lo(rspF3DDKRDataFifoStart) # addiu $t8, $t8, -0x5c60 /* 078548 80077948 ACEA0044 */ sw $t2, 0x44($a3) /* 07854C 8007794C ACEB0010 */ sw $t3, 0x10($a3) /* 078550 80077950 ACEC0014 */ sw $t4, 0x14($a3) diff --git a/asm/non_matchings/unknown_080500/MenuBootInit.s b/asm/non_matchings/unknown_080500/MenuBootInit.s index 5e5d3af9..294caf4b 100644 --- a/asm/non_matchings/unknown_080500/MenuBootInit.s +++ b/asm/non_matchings/unknown_080500/MenuBootInit.s @@ -27,20 +27,19 @@ glabel menu_boot_init /* 089158 80088558 00895021 */ addu $t2, $a0, $t1 /* 08915C 8008855C AC39F7DC */ sw $t9, %lo(D_800DF7DC)($at) /* 089160 80088560 8D4B0000 */ lw $t3, ($t2) -# Accessing D_800DF7DC[1] and D_800DF7DC[2]. -/* 089164 80088564 3C01800E */ lui $at, %hi(D_800DF7DC+8) # $at, 0x800e +/* 089164 80088564 3C01800E */ lui $at, %hi(D_800DF7DC+16) # $at, 0x800e /* 089168 80088568 000C6880 */ sll $t5, $t4, 2 /* 08916C 8008856C 008D7021 */ addu $t6, $a0, $t5 /* 089170 80088570 AC2BF7E4 */ sw $t3, %lo(D_800DF7DC+8)($at) /* 089174 80088574 8DCF0000 */ lw $t7, ($t6) # The extra lui is here. -/* 089178 80088578 3C03800E */ lui $v1, %hi(D_800DF7DC+0x18) # $v1, 0x800e +/* 089178 80088578 3C03800E */ lui $v1, %hi(D_800DF7DC+24) # $v1, 0x800e /* 08917C 8008857C 3C02800E */ lui $v0, %hi(D_800DF7C4+6) # $v0, 0x800e /* 089180 80088580 3C05800E */ lui $a1, %hi(D_800DF7C4+22) # $a1, 0x800e /* 089184 80088584 24A5F7DA */ addiu $a1, %lo(D_800DF7C4+22) # addiu $a1, $a1, -0x826 /* 089188 80088588 2442F7CA */ addiu $v0, %lo(D_800DF7C4+6) # addiu $v0, $v0, -0x836 -/* 08918C 8008858C 2463F7F4 */ addiu $v1, %lo(D_800DF7DC+0x18) # addiu $v1, $v1, -0x80c -/* 089190 80088590 AC2FF7EC */ sw $t7, %lo(D_800DF7DC+0x10)($at) +/* 08918C 8008858C 2463F7F4 */ addiu $v1, %lo(D_800DF7DC+24) # addiu $v1, $v1, -0x80c +/* 089190 80088590 AC2FF7EC */ sw $t7, %lo(D_800DF7DC+16)($at) .L80088594: /* 089194 80088594 84580000 */ lh $t8, ($v0) /* 089198 80088598 844A0002 */ lh $t2, 2($v0) diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s b/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s index 6bacda95..bfa7235e 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenInit.s @@ -61,19 +61,18 @@ glabel MenuTitleScreenInit /* 084220 80083620 008D7021 */ addu $t6, $a0, $t5 /* 084224 80083624 AC2BF7DC */ sw $t3, %lo(D_800DF7DC)($at) /* 084228 80083628 8DCF0000 */ lw $t7, ($t6) -# Accessing D_800DF7DC[1] and D_800DF7DC[2]. -/* 08422C 8008362C 3C01800E */ lui $at, %hi(D_800DF7DC+8) # $at, 0x800e +/* 08422C 8008362C 3C01800E */ lui $at, %hi(D_800DF7DC+16) # $at, 0x800e /* 084230 80083630 0018C880 */ sll $t9, $t8, 2 /* 084234 80083634 00994021 */ addu $t0, $a0, $t9 /* 084238 80083638 AC2FF7E4 */ sw $t7, %lo(D_800DF7DC+8)($at) /* 08423C 8008363C 8D090000 */ lw $t1, ($t0) -/* 084240 80083640 3C03800E */ lui $v1, %hi(D_800DF7DC+0x18) # $v1, 0x800e +/* 084240 80083640 3C03800E */ lui $v1, %hi(D_800DF7DC+24) # $v1, 0x800e /* 084244 80083644 3C02800E */ lui $v0, %hi(D_800DF7C4+6) # $v0, 0x800e /* 084248 80083648 3C05800E */ lui $a1, %hi(D_800DF7C4+22) # $a1, 0x800e /* 08424C 8008364C 24A5F7DA */ addiu $a1, %lo(D_800DF7C4+22) # addiu $a1, $a1, -0x826 /* 084250 80083650 2442F7CA */ addiu $v0, %lo(D_800DF7C4+6) # addiu $v0, $v0, -0x836 -/* 084254 80083654 2463F7F4 */ addiu $v1, %lo(D_800DF7DC+0x18) # addiu $v1, $v1, -0x80c -/* 084258 80083658 AC29F7EC */ sw $t1, %lo(D_800DF7DC+0x10)($at) +/* 084254 80083654 2463F7F4 */ addiu $v1, %lo(D_800DF7DC+24) # addiu $v1, $v1, -0x80c +/* 084258 80083658 AC29F7EC */ sw $t1, %lo(D_800DF7DC+16)($at) .L8008365C: /* 08425C 8008365C 844A0000 */ lh $t2, ($v0) /* 084260 80083660 844E0002 */ lh $t6, 2($v0) diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s index 4e9fbf01..055414ee 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s @@ -328,8 +328,7 @@ glabel MenuTitleScreenLoop /* 084A94 80083E94 4606003C */ c.lt.s $f0, $f6 /* 084A98 80083E98 3C0F800E */ lui $t7, %hi(D_800DF760) # $t7, 0x800e /* 084A9C 80083E9C 45000016 */ bc1f .L80083EF8 -# Casting D_800DF760 to u8 (see instr 084AF8). -/* 084AA0 80083EA0 3C04800E */ lui $a0, %hi(D_800DF760) # $a0, 0x800e +/* 084AA0 80083EA0 3C04800E */ lui $a0, %hi(D_800DF760+3) # $a0, 0x800e /* 084AA4 80083EA4 8DEFF760 */ lw $t7, %lo(D_800DF760)($t7) /* 084AA8 80083EA8 44815000 */ mtc1 $at, $f10 /* 084AAC 80083EAC 448F2000 */ mtc1 $t7, $f4 @@ -352,7 +351,7 @@ glabel MenuTitleScreenLoop /* 084AF0 80083EF0 10000006 */ b .L80083F0C /* 084AF4 80083EF4 2463686C */ addiu $v1, %lo(D_8012686C) # addiu $v1, $v1, 0x686c .L80083EF8: -/* 084AF8 80083EF8 9084F763 */ lbu $a0, -0x89d($a0) +/* 084AF8 80083EF8 9084F763 */ lbu $a0, %lo(D_800DF760+3)($a0) /* 084AFC 80083EFC 0C000664 */ jal musicSetRelativeVolume /* 084B00 80083F00 00000000 */ nop /* 084B04 80083F04 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 4ca535bf..6c4aa5c1 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -174,9 +174,9 @@ glabel L80094DD0 /* 095B84 80094F84 3C014000 */ li $at, 0x40000000 # 2.000000 /* 095B88 80094F88 46803220 */ cvt.s.w $f8, $f6 /* 095B8C 80094F8C 44813000 */ mtc1 $at, $f6 -/* 095B90 80094F90 3C01800E */ lui $at, %hi(D_800DF510+4*0x20+8) # $at, 0x800e +/* 095B90 80094F90 3C01800E */ lui $at, %hi(D_800DF510+0x88) # $at, 0x800e /* 095B94 80094F94 E5880090 */ swc1 $f8, 0x90($t4) -/* 095B98 80094F98 C42AF598 */ lwc1 $f10, %lo(D_800DF510+4*0x20+8)($at) +/* 095B98 80094F98 C42AF598 */ lwc1 $f10, %lo(D_800DF510+0x88)($at) /* 095B9C 80094F9C 46043201 */ sub.s $f8, $f6, $f4 /* 095BA0 80094FA0 8C4D0000 */ lw $t5, ($v0) /* 095BA4 80094FA4 46085402 */ mul.s $f16, $f10, $f8 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 01cd3e3a..312c9350 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -214,10 +214,10 @@ glabel L80095964 /* 096620 80095A20 E584008C */ swc1 $f4, 0x8c($t4) /* 096624 80095A24 8C4D0000 */ lw $t5, ($v0) /* 096628 80095A28 44813000 */ mtc1 $at, $f6 -/* 09662C 80095A2C 3C01800E */ lui $at, %hi(D_800DF510+4*0x20+8) # $at, 0x800e +/* 09662C 80095A2C 3C01800E */ lui $at, %hi(D_800DF510+0x88) # $at, 0x800e /* 096630 80095A30 E5A60090 */ swc1 $f6, 0x90($t5) /* 096634 80095A34 8C4E0000 */ lw $t6, ($v0) -/* 096638 80095A38 C428F598 */ lwc1 $f8, %lo(D_800DF510+4*0x20+8)($at) +/* 096638 80095A38 C428F598 */ lwc1 $f8, %lo(D_800DF510+0x88)($at) /* 09663C 80095A3C 00000000 */ nop /* 096640 80095A40 E5C80088 */ swc1 $f8, 0x88($t6) /* 096644 80095A44 8FAF002C */ lw $t7, 0x2c($sp) diff --git a/asm/unknown_070110.s b/asm/unknown_070110.s index 77e33d0f..845310e2 100644 --- a/asm/unknown_070110.s +++ b/asm/unknown_070110.s @@ -54,8 +54,8 @@ glabel D_800DD438 .word 0x5141564D glabel D_800DD43C -.half 0x0000, 0x0032, 0x0065, 0x0097, 0x00C9, 0x00FB, 0x012E, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028D, 0x02C0, 0x02F2, 0x0324, 0x0356, 0x0389, 0x03BB, 0x03ED, 0x041F, 0x0452, 0x0484, 0x04B6, 0x04E8, 0x051B, 0x054D, 0x057F, 0x05B1, 0x05E3, 0x0616, 0x0648, 0x067A, 0x06AC, 0x06DE, 0x0711, 0x0743, 0x0775, 0x07A7, 0x07D9, 0x080C, 0x083E, 0x0870, 0x08A2, 0x08D4, 0x0906, 0x0938, 0x096B, 0x099D, 0x09CF, 0x0A01, 0x0A33, 0x0A65, 0x0A97, 0x0AC9, 0x0AFB, 0x0B2D, 0x0B60, 0x0B92, 0x0BC4, 0x0BF6, 0x0C28, 0x0C5A, 0x0C8C, 0x0CBE, 0x0CF0, 0x0D22, 0x0D54, 0x0D86, 0x0DB8, 0x0DEA, 0x0E1C, 0x0E4E, 0x0E80, 0x0EB2, 0x0EE4, 0x0F15, 0x0F47, 0x0F79, 0x0FAB, 0x0FDD, 0x100F, 0x1041, 0x1073, 0x10A4, 0x10D6, 0x1108, 0x113A, 0x116C, 0x119E, 0x11CF, 0x1201, 0x1233, 0x1265, 0x1296, 0x12C8, 0x12FA, 0x132B, 0x135D, 0x138F, 0x13C1, 0x13F2, 0x1424, 0x1455, 0x1487, 0x14B9, 0x14EA, 0x151C, 0x154D, 0x157F, 0x15B1, 0x15E2, 0x1614, 0x1645, 0x1677, 0x16A8, 0x16DA, 0x170B, 0x173C, 0x176E, 0x179F, 0x17D1, 0x1802, 0x1833, 0x1865, 0x1896, 0x18C7, 0x18F9, 0x192A, 0x195B, 0x198D, 0x19BE, 0x19EF, 0x1A20, 0x1A51, 0x1A83, 0x1AB4, 0x1AE5, 0x1B16, 0x1B47, 0x1B78, 0x1BA9, 0x1BDA, 0x1C0C, 0x1C3D, 0x1C6E, 0x1C9F, 0x1CD0, 0x1D01, 0x1D31, 0x1D62, 0x1D93, 0x1DC4, 0x1DF5, 0x1E26, 0x1E57, 0x1E88, 0x1EB8, 0x1EE9, 0x1F1A, 0x1F4B, 0x1F7B, 0x1FAC, 0x1FDD, 0x200E, 0x203E, 0x206F, 0x209F, 0x20D0, 0x2101, 0x2131, 0x2162, 0x2192, 0x21C3, 0x21F3, 0x2224, 0x2254, 0x2284, 0x22B5, 0x22E5, 0x2316, 0x2346, 0x2376, 0x23A7, 0x23D7, 0x2407, 0x2437, 0x2467, 0x2498, 0x24C8, 0x24F8, 0x2528, 0x2558, 0x2588, 0x25B8, 0x25E8, 0x2618, 0x2648, 0x2678, 0x26A8, 0x26D8, 0x2708, 0x2738, 0x2768, 0x2797, 0x27C7, 0x27F7, 0x2827, 0x2856, 0x2886, 0x28B6, 0x28E5, 0x2915, 0x2945, 0x2974, 0x29A4, 0x29D3, 0x2A03, 0x2A32, 0x2A62, 0x2A91, 0x2AC1, 0x2AF0, 0x2B1F, 0x2B4F, 0x2B7E, 0x2BAD, 0x2BDC, 0x2C0C, 0x2C3B, 0x2C6A, 0x2C99, 0x2CC8, 0x2CF7, 0x2D26, 0x2D55, 0x2D84, 0x2DB3, 0x2DE2, 0x2E11, 0x2E40, 0x2E6F, 0x2E9E, 0x2ECC, 0x2EFB, 0x2F2A, 0x2F59, 0x2F87, 0x2FB6, 0x2FE5, 0x3013, 0x3042, 0x3070, 0x309F, 0x30CD, 0x30FC, 0x312A, 0x3159, 0x3187, 0x31B5, 0x31E4, 0x3212, 0x3240, 0x326E, 0x329D, 0x32CB, 0x32F9, 0x3327, 0x3355, 0x3383, 0x33B1, 0x33DF, 0x340D, 0x343B, 0x3469, 0x3497, 0x34C4, 0x34F2, 0x3520, 0x354E, 0x357B, 0x35A9, 0x35D7, 0x3604, 0x3632, 0x365F, 0x368D, 0x36BA, 0x36E8, 0x3715, 0x3742, 0x3770, 0x379D, 0x37CA, 0x37F7, 0x3825, 0x3852, 0x387F, 0x38AC, 0x38D9, 0x3906, 0x3933, 0x3960, 0x398D, 0x39BA, 0x39E7, 0x3A13, 0x3A40, 0x3A6D, 0x3A9A, 0x3AC6, 0x3AF3, 0x3B20, 0x3B4C, 0x3B79, 0x3BA5, 0x3BD2, 0x3BFE, 0x3C2A, 0x3C57, 0x3C83, 0x3CAF, 0x3CDC, 0x3D08, 0x3D34, 0x3D60, 0x3D8C, 0x3DB8, 0x3DE4, 0x3E10, 0x3E3C, 0x3E68, 0x3E94, 0x3EC0, 0x3EEC, 0x3F17, 0x3F43, 0x3F6F, 0x3F9A, 0x3FC6, 0x3FF1, 0x401D, 0x4048, 0x4074, 0x409F, 0x40CB, 0x40F6, 0x4121, 0x414D, 0x4178, 0x41A3, 0x41CE, 0x41F9, 0x4224, 0x424F, 0x427A, 0x42A5, 0x42D0, 0x42FB, 0x4326, 0x4351, 0x437B, 0x43A6, 0x43D1, 0x43FB, 0x4426, 0x4450, 0x447B, 0x44A5, 0x44D0, 0x44FA, 0x4524, 0x454F, 0x4579, 0x45A3, 0x45CD, 0x45F7, 0x4621, 0x464B, 0x4675, 0x469F, 0x46C9, 0x46F3, 0x471D, 0x4747, 0x4770, 0x479A, 0x47C4, 0x47ED, 0x4817, 0x4840, 0x486A, 0x4893, 0x48BD, 0x48E6, 0x490F, 0x4939, 0x4962, 0x498B, 0x49B4, 0x49DD, 0x4A06, 0x4A2F, 0x4A58, 0x4A81, 0x4AAA, 0x4AD3, 0x4AFB, 0x4B24, 0x4B4D, 0x4B75, 0x4B9E, 0x4BC7, 0x4BEF, 0x4C17, 0x4C40, 0x4C68, 0x4C91, 0x4CB9, 0x4CE1, 0x4D09, 0x4D31, 0x4D59, 0x4D81, 0x4DA9, 0x4DD1, 0x4DF9, 0x4E21, 0x4E49, 0x4E71, 0x4E98, 0x4EC0, 0x4EE8, 0x4F0F, 0x4F37, 0x4F5E, 0x4F85, 0x4FAD, 0x4FD4, 0x4FFB, 0x5023, 0x504A, 0x5071, 0x5098, 0x50BF, 0x50E6, 0x510D, 0x5134, 0x515B, 0x5181, 0x51A8, 0x51CF, 0x51F5, 0x521C, 0x5243, 0x5269, 0x5290, 0x52B6, 0x52DC, 0x5303, 0x5329, 0x534F, 0x5375, 0x539B, 0x53C1, 0x53E7, 0x540D, 0x5433, 0x5459, 0x547F, 0x54A4, 0x54CA, 0x54F0, 0x5515, 0x553B, 0x5560, 0x5586, 0x55AB, 0x55D0, 0x55F6, 0x561B, 0x5640, 0x5665, 0x568A, 0x56AF, 0x56D4, 0x56F9, 0x571E, 0x5743, 0x5767, 0x578C, 0x57B1, 0x57D5, 0x57FA, 0x581E, 0x5843, 0x5867, 0x588C, 0x58B0, 0x58D4, 0x58F8, 0x591C, 0x5940, 0x5964, 0x5988, 0x59AC, 0x59D0, 0x59F4, 0x5A18, 0x5A3B, 0x5A5F, 0x5A82, 0x5AA6, 0x5AC9, 0x5AED, 0x5B10, 0x5B34, 0x5B57, 0x5B7A, 0x5B9D, 0x5BC0, 0x5BE3, 0x5C06, 0x5C29, 0x5C4C, 0x5C6F, 0x5C91, 0x5CB4, 0x5CD7, 0x5CF9, 0x5D1C, 0x5D3E, 0x5D61, 0x5D83, 0x5DA5, 0x5DC8, 0x5DEA, 0x5E0C, 0x5E2E, 0x5E50, 0x5E72, 0x5E94, 0x5EB6, 0x5ED7, 0x5EF9, 0x5F1B, 0x5F3C, 0x5F5E, 0x5F80, 0x5FA1, 0x5FC2, 0x5FE4, 0x6005, 0x6026, 0x6047, 0x6068, 0x6089, 0x60AA, 0x60CB, 0x60EC, 0x610D, 0x612E, 0x614E, 0x616F, 0x6190, 0x61B0, 0x61D1, 0x61F1, 0x6211, 0x6232, 0x6252, 0x6272, 0x6292, 0x62B2, 0x62D2, 0x62F2, 0x6312, 0x6332, 0x6351, 0x6371, 0x6391, 0x63B0, 0x63D0, 0x63EF, 0x640F, 0x642E, 0x644D, 0x646C, 0x648B, 0x64AB, 0x64CA, 0x64E9, 0x6507, 0x6526, 0x6545, 0x6564, 0x6582, 0x65A1, 0x65C0, 0x65DE, 0x65FC, 0x661B, 0x6639, 0x6657, 0x6675, 0x6693, 0x66B2, 0x66D0, 0x66ED, 0x670B, 0x6729, 0x6747, 0x6764, 0x6782, 0x67A0, 0x67BD, 0x67DA, 0x67F8, 0x6815, 0x6832, 0x6850, 0x686D, 0x688A, 0x68A7, 0x68C4, 0x68E0, 0x68FD, 0x691A, 0x6937, 0x6953, 0x6970, 0x698C, 0x69A9, 0x69C5, 0x69E1, 0x69FD, 0x6A1A, 0x6A36, 0x6A52, 0x6A6E, 0x6A89, 0x6AA5, 0x6AC1, 0x6ADD, 0x6AF8, 0x6B14, 0x6B30, 0x6B4B, 0x6B66, 0x6B82, 0x6B9D, 0x6BB8, 0x6BD3, 0x6BEE, 0x6C09, 0x6C24, 0x6C3F, 0x6C5A, 0x6C75, 0x6C8F, 0x6CAA, 0x6CC4, 0x6CDF, 0x6CF9, 0x6D14, 0x6D2E, 0x6D48, 0x6D62, 0x6D7C, 0x6D96, 0x6DB0, 0x6DCA, 0x6DE4, 0x6DFE, 0x6E17, 0x6E31, 0x6E4A, 0x6E64, 0x6E7D, 0x6E97, 0x6EB0, 0x6EC9, 0x6EE2, 0x6EFB, 0x6F14, 0x6F2D, 0x6F46, 0x6F5F, 0x6F78, 0x6F90, 0x6FA9, 0x6FC2, 0x6FDA, 0x6FF2, 0x700B, 0x7023, 0x703B, 0x7053, 0x706B, 0x7083, 0x709B, 0x70B3, 0x70CB, 0x70E3, 0x70FA, 0x7112, 0x712A, 0x7141, 0x7158, 0x7170, 0x7187, 0x719E, 0x71B5, 0x71CC, 0x71E3, 0x71FA, 0x7211, 0x7228, 0x723F, 0x7255, 0x726C, 0x7282, 0x7299, 0x72AF, 0x72C5, 0x72DC, 0x72F2, 0x7308, 0x731E, 0x7334, 0x734A, 0x735F, 0x7375, 0x738B, 0x73A0, 0x73B6, 0x73CB, 0x73E1, 0x73F6, 0x740B, 0x7421, 0x7436, 0x744B, 0x7460, 0x7475, 0x7489, 0x749E, 0x74B3, 0x74C7, 0x74DC, 0x74F0, 0x7505, 0x7519, 0x752D, 0x7542, 0x7556, 0x756A, 0x757E, 0x7592, 0x75A6, 0x75B9, 0x75CD, 0x75E1, 0x75F4, 0x7608, 0x761B, 0x762E, 0x7642, 0x7655, 0x7668, 0x767B, 0x768E, 0x76A1, 0x76B4, 0x76C7, 0x76D9, 0x76EC, 0x76FE, 0x7711, 0x7723, 0x7736, 0x7748, 0x775A, 0x776C, 0x777E, 0x7790, 0x77A2, 0x77B4, 0x77C6, 0x77D8, 0x77E9, 0x77FB, 0x780C, 0x781E, 0x782F, 0x7840, 0x7851, 0x7863, 0x7874, 0x7885, 0x7895, 0x78A6, 0x78B7, 0x78C8, 0x78D8, 0x78E9, 0x78F9, 0x790A, 0x791A, 0x792A, 0x793A, 0x794A, 0x795B, 0x796A, 0x797A, 0x798A, 0x799A, 0x79AA, 0x79B9, 0x79C9, 0x79D8, 0x79E7, 0x79F7, 0x7A06, 0x7A15, 0x7A24, 0x7A33, 0x7A42, 0x7A51, 0x7A60, 0x7A6E, 0x7A7D, 0x7A8C, 0x7A9A, 0x7AA8, 0x7AB7, 0x7AC5, 0x7AD3, 0x7AE1, 0x7AEF, 0x7AFD, 0x7B0B, 0x7B19, 0x7B27, 0x7B34, 0x7B42, 0x7B50, 0x7B5D, 0x7B6A, 0x7B78, 0x7B85, 0x7B92, 0x7B9F, 0x7BAC, 0x7BB9, 0x7BC6, 0x7BD3, 0x7BDF, 0x7BEC, 0x7BF9, 0x7C05, 0x7C11, 0x7C1E, 0x7C2A, 0x7C36, 0x7C42, 0x7C4E, 0x7C5A, 0x7C66, 0x7C72, 0x7C7E, 0x7C89, 0x7C95, 0x7CA0, 0x7CAC, 0x7CB7, 0x7CC2, 0x7CCE, 0x7CD9, 0x7CE4, 0x7CEF, 0x7CFA, 0x7D05, 0x7D0F, 0x7D1A, 0x7D25, 0x7D2F, 0x7D3A, 0x7D44, 0x7D4E, 0x7D58, 0x7D63, 0x7D6D, 0x7D77, 0x7D81, 0x7D8A, 0x7D94, 0x7D9E, 0x7DA7, 0x7DB1, 0x7DBA, 0x7DC4, 0x7DCD, 0x7DD6, 0x7DE0, 0x7DE9, 0x7DF2, 0x7DFB, 0x7E03, 0x7E0C, 0x7E15, 0x7E1E, 0x7E26, 0x7E2F, 0x7E37, 0x7E3F, 0x7E48, 0x7E50, 0x7E58, 0x7E60, 0x7E68, 0x7E70, 0x7E78, 0x7E7F, 0x7E87, 0x7E8E, 0x7E96, 0x7E9D, 0x7EA5, 0x7EAC, 0x7EB3, 0x7EBA, 0x7EC1, 0x7EC8, 0x7ECF, 0x7ED6, 0x7EDD, 0x7EE3, 0x7EEA, 0x7EF0, 0x7EF7, 0x7EFD, 0x7F03, 0x7F0A, 0x7F10, 0x7F16, 0x7F1C, 0x7F22, 0x7F27, 0x7F2D, 0x7F33, 0x7F38, 0x7F3E, 0x7F43, 0x7F49, 0x7F4E, 0x7F53, 0x7F58, 0x7F5D, 0x7F62, 0x7F67, 0x7F6C, 0x7F71, 0x7F75, 0x7F7A, 0x7F7E, 0x7F83, 0x7F87, 0x7F8B, 0x7F90, 0x7F94, 0x7F98, 0x7F9C, 0x7FA0, 0x7FA3, 0x7FA7, 0x7FAB, 0x7FAE, 0x7FB2, 0x7FB5, 0x7FB9, 0x7FBC, 0x7FBF, 0x7FC2, 0x7FC5, 0x7FC8, 0x7FCB, 0x7FCE, 0x7FD1, 0x7FD3, 0x7FD6, 0x7FD9, 0x7FDB, 0x7FDD, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF4, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFF, 0x7FFF, 0x7FFF, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000 +.half 0x0000, 0x0032, 0x0065, 0x0097, 0x00C9, 0x00FB, 0x012E, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028D, 0x02C0, 0x02F2, 0x0324, 0x0356, 0x0389, 0x03BB, 0x03ED, 0x041F, 0x0452, 0x0484, 0x04B6, 0x04E8, 0x051B, 0x054D, 0x057F, 0x05B1, 0x05E3, 0x0616, 0x0648, 0x067A, 0x06AC, 0x06DE, 0x0711, 0x0743, 0x0775, 0x07A7, 0x07D9, 0x080C, 0x083E, 0x0870, 0x08A2, 0x08D4, 0x0906, 0x0938, 0x096B, 0x099D, 0x09CF, 0x0A01, 0x0A33, 0x0A65, 0x0A97, 0x0AC9, 0x0AFB, 0x0B2D, 0x0B60, 0x0B92, 0x0BC4, 0x0BF6, 0x0C28, 0x0C5A, 0x0C8C, 0x0CBE, 0x0CF0, 0x0D22, 0x0D54, 0x0D86, 0x0DB8, 0x0DEA, 0x0E1C, 0x0E4E, 0x0E80, 0x0EB2, 0x0EE4, 0x0F15, 0x0F47, 0x0F79, 0x0FAB, 0x0FDD, 0x100F, 0x1041, 0x1073, 0x10A4, 0x10D6, 0x1108, 0x113A, 0x116C, 0x119E, 0x11CF, 0x1201, 0x1233, 0x1265, 0x1296, 0x12C8, 0x12FA, 0x132B, 0x135D, 0x138F, 0x13C1, 0x13F2, 0x1424, 0x1455, 0x1487, 0x14B9, 0x14EA, 0x151C, 0x154D, 0x157F, 0x15B1, 0x15E2, 0x1614, 0x1645, 0x1677, 0x16A8, 0x16DA, 0x170B, 0x173C, 0x176E, 0x179F, 0x17D1, 0x1802, 0x1833, 0x1865, 0x1896, 0x18C7, 0x18F9, 0x192A, 0x195B, 0x198D, 0x19BE, 0x19EF, 0x1A20, 0x1A51, 0x1A83, 0x1AB4, 0x1AE5, 0x1B16, 0x1B47, 0x1B78, 0x1BA9, 0x1BDA, 0x1C0C, 0x1C3D, 0x1C6E, 0x1C9F, 0x1CD0, 0x1D01, 0x1D31, 0x1D62, 0x1D93, 0x1DC4, 0x1DF5, 0x1E26, 0x1E57, 0x1E88, 0x1EB8, 0x1EE9, 0x1F1A, 0x1F4B, 0x1F7B, 0x1FAC, 0x1FDD, 0x200E, 0x203E, 0x206F, 0x209F, 0x20D0, 0x2101, 0x2131, 0x2162, 0x2192, 0x21C3, 0x21F3, 0x2224, 0x2254, 0x2284, 0x22B5, 0x22E5, 0x2316, 0x2346, 0x2376, 0x23A7, 0x23D7, 0x2407, 0x2437, 0x2467, 0x2498, 0x24C8, 0x24F8, 0x2528, 0x2558, 0x2588, 0x25B8, 0x25E8, 0x2618, 0x2648, 0x2678, 0x26A8, 0x26D8, 0x2708, 0x2738, 0x2768, 0x2797, 0x27C7, 0x27F7, 0x2827, 0x2856, 0x2886, 0x28B6, 0x28E5, 0x2915, 0x2945, 0x2974, 0x29A4, 0x29D3, 0x2A03, 0x2A32, 0x2A62, 0x2A91, 0x2AC1, 0x2AF0, 0x2B1F, 0x2B4F, 0x2B7E, 0x2BAD, 0x2BDC, 0x2C0C, 0x2C3B, 0x2C6A, 0x2C99, 0x2CC8, 0x2CF7, 0x2D26, 0x2D55, 0x2D84, 0x2DB3, 0x2DE2, 0x2E11, 0x2E40, 0x2E6F, 0x2E9E, 0x2ECC, 0x2EFB, 0x2F2A, 0x2F59, 0x2F87, 0x2FB6, 0x2FE5, 0x3013, 0x3042, 0x3070, 0x309F, 0x30CD, 0x30FC, 0x312A, 0x3159, 0x3187, 0x31B5, 0x31E4, 0x3212, 0x3240, 0x326E, 0x329D, 0x32CB, 0x32F9, 0x3327, 0x3355, 0x3383, 0x33B1, 0x33DF, 0x340D, 0x343B, 0x3469, 0x3497, 0x34C4, 0x34F2, 0x3520, 0x354E, 0x357B, 0x35A9, 0x35D7, 0x3604, 0x3632, 0x365F, 0x368D, 0x36BA, 0x36E8, 0x3715, 0x3742, 0x3770, 0x379D, 0x37CA, 0x37F7, 0x3825, 0x3852, 0x387F, 0x38AC, 0x38D9, 0x3906, 0x3933, 0x3960, 0x398D, 0x39BA, 0x39E7, 0x3A13, 0x3A40, 0x3A6D, 0x3A9A, 0x3AC6, 0x3AF3, 0x3B20, 0x3B4C, 0x3B79, 0x3BA5, 0x3BD2, 0x3BFE, 0x3C2A, 0x3C57, 0x3C83, 0x3CAF, 0x3CDC, 0x3D08, 0x3D34, 0x3D60, 0x3D8C, 0x3DB8, 0x3DE4, 0x3E10, 0x3E3C, 0x3E68, 0x3E94, 0x3EC0, 0x3EEC, 0x3F17, 0x3F43, 0x3F6F, 0x3F9A, 0x3FC6, 0x3FF1, 0x401D, 0x4048, 0x4074, 0x409F, 0x40CB, 0x40F6, 0x4121, 0x414D, 0x4178, 0x41A3, 0x41CE, 0x41F9, 0x4224, 0x424F, 0x427A, 0x42A5, 0x42D0, 0x42FB, 0x4326, 0x4351, 0x437B, 0x43A6, 0x43D1, 0x43FB, 0x4426, 0x4450, 0x447B, 0x44A5, 0x44D0, 0x44FA, 0x4524, 0x454F, 0x4579, 0x45A3, 0x45CD, 0x45F7, 0x4621, 0x464B, 0x4675, 0x469F, 0x46C9, 0x46F3, 0x471D, 0x4747, 0x4770, 0x479A, 0x47C4, 0x47ED, 0x4817, 0x4840, 0x486A, 0x4893, 0x48BD, 0x48E6, 0x490F, 0x4939, 0x4962, 0x498B, 0x49B4, 0x49DD, 0x4A06, 0x4A2F, 0x4A58, 0x4A81, 0x4AAA, 0x4AD3, 0x4AFB, 0x4B24, 0x4B4D, 0x4B75, 0x4B9E, 0x4BC7, 0x4BEF, 0x4C17, 0x4C40, 0x4C68, 0x4C91, 0x4CB9, 0x4CE1, 0x4D09, 0x4D31, 0x4D59, 0x4D81, 0x4DA9, 0x4DD1, 0x4DF9, 0x4E21, 0x4E49, 0x4E71, 0x4E98, 0x4EC0, 0x4EE8, 0x4F0F, 0x4F37, 0x4F5E, 0x4F85, 0x4FAD, 0x4FD4, 0x4FFB, 0x5023, 0x504A, 0x5071, 0x5098, 0x50BF, 0x50E6, 0x510D, 0x5134, 0x515B, 0x5181, 0x51A8, 0x51CF, 0x51F5, 0x521C, 0x5243, 0x5269, 0x5290, 0x52B6, 0x52DC, 0x5303, 0x5329, 0x534F, 0x5375, 0x539B, 0x53C1, 0x53E7, 0x540D, 0x5433, 0x5459, 0x547F, 0x54A4, 0x54CA, 0x54F0, 0x5515, 0x553B, 0x5560, 0x5586, 0x55AB, 0x55D0, 0x55F6, 0x561B, 0x5640, 0x5665, 0x568A, 0x56AF, 0x56D4, 0x56F9, 0x571E, 0x5743, 0x5767, 0x578C, 0x57B1, 0x57D5, 0x57FA, 0x581E, 0x5843, 0x5867, 0x588C, 0x58B0, 0x58D4, 0x58F8, 0x591C, 0x5940, 0x5964, 0x5988, 0x59AC, 0x59D0, 0x59F4, 0x5A18, 0x5A3B, 0x5A5F, 0x5A82, 0x5AA6, 0x5AC9, 0x5AED, 0x5B10, 0x5B34, 0x5B57, 0x5B7A, 0x5B9D, 0x5BC0, 0x5BE3, 0x5C06, 0x5C29, 0x5C4C, 0x5C6F, 0x5C91, 0x5CB4, 0x5CD7, 0x5CF9, 0x5D1C, 0x5D3E, 0x5D61, 0x5D83, 0x5DA5, 0x5DC8, 0x5DEA, 0x5E0C, 0x5E2E, 0x5E50, 0x5E72, 0x5E94, 0x5EB6, 0x5ED7, 0x5EF9, 0x5F1B, 0x5F3C, 0x5F5E, 0x5F80, 0x5FA1, 0x5FC2, 0x5FE4, 0x6005, 0x6026, 0x6047, 0x6068, 0x6089, 0x60AA, 0x60CB, 0x60EC, 0x610D, 0x612E, 0x614E, 0x616F, 0x6190, 0x61B0, 0x61D1, 0x61F1, 0x6211, 0x6232, 0x6252, 0x6272, 0x6292, 0x62B2, 0x62D2, 0x62F2, 0x6312, 0x6332, 0x6351, 0x6371, 0x6391, 0x63B0, 0x63D0, 0x63EF, 0x640F, 0x642E, 0x644D, 0x646C, 0x648B, 0x64AB, 0x64CA, 0x64E9, 0x6507, 0x6526, 0x6545, 0x6564, 0x6582, 0x65A1, 0x65C0, 0x65DE, 0x65FC, 0x661B, 0x6639, 0x6657, 0x6675, 0x6693, 0x66B2, 0x66D0, 0x66ED, 0x670B, 0x6729, 0x6747, 0x6764, 0x6782, 0x67A0, 0x67BD, 0x67DA, 0x67F8, 0x6815, 0x6832, 0x6850, 0x686D, 0x688A, 0x68A7, 0x68C4, 0x68E0, 0x68FD, 0x691A, 0x6937, 0x6953, 0x6970, 0x698C, 0x69A9, 0x69C5, 0x69E1, 0x69FD, 0x6A1A, 0x6A36, 0x6A52, 0x6A6E, 0x6A89, 0x6AA5, 0x6AC1, 0x6ADD, 0x6AF8, 0x6B14, 0x6B30, 0x6B4B, 0x6B66, 0x6B82, 0x6B9D, 0x6BB8, 0x6BD3, 0x6BEE, 0x6C09, 0x6C24, 0x6C3F, 0x6C5A, 0x6C75, 0x6C8F, 0x6CAA, 0x6CC4, 0x6CDF, 0x6CF9, 0x6D14, 0x6D2E, 0x6D48, 0x6D62, 0x6D7C, 0x6D96, 0x6DB0, 0x6DCA, 0x6DE4, 0x6DFE, 0x6E17, 0x6E31, 0x6E4A, 0x6E64, 0x6E7D, 0x6E97, 0x6EB0, 0x6EC9, 0x6EE2, 0x6EFB, 0x6F14, 0x6F2D, 0x6F46, 0x6F5F, 0x6F78, 0x6F90, 0x6FA9, 0x6FC2, 0x6FDA, 0x6FF2, 0x700B, 0x7023, 0x703B, 0x7053, 0x706B, 0x7083, 0x709B, 0x70B3, 0x70CB, 0x70E3, 0x70FA, 0x7112, 0x712A, 0x7141, 0x7158, 0x7170, 0x7187, 0x719E, 0x71B5, 0x71CC, 0x71E3, 0x71FA, 0x7211, 0x7228, 0x723F, 0x7255, 0x726C, 0x7282, 0x7299, 0x72AF, 0x72C5, 0x72DC, 0x72F2, 0x7308, 0x731E, 0x7334, 0x734A, 0x735F, 0x7375, 0x738B, 0x73A0, 0x73B6, 0x73CB, 0x73E1, 0x73F6, 0x740B, 0x7421, 0x7436, 0x744B, 0x7460, 0x7475, 0x7489, 0x749E, 0x74B3, 0x74C7, 0x74DC, 0x74F0, 0x7505, 0x7519, 0x752D, 0x7542, 0x7556, 0x756A, 0x757E, 0x7592, 0x75A6, 0x75B9, 0x75CD, 0x75E1, 0x75F4, 0x7608, 0x761B, 0x762E, 0x7642, 0x7655, 0x7668, 0x767B, 0x768E, 0x76A1, 0x76B4, 0x76C7, 0x76D9, 0x76EC, 0x76FE, 0x7711, 0x7723, 0x7736, 0x7748, 0x775A, 0x776C, 0x777E, 0x7790, 0x77A2, 0x77B4, 0x77C6, 0x77D8, 0x77E9, 0x77FB, 0x780C, 0x781E, 0x782F, 0x7840, 0x7851, 0x7863, 0x7874, 0x7885, 0x7895, 0x78A6, 0x78B7, 0x78C8, 0x78D8, 0x78E9, 0x78F9, 0x790A, 0x791A, 0x792A, 0x793A, 0x794A, 0x795B, 0x796A, 0x797A, 0x798A, 0x799A, 0x79AA, 0x79B9, 0x79C9, 0x79D8, 0x79E7, 0x79F7, 0x7A06, 0x7A15, 0x7A24, 0x7A33, 0x7A42, 0x7A51, 0x7A60, 0x7A6E, 0x7A7D, 0x7A8C, 0x7A9A, 0x7AA8, 0x7AB7, 0x7AC5, 0x7AD3, 0x7AE1, 0x7AEF, 0x7AFD, 0x7B0B, 0x7B19, 0x7B27, 0x7B34, 0x7B42, 0x7B50, 0x7B5D, 0x7B6A, 0x7B78, 0x7B85, 0x7B92, 0x7B9F, 0x7BAC, 0x7BB9, 0x7BC6, 0x7BD3, 0x7BDF, 0x7BEC, 0x7BF9, 0x7C05, 0x7C11, 0x7C1E, 0x7C2A, 0x7C36, 0x7C42, 0x7C4E, 0x7C5A, 0x7C66, 0x7C72, 0x7C7E, 0x7C89, 0x7C95, 0x7CA0, 0x7CAC, 0x7CB7, 0x7CC2, 0x7CCE, 0x7CD9, 0x7CE4, 0x7CEF, 0x7CFA, 0x7D05, 0x7D0F, 0x7D1A, 0x7D25, 0x7D2F, 0x7D3A, 0x7D44, 0x7D4E, 0x7D58, 0x7D63, 0x7D6D, 0x7D77, 0x7D81, 0x7D8A, 0x7D94, 0x7D9E, 0x7DA7, 0x7DB1, 0x7DBA, 0x7DC4, 0x7DCD, 0x7DD6, 0x7DE0, 0x7DE9, 0x7DF2, 0x7DFB, 0x7E03, 0x7E0C, 0x7E15, 0x7E1E, 0x7E26, 0x7E2F, 0x7E37, 0x7E3F, 0x7E48, 0x7E50, 0x7E58, 0x7E60, 0x7E68, 0x7E70, 0x7E78, 0x7E7F, 0x7E87, 0x7E8E, 0x7E96, 0x7E9D, 0x7EA5, 0x7EAC, 0x7EB3, 0x7EBA, 0x7EC1, 0x7EC8, 0x7ECF, 0x7ED6, 0x7EDD, 0x7EE3, 0x7EEA, 0x7EF0, 0x7EF7, 0x7EFD, 0x7F03, 0x7F0A, 0x7F10, 0x7F16, 0x7F1C, 0x7F22, 0x7F27, 0x7F2D, 0x7F33, 0x7F38, 0x7F3E, 0x7F43, 0x7F49, 0x7F4E, 0x7F53, 0x7F58, 0x7F5D, 0x7F62, 0x7F67, 0x7F6C, 0x7F71, 0x7F75, 0x7F7A, 0x7F7E, 0x7F83, 0x7F87, 0x7F8B, 0x7F90, 0x7F94, 0x7F98, 0x7F9C, 0x7FA0, 0x7FA3, 0x7FA7, 0x7FAB, 0x7FAE, 0x7FB2, 0x7FB5, 0x7FB9, 0x7FBC, 0x7FBF, 0x7FC2, 0x7FC5, 0x7FC8, 0x7FCB, 0x7FCE, 0x7FD1, 0x7FD3, 0x7FD6, 0x7FD9, 0x7FDB, 0x7FDD, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF4, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFF, 0x7FFF, 0x7FFF, 0x8000, 0x8000, 0x8000, 0x8000 glabel D_800DDC3E -.half 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 +.half 0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, 0x011D, 0x0127, 0x0131, 0x013C, 0x0146, 0x0150, 0x015A, 0x0164, 0x016F, 0x0179, 0x0183, 0x018D, 0x0197, 0x01A1, 0x01AC, 0x01B6, 0x01C0, 0x01CA, 0x01D4, 0x01DE, 0x01E9, 0x01F3, 0x01FD, 0x0207, 0x0211, 0x021B, 0x0226, 0x0230, 0x023A, 0x0244, 0x024E, 0x0258, 0x0262, 0x026D, 0x0277, 0x0281, 0x028B, 0x0295, 0x029F, 0x02A9, 0x02B4, 0x02BE, 0x02C8, 0x02D2, 0x02DC, 0x02E6, 0x02F0, 0x02FB, 0x0305, 0x030F, 0x0319, 0x0323, 0x032D, 0x0337, 0x0341, 0x034C, 0x0356, 0x0360, 0x036A, 0x0374, 0x037E, 0x0388, 0x0392, 0x039C, 0x03A7, 0x03B1, 0x03BB, 0x03C5, 0x03CF, 0x03D9, 0x03E3, 0x03ED, 0x03F7, 0x0401, 0x040C, 0x0416, 0x0420, 0x042A, 0x0434, 0x043E, 0x0448, 0x0452, 0x045C, 0x0466, 0x0470, 0x047A, 0x0484, 0x048E, 0x0499, 0x04A3, 0x04AD, 0x04B7, 0x04C1, 0x04CB, 0x04D5, 0x04DF, 0x04E9, 0x04F3, 0x04FD, 0x0507, 0x0511, 0x051B, 0x0525, 0x052F, 0x0539, 0x0543, 0x054D, 0x0557, 0x0561, 0x056B, 0x0575, 0x057F, 0x0589, 0x0593, 0x059D, 0x05A7, 0x05B1, 0x05BB, 0x05C5, 0x05CF, 0x05D9, 0x05E3, 0x05ED, 0x05F7, 0x0601, 0x060B, 0x0615, 0x061F, 0x0629, 0x0633, 0x063D, 0x0647, 0x0651, 0x065B, 0x0665, 0x066E, 0x0678, 0x0682, 0x068C, 0x0696, 0x06A0, 0x06AA, 0x06B4, 0x06BE, 0x06C8, 0x06D2, 0x06DC, 0x06E5, 0x06EF, 0x06F9, 0x0703, 0x070D, 0x0717, 0x0721, 0x072B, 0x0735, 0x073E, 0x0748, 0x0752, 0x075C, 0x0766, 0x0770, 0x077A, 0x0783, 0x078D, 0x0797, 0x07A1, 0x07AB, 0x07B5, 0x07BE, 0x07C8, 0x07D2, 0x07DC, 0x07E6, 0x07EF, 0x07F9, 0x0803, 0x080D, 0x0817, 0x0820, 0x082A, 0x0834, 0x083E, 0x0848, 0x0851, 0x085B, 0x0865, 0x086F, 0x0878, 0x0882, 0x088C, 0x0896, 0x089F, 0x08A9, 0x08B3, 0x08BD, 0x08C6, 0x08D0, 0x08DA, 0x08E3, 0x08ED, 0x08F7, 0x0901, 0x090A, 0x0914, 0x091E, 0x0927, 0x0931, 0x093B, 0x0944, 0x094E, 0x0958, 0x0961, 0x096B, 0x0975, 0x097E, 0x0988, 0x0992, 0x099B, 0x09A5, 0x09AE, 0x09B8, 0x09C2, 0x09CB, 0x09D5, 0x09DE, 0x09E8, 0x09F2, 0x09FB, 0x0A05, 0x0A0E, 0x0A18, 0x0A22, 0x0A2B, 0x0A35, 0x0A3E, 0x0A48, 0x0A51, 0x0A5B, 0x0A64, 0x0A6E, 0x0A77, 0x0A81, 0x0A8B, 0x0A94, 0x0A9E, 0x0AA7, 0x0AB1, 0x0ABA, 0x0AC4, 0x0ACD, 0x0AD7, 0x0AE0, 0x0AE9, 0x0AF3, 0x0AFC, 0x0B06, 0x0B0F, 0x0B19, 0x0B22, 0x0B2C, 0x0B35, 0x0B3F, 0x0B48, 0x0B51, 0x0B5B, 0x0B64, 0x0B6E, 0x0B77, 0x0B80, 0x0B8A, 0x0B93, 0x0B9D, 0x0BA6, 0x0BAF, 0x0BB9, 0x0BC2, 0x0BCB, 0x0BD5, 0x0BDE, 0x0BE7, 0x0BF1, 0x0BFA, 0x0C03, 0x0C0D, 0x0C16, 0x0C1F, 0x0C29, 0x0C32, 0x0C3B, 0x0C45, 0x0C4E, 0x0C57, 0x0C60, 0x0C6A, 0x0C73, 0x0C7C, 0x0C86, 0x0C8F, 0x0C98, 0x0CA1, 0x0CAB, 0x0CB4, 0x0CBD, 0x0CC6, 0x0CCF, 0x0CD9, 0x0CE2, 0x0CEB, 0x0CF4, 0x0CFD, 0x0D07, 0x0D10, 0x0D19, 0x0D22, 0x0D2B, 0x0D34, 0x0D3E, 0x0D47, 0x0D50, 0x0D59, 0x0D62, 0x0D6B, 0x0D74, 0x0D7D, 0x0D87, 0x0D90, 0x0D99, 0x0DA2, 0x0DAB, 0x0DB4, 0x0DBD, 0x0DC6, 0x0DCF, 0x0DD8, 0x0DE1, 0x0DEA, 0x0DF3, 0x0DFC, 0x0E05, 0x0E0F, 0x0E18, 0x0E21, 0x0E2A, 0x0E33, 0x0E3C, 0x0E45, 0x0E4E, 0x0E56, 0x0E5F, 0x0E68, 0x0E71, 0x0E7A, 0x0E83, 0x0E8C, 0x0E95, 0x0E9E, 0x0EA7, 0x0EB0, 0x0EB9, 0x0EC2, 0x0ECB, 0x0ED4, 0x0EDC, 0x0EE5, 0x0EEE, 0x0EF7, 0x0F00, 0x0F09, 0x0F12, 0x0F1B, 0x0F23, 0x0F2C, 0x0F35, 0x0F3E, 0x0F47, 0x0F50, 0x0F58, 0x0F61, 0x0F6A, 0x0F73, 0x0F7C, 0x0F84, 0x0F8D, 0x0F96, 0x0F9F, 0x0FA7, 0x0FB0, 0x0FB9, 0x0FC2, 0x0FCA, 0x0FD3, 0x0FDC, 0x0FE5, 0x0FED, 0x0FF6, 0x0FFF, 0x1007, 0x1010, 0x1019, 0x1021, 0x102A, 0x1033, 0x103B, 0x1044, 0x104D, 0x1055, 0x105E, 0x1067, 0x106F, 0x1078, 0x1080, 0x1089, 0x1092, 0x109A, 0x10A3, 0x10AB, 0x10B4, 0x10BC, 0x10C5, 0x10CE, 0x10D6, 0x10DF, 0x10E7, 0x10F0, 0x10F8, 0x1101, 0x1109, 0x1112, 0x111A, 0x1123, 0x112B, 0x1134, 0x113C, 0x1145, 0x114D, 0x1156, 0x115E, 0x1166, 0x116F, 0x1177, 0x1180, 0x1188, 0x1191, 0x1199, 0x11A1, 0x11AA, 0x11B2, 0x11BB, 0x11C3, 0x11CB, 0x11D4, 0x11DC, 0x11E4, 0x11ED, 0x11F5, 0x11FD, 0x1206, 0x120E, 0x1216, 0x121F, 0x1227, 0x122F, 0x1237, 0x1240, 0x1248, 0x1250, 0x1259, 0x1261, 0x1269, 0x1271, 0x127A, 0x1282, 0x128A, 0x1292, 0x129A, 0x12A3, 0x12AB, 0x12B3, 0x12BB, 0x12C3, 0x12CC, 0x12D4, 0x12DC, 0x12E4, 0x12EC, 0x12F4, 0x12FC, 0x1305, 0x130D, 0x1315, 0x131D, 0x1325, 0x132D, 0x1335, 0x133D, 0x1345, 0x134D, 0x1355, 0x135E, 0x1366, 0x136E, 0x1376, 0x137E, 0x1386, 0x138E, 0x1396, 0x139E, 0x13A6, 0x13AE, 0x13B6, 0x13BE, 0x13C6, 0x13CE, 0x13D6, 0x13DE, 0x13E6, 0x13ED, 0x13F5, 0x13FD, 0x1405, 0x140D, 0x1415, 0x141D, 0x1425, 0x142D, 0x1435, 0x143D, 0x1444, 0x144C, 0x1454, 0x145C, 0x1464, 0x146C, 0x1473, 0x147B, 0x1483, 0x148B, 0x1493, 0x149B, 0x14A2, 0x14AA, 0x14B2, 0x14BA, 0x14C1, 0x14C9, 0x14D1, 0x14D9, 0x14E0, 0x14E8, 0x14F0, 0x14F8, 0x14FF, 0x1507, 0x150F, 0x1516, 0x151E, 0x1526, 0x152D, 0x1535, 0x153D, 0x1544, 0x154C, 0x1554, 0x155B, 0x1563, 0x156B, 0x1572, 0x157A, 0x1581, 0x1589, 0x1591, 0x1598, 0x15A0, 0x15A7, 0x15AF, 0x15B7, 0x15BE, 0x15C6, 0x15CD, 0x15D5, 0x15DC, 0x15E4, 0x15EB, 0x15F3, 0x15FA, 0x1602, 0x1609, 0x1611, 0x1618, 0x1620, 0x1627, 0x162F, 0x1636, 0x163E, 0x1645, 0x164C, 0x1654, 0x165B, 0x1663, 0x166A, 0x1671, 0x1679, 0x1680, 0x1688, 0x168F, 0x1696, 0x169E, 0x16A5, 0x16AC, 0x16B4, 0x16BB, 0x16C2, 0x16CA, 0x16D1, 0x16D8, 0x16E0, 0x16E7, 0x16EE, 0x16F6, 0x16FD, 0x1704, 0x170B, 0x1713, 0x171A, 0x1721, 0x1728, 0x1730, 0x1737, 0x173E, 0x1745, 0x174C, 0x1754, 0x175B, 0x1762, 0x1769, 0x1770, 0x1778, 0x177F, 0x1786, 0x178D, 0x1794, 0x179B, 0x17A2, 0x17AA, 0x17B1, 0x17B8, 0x17BF, 0x17C6, 0x17CD, 0x17D4, 0x17DB, 0x17E2, 0x17E9, 0x17F0, 0x17F7, 0x17FE, 0x1806, 0x180D, 0x1814, 0x181B, 0x1822, 0x1829, 0x1830, 0x1837, 0x183E, 0x1845, 0x184C, 0x1853, 0x185A, 0x1860, 0x1867, 0x186E, 0x1875, 0x187C, 0x1883, 0x188A, 0x1891, 0x1898, 0x189F, 0x18A6, 0x18AD, 0x18B3, 0x18BA, 0x18C1, 0x18C8, 0x18CF, 0x18D6, 0x18DD, 0x18E3, 0x18EA, 0x18F1, 0x18F8, 0x18FF, 0x1906, 0x190C, 0x1913, 0x191A, 0x1921, 0x1928, 0x192E, 0x1935, 0x193C, 0x1943, 0x1949, 0x1950, 0x1957, 0x195D, 0x1964, 0x196B, 0x1972, 0x1978, 0x197F, 0x1986, 0x198C, 0x1993, 0x199A, 0x19A0, 0x19A7, 0x19AE, 0x19B4, 0x19BB, 0x19C2, 0x19C8, 0x19CF, 0x19D5, 0x19DC, 0x19E3, 0x19E9, 0x19F0, 0x19F6, 0x19FD, 0x1A04, 0x1A0A, 0x1A11, 0x1A17, 0x1A1E, 0x1A24, 0x1A2B, 0x1A31, 0x1A38, 0x1A3E, 0x1A45, 0x1A4B, 0x1A52, 0x1A58, 0x1A5F, 0x1A65, 0x1A6C, 0x1A72, 0x1A79, 0x1A7F, 0x1A86, 0x1A8C, 0x1A93, 0x1A99, 0x1A9F, 0x1AA6, 0x1AAC, 0x1AB3, 0x1AB9, 0x1AC0, 0x1AC6, 0x1ACC, 0x1AD3, 0x1AD9, 0x1ADF, 0x1AE6, 0x1AEC, 0x1AF2, 0x1AF9, 0x1AFF, 0x1B05, 0x1B0C, 0x1B12, 0x1B18, 0x1B1F, 0x1B25, 0x1B2B, 0x1B32, 0x1B38, 0x1B3E, 0x1B44, 0x1B4B, 0x1B51, 0x1B57, 0x1B5D, 0x1B64, 0x1B6A, 0x1B70, 0x1B76, 0x1B7D, 0x1B83, 0x1B89, 0x1B8F, 0x1B95, 0x1B9C, 0x1BA2, 0x1BA8, 0x1BAE, 0x1BB4, 0x1BBA, 0x1BC1, 0x1BC7, 0x1BCD, 0x1BD3, 0x1BD9, 0x1BDF, 0x1BE5, 0x1BEB, 0x1BF2, 0x1BF8, 0x1BFE, 0x1C04, 0x1C0A, 0x1C10, 0x1C16, 0x1C1C, 0x1C22, 0x1C28, 0x1C2E, 0x1C34, 0x1C3A, 0x1C40, 0x1C46, 0x1C4C, 0x1C52, 0x1C58, 0x1C5E, 0x1C64, 0x1C6A, 0x1C70, 0x1C76, 0x1C7C, 0x1C82, 0x1C88, 0x1C8E, 0x1C94, 0x1C9A, 0x1CA0, 0x1CA6, 0x1CAC, 0x1CB2, 0x1CB8, 0x1CBE, 0x1CC3, 0x1CC9, 0x1CCF, 0x1CD5, 0x1CDB, 0x1CE1, 0x1CE7, 0x1CED, 0x1CF3, 0x1CF8, 0x1CFE, 0x1D04, 0x1D0A, 0x1D10, 0x1D16, 0x1D1B, 0x1D21, 0x1D27, 0x1D2D, 0x1D33, 0x1D38, 0x1D3E, 0x1D44, 0x1D4A, 0x1D4F, 0x1D55, 0x1D5B, 0x1D61, 0x1D66, 0x1D6C, 0x1D72, 0x1D78, 0x1D7D, 0x1D83, 0x1D89, 0x1D8E, 0x1D94, 0x1D9A, 0x1DA0, 0x1DA5, 0x1DAB, 0x1DB1, 0x1DB6, 0x1DBC, 0x1DC2, 0x1DC7, 0x1DCD, 0x1DD3, 0x1DD8, 0x1DDE, 0x1DE3, 0x1DE9, 0x1DEF, 0x1DF4, 0x1DFA, 0x1DFF, 0x1E05, 0x1E0B, 0x1E10, 0x1E16, 0x1E1B, 0x1E21, 0x1E26, 0x1E2C, 0x1E32, 0x1E37, 0x1E3D, 0x1E42, 0x1E48, 0x1E4D, 0x1E53, 0x1E58, 0x1E5E, 0x1E63, 0x1E69, 0x1E6E, 0x1E74, 0x1E79, 0x1E7F, 0x1E84, 0x1E8A, 0x1E8F, 0x1E94, 0x1E9A, 0x1E9F, 0x1EA5, 0x1EAA, 0x1EB0, 0x1EB5, 0x1EBA, 0x1EC0, 0x1EC5, 0x1ECB, 0x1ED0, 0x1ED5, 0x1EDB, 0x1EE0, 0x1EE6, 0x1EEB, 0x1EF0, 0x1EF6, 0x1EFB, 0x1F00, 0x1F06, 0x1F0B, 0x1F10, 0x1F16, 0x1F1B, 0x1F20, 0x1F26, 0x1F2B, 0x1F30, 0x1F36, 0x1F3B, 0x1F40, 0x1F45, 0x1F4B, 0x1F50, 0x1F55, 0x1F5A, 0x1F60, 0x1F65, 0x1F6A, 0x1F6F, 0x1F75, 0x1F7A, 0x1F7F, 0x1F84, 0x1F8A, 0x1F8F, 0x1F94, 0x1F99, 0x1F9E, 0x1FA4, 0x1FA9, 0x1FAE, 0x1FB3, 0x1FB8, 0x1FBD, 0x1FC3, 0x1FC8, 0x1FCD, 0x1FD2, 0x1FD7, 0x1FDC, 0x1FE1, 0x1FE6, 0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000 diff --git a/lib/asm/exception.s b/lib/asm/exception.s index 44eb877d..7d673408 100644 --- a/lib/asm/exception.s +++ b/lib/asm/exception.s @@ -15,4 +15,4 @@ .include "lib/asm/exception/__osEnqueueThread.s" .include "lib/asm/exception/__osPopThread.s" .include "lib/asm/exception/__osDispatchThread.s" -.include "lib/asm/exception/D_800D35A0.s" +.include "lib/asm/exception/__osCleanupThread.s" diff --git a/lib/asm/exception/D_800D35A0.s b/lib/asm/exception/__osCleanupThread.s similarity index 87% rename from lib/asm/exception/D_800D35A0.s rename to lib/asm/exception/__osCleanupThread.s index d8efce4c..686faede 100644 --- a/lib/asm/exception/D_800D35A0.s +++ b/lib/asm/exception/__osCleanupThread.s @@ -1,4 +1,4 @@ -glabel D_800D35A0 +glabel __osCleanupThread /* 0D41A0 800D35A0 0C035980 */ jal osDestroyThread /* 0D41A4 800D35A4 00002025 */ move $a0, $zero /* 0D41A8 800D35A8 00000000 */ nop diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index f450ae5e..37ff8f82 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -85,8 +85,19 @@ s16 D_800DD3F4[8] = { 255, -1, 20, -1 }; s32 D_800DD404 = 12; -s32 D_800DD408 = 0x00FFFFFF; -s32 D_800DD40C = 0x001EFFFF; // Unused? + +typedef struct unknown800DD408 { + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u16 unk4; + u16 unk6; +} unknown800DD408; + +unknown800DD408 D_800DD408 = { + 0, 255, 255, 255, 30, 0xFFFF +}; // Unused? char *D_800DD410[3] = { diff --git a/tools/python/generate_assets.py b/tools/python/generate_assets.py index bd85b7a2..b5776522 100644 --- a/tools/python/generate_assets.py +++ b/tools/python/generate_assets.py @@ -108,19 +108,27 @@ class GenerateAssets: # TODO: Will probably need to refactor this later. def generate_ucode_files(self): assetsUCodeText = '# This file was generated by generate_ld.py\n\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_unknown.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_boot.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_f3ddkr_dram.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_f3ddkr_fifo.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_f3ddkr_xbus.bin"\n' - assetsUCodeText += '.incbin "' + self.BUILD_DIR + '/ucode/ucode_unknown_2.bin"\n' + assetsUCodeText += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsUCodeText += self.generate_ucode_file('rspUnknownStart', 'ucode/ucode_unknown.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRBootStart', 'ucode/ucode_boot.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRDramStart', 'ucode/ucode_f3ddkr_dram.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRFifoStart', 'ucode/ucode_f3ddkr_fifo.bin') + assetsUCodeText += self.generate_ucode_file('rspF3DDKRXbusStart', 'ucode/ucode_f3ddkr_xbus.bin') + assetsUCodeText += self.generate_ucode_file('rspUnknown2Start', 'ucode/ucode_unknown_2.bin') with open(self.UCODE_TEXT_FILENAME, "w") as assetsFile: assetsFile.write(assetsUCodeText) assetsUCodeData = '# This file was generated by generate_ld.py\n\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_f3ddkr_dram.bin"\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_f3ddkr_fifo.bin"\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_f3ddkr_xbus.bin"\n' - assetsUCodeData += '.incbin "' + self.BUILD_DIR + '/ucode/data_unknown.bin"\n' + assetsUCodeData += '.include "globals.inc"\n.include "macros.inc"\n\n' + assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataDramStart', 'ucode/data_f3ddkr_dram.bin') + assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataFifoStart', 'ucode/data_f3ddkr_fifo.bin') + assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataXbusStart', 'ucode/data_f3ddkr_xbus.bin') + assetsUCodeData += self.generate_ucode_file('rspUnknownDataStart', 'ucode/data_unknown.bin') + with open(self.UCODE_DATA_FILENAME, "w") as assetsFile: assetsFile.write(assetsUCodeData) + + def generate_ucode_file(self, label, path): + return 'glabel ' + label + '\n.incbin "' + self.BUILD_DIR + '/' + path + '"\n' + + diff --git a/undefined_syms.txt b/undefined_syms.txt index e4bb112a..ada2c3ae 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -9,6 +9,7 @@ D_00FF0018 = 0x00FF0018; D_3B9A0001 = 0x3B9A0001; D_46FF9630 = 0x46FF9630; D_57410001 = 0x57410001; + D_80000004 = 0x80000004; D_80000008 = 0x80000008; D_8000000C = 0x8000000C; @@ -21,24 +22,6 @@ osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -D_80065D40 = 0x80065D40; -__osCleanupThread = 0x800D35A0; -D_800D7600 = 0x800D7600; -D_800D84C0 = 0x800D84C0; -D_800D8590 = 0x800D8590; -D_800D9790 = 0x800D9790; -D_800DA970 = 0x800DA970; -D_800DD407 = 0x800DD407; -D_800DDC3E = 0x800DDC3E; -D_800DF598 = 0x800DF598; -D_800DF763 = 0x800DF763; -D_800DF7C6 = 0x800DF7C6; -D_800DF7C8 = 0x800DF7C8; -D_800DF7CA = 0x800DF7CA; -D_800DF7DA = 0x800DF7DA; -D_800DF7E4 = 0x800DF7E4; -D_800DF7EC = 0x800DF7EC; -D_800DF7F4 = 0x800DF7F4; D_800DFA14 = 0x800DFA14; D_800DFA48 = 0x800DFA48; D_800DFDB5 = 0x800DFDB5; @@ -381,8 +364,6 @@ D_800E8EF0 = 0x800E8EF0; D_800E8EFC = 0x800E8EFC; D_800E95FC = 0x800E95FC; -D_800EA3A0 = 0x800EA3A0; -D_800EABA0 = 0x800EABA0; D_800EBF60 = 0x800EBF60; gALHeap = 0x80115CE8; ALSeqFile_80115CF8 = 0x80115CF8; @@ -1501,6 +1482,7 @@ D_8012D230 = 0x8012D230; D_8012D240 = 0x8012D240; D_8012D3F0 = 0x8012D3F0; D_8012FFFF = 0x8012FFFF; + D_A0000200 = 0xA0000200; D_A0000284 = 0xA0000284; SP_IMEM = 0xA4001000; @@ -1538,8 +1520,10 @@ D_A4800004 = 0xA4800004; D_A4800010 = 0xA4800010; D_A4800018 = 0xA4800018; D_A5000508 = 0xA5000508; + D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; + D_FF7F0001 = 0xFF7F0001; D_FFFDFFFB = 0xFFFDFFFB; D_FFFF0028 = 0xFFFF0028; \ No newline at end of file From 06332f2f16b157bcb06d7c9a8ca0b0a0809b479e Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 16:58:05 -0500 Subject: [PATCH 22/39] Even more progress with undefined_syms --- .../unknown_032760/func_80039330.s | 4 ++-- .../unknown_080500/MenuOptionsLoop.s | 8 +++---- .../unknown_080500/func_8007F900.s | 20 ++++++++-------- .../unknown_080500/func_80084854.s | 8 +++---- .../unknown_080500/func_8008C168.s | 20 ++++++++-------- .../unknown_080500/func_80094A5C.s | 24 +++++++++---------- .../unknown_080500/func_80094D28.s | 4 ++-- .../unknown_080500/func_80098EBC.s | 4 ++-- src/unknown_080500.c | 22 ++++++++--------- tools/python/undefined_sym_fix.py | 18 ++++++++++++++ undefined_syms.txt | 19 +-------------- 11 files changed, 76 insertions(+), 75 deletions(-) create mode 100644 tools/python/undefined_sym_fix.py diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index a44839ef..9e814259 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -721,7 +721,7 @@ glabel L80039BB8 /* 03A940 80039D40 818D01D6 */ lb $t5, 0x1d6($t4) /* 03A944 80039D44 2408000F */ li $t0, 15 /* 03A948 80039D48 11A20011 */ beq $t5, $v0, .L80039D90 -/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(D_800E0235) # $a0, 0x800e +/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(D_800E0198+157) # $a0, 0x800e /* 03A950 80039D50 344E0080 */ ori $t6, $v0, 0x80 /* 03A954 80039D54 44804000 */ mtc1 $zero, $f8 /* 03A958 80039D58 A06E0000 */ sb $t6, ($v1) @@ -732,7 +732,7 @@ glabel L80039BB8 /* 03A96C 80039D6C 24050001 */ li $a1, 1 /* 03A970 80039D70 830401D6 */ lb $a0, 0x1d6($t8) /* 03A974 80039D74 00000000 */ nop -/* 03A978 80039D78 24840235 */ addiu $a0, %lo(D_800E0235) # addiu $a0, $a0, 0x235 +/* 03A978 80039D78 24840235 */ addiu $a0, %lo(D_800E0198+157) # addiu $a0, $a0, 0x235 /* 03A97C 80039D7C 3099FFFF */ andi $t9, $a0, 0xffff /* 03A980 80039D80 0C00EB0F */ jal func_8003AC3C /* 03A984 80039D84 03202025 */ move $a0, $t9 diff --git a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s index 4128349a..a71c4304 100644 --- a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s @@ -163,10 +163,10 @@ glabel MenuOptionsLoop /* 0851B4 800845B4 00002025 */ move $a0, $zero /* 0851B8 800845B8 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e /* 0851BC 800845BC 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) -/* 0851C0 800845C0 3C01800E */ lui $at, %hi(D_800DFA14) # $at, 0x800e +/* 0851C0 800845C0 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e /* 0851C4 800845C4 8D6A02DC */ lw $t2, 0x2dc($t3) /* 0851C8 800845C8 1000000E */ b .L80084604 -/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(D_800DFA14)($at) +/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(D_800DFA10+4)($at) .L800845D0: /* 0851D0 800845D0 0C000741 */ jal func_80001D04 /* 0851D4 800845D4 00002825 */ move $a1, $zero @@ -177,10 +177,10 @@ glabel MenuOptionsLoop /* 0851E8 800845E8 24040001 */ li $a0, 1 /* 0851EC 800845EC 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e /* 0851F0 800845F0 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) -/* 0851F4 800845F4 3C01800E */ lui $at, %hi(D_800DFA14) # $at, 0x800e +/* 0851F4 800845F4 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e /* 0851F8 800845F8 8D8D02D8 */ lw $t5, 0x2d8($t4) /* 0851FC 800845FC 00000000 */ nop -/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA14)($at) +/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA10+4)($at) .L80084604: /* 085204 80084604 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e /* 085208 80084608 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8007F900.s b/asm/non_matchings/unknown_080500/func_8007F900.s index 81e424e6..8d6f187b 100644 --- a/asm/non_matchings/unknown_080500/func_8007F900.s +++ b/asm/non_matchings/unknown_080500/func_8007F900.s @@ -395,25 +395,25 @@ glabel func_8007F900 /* 080AF0 8007FEF0 24A5FFD8 */ addiu $a1, %lo(D_800DFFD8) # addiu $a1, $a1, -0x28 /* 080AF4 8007FEF4 AC6C0004 */ sw $t4, 4($v1) /* 080AF8 8007FEF8 8C8E0288 */ lw $t6, 0x288($a0) -/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(D_800E002C) # $at, 0x800e +/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(D_800DFFD8+84) # $at, 0x800e /* 080B00 8007FF00 AC6E0008 */ sw $t6, 8($v1) /* 080B04 8007FF04 8C8D0260 */ lw $t5, 0x260($a0) /* 080B08 8007FF08 2482000C */ addiu $v0, $a0, 0xc /* 080B0C 8007FF0C ACAD0014 */ sw $t5, 0x14($a1) /* 080B10 8007FF10 8C8F0260 */ lw $t7, 0x260($a0) -/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(D_800E0038) # $v1, 0x800e +/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(D_800DFFD8+96) # $v1, 0x800e /* 080B18 8007FF18 ACAF0034 */ sw $t7, 0x34($a1) /* 080B1C 8007FF1C 8C980298 */ lw $t8, 0x298($a0) -/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(D_800E0038) # addiu $v1, $v1, 0x38 -/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(D_800E002C)($at) +/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(D_800DFFD8+96) # addiu $v1, $v1, 0x38 +/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(D_800DFFD8+84)($at) /* 080B28 8007FF28 8C99029C */ lw $t9, 0x29c($a0) -/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(D_800E004C) # $at, 0x800e -/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(D_800E004C)($at) +/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(D_800DFFD8+116) # $at, 0x800e +/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(D_800DFFD8+116)($at) /* 080B34 8007FF34 8C8A02A0 */ lw $t2, 0x2a0($a0) -/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(D_800E0138) # $a0, 0x800e -/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(D_800E006C) # $at, 0x800e -/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(D_800E0138) # addiu $a0, $a0, 0x138 -/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(D_800E006C)($at) +/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(D_800DFFD8+352) # $a0, 0x800e +/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(D_800DFFD8+148) # $at, 0x800e +/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(D_800DFFD8+352) # addiu $a0, $a0, 0x138 +/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(D_800DFFD8+148)($at) .L8007FF48: /* 080B48 8007FF48 8C4B0298 */ lw $t3, 0x298($v0) /* 080B4C 8007FF4C 24630080 */ addiu $v1, $v1, 0x80 diff --git a/asm/non_matchings/unknown_080500/func_80084854.s b/asm/non_matchings/unknown_080500/func_80084854.s index 89f6f5a9..6fa2ee02 100644 --- a/asm/non_matchings/unknown_080500/func_80084854.s +++ b/asm/non_matchings/unknown_080500/func_80084854.s @@ -75,12 +75,12 @@ glabel func_80084854 /* 085568 80084968 01CD9823 */ subu $s3, $t6, $t5 .L8008496C: /* 08556C 8008496C 8DEFFAC8 */ lw $t7, %lo(D_800DFAC8)($t7) -/* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA48) # $at, 0x800e +/* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA3C+12) # $at, 0x800e /* 085574 80084974 000FC080 */ sll $t8, $t7, 2 /* 085578 80084978 0338C821 */ addu $t9, $t9, $t8 /* 08557C 8008497C 8F3969D0 */ lw $t9, %lo(D_801269D0)($t9) /* 085580 80084980 0C019FCB */ jal func_80067F2C -/* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA48)($at) +/* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA3C+12)($at) /* 085588 80084988 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 /* 08558C 8008498C 8D080300 */ lw $t0, %lo(osTvType)($t0) /* 085590 80084990 3C11FFC0 */ lui $s1, (0xFFC040FF >> 16) # lui $s1, 0xffc0 @@ -204,7 +204,7 @@ glabel func_80084854 /* 085760 80084B60 00001825 */ move $v1, $zero /* 085764 80084B64 29810005 */ slti $at, $t4, 5 /* 085768 80084B68 10200005 */ beqz $at, .L80084B80 -/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA48) # $t5, 0x800e +/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA3C+12) # $t5, 0x800e /* 085770 80084B70 3C118012 */ lui $s1, %hi(D_80126C46) # $s1, 0x8012 /* 085774 80084B74 86316C46 */ lh $s1, %lo(D_80126C46)($s1) /* 085778 80084B78 1000000E */ b .L80084BB4 @@ -225,7 +225,7 @@ glabel func_80084854 /* 0857AC 80084BAC 10000001 */ b .L80084BB4 /* 0857B0 80084BB0 24110006 */ li $s1, 6 .L80084BB4: -/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(D_800DFA48)($t5) +/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(D_800DFA3C+12)($t5) /* 0857B8 80084BB8 00037100 */ sll $t6, $v1, 4 /* 0857BC 80084BBC 11A00026 */ beqz $t5, .L80084C58 /* 0857C0 80084BC0 3C0F800E */ lui $t7, %hi(D_800DFA3C) # $t7, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8008C168.s b/asm/non_matchings/unknown_080500/func_8008C168.s index 243201a2..ec55cfb5 100644 --- a/asm/non_matchings/unknown_080500/func_8008C168.s +++ b/asm/non_matchings/unknown_080500/func_8008C168.s @@ -22,10 +22,10 @@ glabel func_8008C168 /* 08CDB8 8008C1B8 0C000445 */ jal func_80001114 /* 08CDBC 8008C1BC 00000000 */ nop /* 08CDC0 8008C1C0 82080000 */ lb $t0, ($s0) -/* 08CDC4 8008C1C4 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CDC4 8008C1C4 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CDC8 8008C1C8 00084840 */ sll $t1, $t0, 1 /* 08CDCC 8008C1CC 00892021 */ addu $a0, $a0, $t1 -/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CDD4 8008C1D4 0C000445 */ jal func_80001114 /* 08CDD8 8008C1D8 00000000 */ nop /* 08CDDC 8008C1DC 3C058012 */ lui $a1, %hi(D_801263C0) # $a1, 0x8012 @@ -57,10 +57,10 @@ glabel func_8008C168 /* 08CE3C 8008C23C 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CE40 8008C240 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CE44 8008C244 806E0000 */ lb $t6, ($v1) -/* 08CE48 8008C248 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CE48 8008C248 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CE4C 8008C24C 000E7840 */ sll $t7, $t6, 1 /* 08CE50 8008C250 008F2021 */ addu $a0, $a0, $t7 -/* 08CE54 8008C254 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CE54 8008C254 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CE58 8008C258 0C00045C */ jal func_80001170 /* 08CE5C 8008C25C 00000000 */ nop .L8008C260: @@ -92,10 +92,10 @@ glabel func_8008C168 /* 08CEC0 8008C2C0 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CEC4 8008C2C4 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CEC8 8008C2C8 806C0000 */ lb $t4, ($v1) -/* 08CECC 8008C2CC 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CECC 8008C2CC 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CED0 8008C2D0 000C6840 */ sll $t5, $t4, 1 /* 08CED4 8008C2D4 008D2021 */ addu $a0, $a0, $t5 -/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CEDC 8008C2DC 90650003 */ lbu $a1, 3($v1) /* 08CEE0 8008C2E0 0C00049A */ jal func_80001268 /* 08CEE4 8008C2E4 00000000 */ nop @@ -122,10 +122,10 @@ glabel func_8008C168 /* 08CF34 8008C334 0C000445 */ jal func_80001114 /* 08CF38 8008C338 00000000 */ nop /* 08CF3C 8008C33C 820A0000 */ lb $t2, ($s0) -/* 08CF40 8008C340 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CF40 8008C340 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CF44 8008C344 000A5840 */ sll $t3, $t2, 1 /* 08CF48 8008C348 008B2021 */ addu $a0, $a0, $t3 -/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CF50 8008C350 0C000445 */ jal func_80001114 /* 08CF54 8008C354 00000000 */ nop /* 08CF58 8008C358 1000000E */ b .L8008C394 @@ -136,10 +136,10 @@ glabel func_8008C168 /* 08CF68 8008C368 0C00049A */ jal func_80001268 /* 08CF6C 8008C36C 306500FF */ andi $a1, $v1, 0xff /* 08CF70 8008C370 820D0000 */ lb $t5, ($s0) -/* 08CF74 8008C374 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CF74 8008C374 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CF78 8008C378 000D7840 */ sll $t7, $t5, 1 /* 08CF7C 8008C37C 008F2021 */ addu $a0, $a0, $t7 -/* 08CF80 8008C380 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CF80 8008C380 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CF84 8008C384 92050003 */ lbu $a1, 3($s0) /* 08CF88 8008C388 0C00049A */ jal func_80001268 /* 08CF8C 8008C38C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80094A5C.s b/asm/non_matchings/unknown_080500/func_80094A5C.s index 2156883e..31f49e00 100644 --- a/asm/non_matchings/unknown_080500/func_80094A5C.s +++ b/asm/non_matchings/unknown_080500/func_80094A5C.s @@ -36,16 +36,16 @@ glabel func_80094A5C /* 0956E0 80094AE0 000B6080 */ sll $t4, $t3, 2 /* 0956E4 80094AE4 00AC6821 */ addu $t5, $a1, $t4 /* 0956E8 80094AE8 8DAE0000 */ lw $t6, ($t5) -/* 0956EC 80094AEC 3C01800E */ lui $at, %hi(D_800E0C00) # $at, 0x800e +/* 0956EC 80094AEC 3C01800E */ lui $at, %hi(D_800E0BEC+20) # $at, 0x800e /* 0956F0 80094AF0 AFA2001C */ sw $v0, 0x1c($sp) /* 0956F4 80094AF4 0C003932 */ jal func_8000E4C8 -/* 0956F8 80094AF8 AC2E0C00 */ sw $t6, %lo(D_800E0C00)($at) +/* 0956F8 80094AF8 AC2E0C00 */ sw $t6, %lo(D_800E0BEC+20)($at) /* 0956FC 80094AFC 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e /* 095700 80094B00 8FA9001C */ lw $t1, 0x1c($sp) /* 095704 80094B04 14400034 */ bnez $v0, .L80094BD8 /* 095708 80094B08 24A50AF0 */ addiu $a1, %lo(D_800E0AF0) # addiu $a1, $a1, 0xaf0 -/* 09570C 80094B0C 3C06800E */ lui $a2, %hi(D_800E0DCC) # $a2, 0x800e -/* 095710 80094B10 24C60DCC */ addiu $a2, %lo(D_800E0DCC) # addiu $a2, $a2, 0xdcc +/* 09570C 80094B0C 3C06800E */ lui $a2, %hi(D_800E0CEC+224) # $a2, 0x800e +/* 095710 80094B10 24C60DCC */ addiu $a2, %lo(D_800E0CEC+224) # addiu $a2, $a2, 0xdcc /* 095714 80094B14 00002025 */ move $a0, $zero /* 095718 80094B18 240700C0 */ li $a3, 192 /* 09571C 80094B1C 00001825 */ move $v1, $zero @@ -73,19 +73,19 @@ glabel func_80094A5C /* 095768 80094B68 0C027B20 */ jal is_in_two_player_adventure /* 09576C 80094B6C 00000000 */ nop /* 095770 80094B70 10400019 */ beqz $v0, .L80094BD8 -/* 095774 80094B74 3C0F800E */ lui $t7, %hi(D_800E0D40) # $t7, 0x800e -/* 095778 80094B78 8DEF0D40 */ lw $t7, %lo(D_800E0D40)($t7) -/* 09577C 80094B7C 3C01800E */ lui $at, %hi(D_800E0D20) # $at, 0x800e -/* 095780 80094B80 3C18800E */ lui $t8, %hi(D_800E0D60) # $t8, 0x800e -/* 095784 80094B84 AC2F0D20 */ sw $t7, %lo(D_800E0D20)($at) -/* 095788 80094B88 8F180D60 */ lw $t8, %lo(D_800E0D60)($t8) +/* 095774 80094B74 3C0F800E */ lui $t7, %hi(D_800E0CEC+84) # $t7, 0x800e +/* 095778 80094B78 8DEF0D40 */ lw $t7, %lo(D_800E0CEC+84)($t7) +/* 09577C 80094B7C 3C01800E */ lui $at, %hi(D_800E0CEC+52) # $at, 0x800e +/* 095780 80094B80 3C18800E */ lui $t8, %hi(D_800E0CEC+116) # $t8, 0x800e +/* 095784 80094B84 AC2F0D20 */ sw $t7, %lo(D_800E0CEC+52)($at) +/* 095788 80094B88 8F180D60 */ lw $t8, %lo(D_800E0CEC+116)($t8) /* 09578C 80094B8C 24040002 */ li $a0, 2 /* 095790 80094B90 3C03800E */ lui $v1, %hi(D_800E0CEC) # $v1, 0x800e /* 095794 80094B94 24630CEC */ addiu $v1, %lo(D_800E0CEC) # addiu $v1, $v1, 0xcec -/* 095798 80094B98 3C01800E */ lui $at, %hi(D_800E0D40) # $at, 0x800e +/* 095798 80094B98 3C01800E */ lui $at, %hi(D_800E0CEC+84) # $at, 0x800e /* 09579C 80094B9C 0004C940 */ sll $t9, $a0, 5 /* 0957A0 80094BA0 00791021 */ addu $v0, $v1, $t9 -/* 0957A4 80094BA4 AC380D40 */ sw $t8, %lo(D_800E0D40)($at) +/* 0957A4 80094BA4 AC380D40 */ sw $t8, %lo(D_800E0CEC+84)($at) /* 0957A8 80094BA8 8C4D0094 */ lw $t5, 0x94($v0) /* 0957AC 80094BAC 8C4B00B4 */ lw $t3, 0xb4($v0) /* 0957B0 80094BB0 8C4C0074 */ lw $t4, 0x74($v0) diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 6c4aa5c1..59a489f6 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -241,8 +241,8 @@ glabel L80094FB0 /* 095C7C 8009507C 10000142 */ b .L80095588 /* 095C80 80095080 A04700CE */ sb $a3, 0xce($v0) glabel L80095084 -/* 095C84 80095084 3C06800E */ lui $a2, %hi(D_800E0DCC) # $a2, 0x800e -/* 095C88 80095088 24C60DCC */ addiu $a2, %lo(D_800E0DCC) # addiu $a2, $a2, 0xdcc +/* 095C84 80095084 3C06800E */ lui $a2, %hi(D_800E0CEC+224) # $a2, 0x800e +/* 095C88 80095088 24C60DCC */ addiu $a2, %lo(D_800E0CEC+224) # addiu $a2, $a2, 0xdcc /* 095C8C 8009508C 00002825 */ move $a1, $zero /* 095C90 80095090 24110008 */ li $s1, 8 .L80095094: diff --git a/asm/non_matchings/unknown_080500/func_80098EBC.s b/asm/non_matchings/unknown_080500/func_80098EBC.s index 868619e5..7b2f7b44 100644 --- a/asm/non_matchings/unknown_080500/func_80098EBC.s +++ b/asm/non_matchings/unknown_080500/func_80098EBC.s @@ -19,7 +19,7 @@ glabel func_80098EBC /* 099AFC 80098EFC 00002025 */ move $a0, $zero /* 099B00 80098F00 19200024 */ blez $t1, .L80098F94 /* 099B04 80098F04 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e -/* 099B08 80098F08 3C05800E */ lui $a1, %hi(D_800E1088) # $a1, 0x800e +/* 099B08 80098F08 3C05800E */ lui $a1, %hi(D_800E1048+64) # $a1, 0x800e /* 099B0C 80098F0C 3C0B8012 */ lui $t3, %hi(D_801263E0) # $t3, 0x8012 /* 099B10 80098F10 3C088012 */ lui $t0, %hi(D_80126420) # $t0, 0x8012 /* 099B14 80098F14 3C078012 */ lui $a3, %hi(D_80126418) # $a3, 0x8012 @@ -27,7 +27,7 @@ glabel func_80098EBC /* 099B1C 80098F1C 24E76418 */ addiu $a3, %lo(D_80126418) # addiu $a3, $a3, 0x6418 /* 099B20 80098F20 25086420 */ addiu $t0, %lo(D_80126420) # addiu $t0, $t0, 0x6420 /* 099B24 80098F24 256B63E0 */ addiu $t3, %lo(D_801263E0) # addiu $t3, $t3, 0x63e0 -/* 099B28 80098F28 24A51088 */ addiu $a1, %lo(D_800E1088) # addiu $a1, $a1, 0x1088 +/* 099B28 80098F28 24A51088 */ addiu $a1, %lo(D_800E1048+64) # addiu $a1, $a1, 0x1088 .L80098F2C: /* 099B2C 80098F2C 29410003 */ slti $at, $t2, 3 /* 099B30 80098F30 10200011 */ beqz $at, .L80098F78 diff --git a/src/unknown_080500.c b/src/unknown_080500.c index a2ac0984..36ea430a 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -558,15 +558,16 @@ s16 D_800E0710[16] = { 0x16, 0x17, 0x20, 0x00 }; -s16 D_800E0730[18] = { +s16 D_800E0730[19] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000 + 0x0000, 0x0000, 0x0000 }; -s16 D_800E0758[56] = { - 0x0000, 0x0000, 0xFFFF, 0xFFFF, + +s16 D_800E0758[54] = { + 0xFFFF, 0xFFFF, 0x0129, 0x011A, 0x0120, 0x0115, 0x0126, 0x011D, 0x0130, 0x0121, 0x0117, 0x0154, 0x0128, 0x0119, @@ -697,8 +698,8 @@ s16 D_800E0A40[8] = { unk800DFC10 D_800E0A50 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A60 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A70 = { NULL, 0, 0, NULL, 0 }; -unk800DFC10 D_800E0A90 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A80 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0A90 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AA0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AB0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AC0 = { NULL, 0, 0, NULL, 0 }; @@ -1653,7 +1654,6 @@ void func_800841B8(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") #else -extern s32 D_800DFA14; extern s32 D_8012644C; void func_80084734(void); @@ -1716,12 +1716,12 @@ s32 MenuOptionsLoop(s32 arg0) { func_80001D04(0xEB, 0); func_8009EABC(0, 0x2000000); func_800C2AF4(0); - D_800DFA14 = D_800DF4A0->unk2DC; + D_800DFA10[1] = D_800DF4A0->unk2DC; } else { func_80001D04(0xEB, 0); func_8009EA78(0, 0x2000000); func_800C2AF4(1); - D_800DFA14 = D_800DF4A0->unk2D8; + D_800DFA10[1] = D_800DF4A0->unk2D8; } } else { // Move up & down the list @@ -3575,9 +3575,9 @@ void func_80098EBC(s32 arg0) { fade = (test >> 1) + 0x80; } - D_800E1088[i][0].filterRed = fade; - D_800E1088[i][0].filterGreen = fade; - D_800E1088[i][0].filterBlue = fade; + D_800E1048+64[i][0].filterRed = fade; + D_800E1048+64[i][0].filterGreen = fade; + D_800E1048+64[i][0].filterBlue = fade; } if (D_801263E0 == 2 || D_801263E0 == 3) { diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py new file mode 100644 index 00000000..1bac3917 --- /dev/null +++ b/tools/python/undefined_sym_fix.py @@ -0,0 +1,18 @@ +import subprocess +import sys +import argparse + +parser = argparse.ArgumentParser(description="") +parser.add_argument("baseLabel", help="Base label") +parser.add_argument("badLabel", help="Bad label") +args = parser.parse_args() + +baseAddress = int(args.baseLabel[-8:], 16) +badAddress = int(args.badLabel[-8:], 16) + +if baseAddress >= badAddress: + raise Exception('baseLabel should be smaller! base = ' + hex(baseAddress) + ', bad = ' + hex(badAddress)) + +newLabel = args.baseLabel + '+' + str(badAddress-baseAddress) + +subprocess.run(['./rename_sym.sh', args.badLabel, newLabel]) diff --git a/undefined_syms.txt b/undefined_syms.txt index ada2c3ae..c5d6acd5 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -22,25 +22,8 @@ osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -D_800DFA14 = 0x800DFA14; -D_800DFA48 = 0x800DFA48; -D_800DFDB5 = 0x800DFDB5; D_800E0001 = 0x800E0001; -D_800E002C = 0x800E002C; -D_800E0038 = 0x800E0038; -D_800E004C = 0x800E004C; -D_800E006C = 0x800E006C; -D_800E0138 = 0x800E0138; -D_800E0235 = 0x800E0235; -D_800E0758 = 0x800E0758; -D_800E0A80 = 0x800E0A80; -D_800E0A90 = 0x800E0A90; -D_800E0C00 = 0x800E0C00; -D_800E0D20 = 0x800E0D20; -D_800E0D40 = 0x800E0D40; -D_800E0D60 = 0x800E0D60; -D_800E0DCC = 0x800E0DCC; -D_800E1088 = 0x800E1088; + D_800E1B58 = 0x800E1B58; D_800E1DA8 = 0x800E1DA8; D_800E1DB0 = 0x800E1DB0; From 2bd4d04ac6d2d9c0717f7cc86fccc0b45ff84b7b Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 17:24:04 -0500 Subject: [PATCH 23/39] Pushing current progress on undefined_syms --- asm/non_matchings/unknown_080500/MenuCreditsLoop.s | 8 ++++---- asm/non_matchings/unknown_080500/func_8007FFEC.s | 8 ++++---- asm/non_matchings/unknown_09F8F0/func_800A0BD4.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800AD144.s | 8 ++++---- src/unknown_09F8F0.c | 6 +++--- undefined_syms.txt | 8 +------- 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index de982047..aff15d94 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -266,12 +266,12 @@ glabel MenuCreditsLoop /* 09C2EC 8009B6EC 14410005 */ bne $v0, $at, .L8009B704 /* 09C2F0 8009B6F0 2418FF60 */ li $t8, -160 /* 09C2F4 8009B6F4 240F00A0 */ li $t7, 160 -/* 09C2F8 8009B6F8 3C01800E */ lui $at, %hi(D_800E1B58) # $at, 0x800e +/* 09C2F8 8009B6F8 3C01800E */ lui $at, %hi(D_800E1B50+8) # $at, 0x800e /* 09C2FC 8009B6FC 10000003 */ b .L8009B70C -/* 09C300 8009B700 A42F1B58 */ sh $t7, %lo(D_800E1B58)($at) +/* 09C300 8009B700 A42F1B58 */ sh $t7, %lo(D_800E1B50+8)($at) .L8009B704: -/* 09C304 8009B704 3C01800E */ lui $at, %hi(D_800E1B58) # $at, 0x800e -/* 09C308 8009B708 A4381B58 */ sh $t8, %lo(D_800E1B58)($at) +/* 09C304 8009B704 3C01800E */ lui $at, %hi(D_800E1B50+8) # $at, 0x800e +/* 09C308 8009B708 A4381B58 */ sh $t8, %lo(D_800E1B50+8)($at) .L8009B70C: /* 09C30C 8009B70C 0205082A */ slt $at, $s0, $a1 /* 09C310 8009B710 10200042 */ beqz $at, .L8009B81C diff --git a/asm/non_matchings/unknown_080500/func_8007FFEC.s b/asm/non_matchings/unknown_080500/func_8007FFEC.s index 1236f4d8..533cb222 100644 --- a/asm/non_matchings/unknown_080500/func_8007FFEC.s +++ b/asm/non_matchings/unknown_080500/func_8007FFEC.s @@ -39,9 +39,9 @@ glabel func_8007FFEC /* 080C7C 8008007C 3C07800E */ lui $a3, %hi(D_800E1DAC) # $a3, 0x800e /* 080C80 80080080 24E71DAC */ addiu $a3, %lo(D_800E1DAC) # addiu $a3, $a3, 0x1dac /* 080C84 80080084 ACE20000 */ sw $v0, ($a3) -/* 080C88 80080088 3C01800E */ lui $at, %hi(D_800E1DB0) # $at, 0x800e +/* 080C88 80080088 3C01800E */ lui $at, %hi(D_800E1DAC+4) # $at, 0x800e /* 080C8C 8008008C 0043C021 */ addu $t8, $v0, $v1 -/* 080C90 80080090 AC381DB0 */ sw $t8, %lo(D_800E1DB0)($at) +/* 080C90 80080090 AC381DB0 */ sw $t8, %lo(D_800E1DAC+4)($at) /* 080C94 80080094 8CF90004 */ lw $t9, 4($a3) /* 080C98 80080098 3C068012 */ lui $a2, %hi(D_80126C2C) # $a2, 0x8012 /* 080C9C 8008009C 3C018012 */ lui $at, %hi(D_80126C2C) # $at, 0x8012 @@ -51,7 +51,7 @@ glabel func_8007FFEC /* 080CAC 800800AC 8FAC0028 */ lw $t4, 0x28($sp) /* 080CB0 800800B0 8CCF0000 */ lw $t7, ($a2) /* 080CB4 800800B4 3C08800E */ lui $t0, %hi(D_800E1DA4) # $t0, 0x800e -/* 080CB8 800800B8 3C01800E */ lui $at, %hi(D_800E1DA8) # $at, 0x800e +/* 080CB8 800800B8 3C01800E */ lui $at, %hi(D_800E1DA4+4) # $at, 0x800e /* 080CBC 800800BC 01ECC021 */ addu $t8, $t7, $t4 /* 080CC0 800800C0 25081DA4 */ addiu $t0, %lo(D_800E1DA4) # addiu $t0, $t0, 0x1da4 /* 080CC4 800800C4 AC381DA4 */ sw $t8, %lo(D_800E1DA4)($at) @@ -59,7 +59,7 @@ glabel func_8007FFEC /* 080CCC 800800CC 8D190000 */ lw $t9, ($t0) /* 080CD0 800800D0 2409000A */ li $t1, 10 /* 080CD4 800800D4 032D7021 */ addu $t6, $t9, $t5 -/* 080CD8 800800D8 AC2E1DA8 */ sw $t6, %lo(D_800E1DA8)($at) +/* 080CD8 800800D8 AC2E1DA8 */ sw $t6, %lo(D_800E1DA4+4)($at) /* 080CDC 800800DC 00005025 */ move $t2, $zero /* 080CE0 800800E0 00002825 */ move $a1, $zero /* 080CE4 800800E4 1A0000C8 */ blez $s0, .L80080408 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s b/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s index c3720905..8766de8f 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s @@ -97,10 +97,10 @@ glabel func_800A0BD4 /* 0A1930 800A0D30 3C038012 */ lui $v1, %hi(D_80126D70) # $v1, 0x8012 /* 0A1934 800A0D34 24636D70 */ addiu $v1, %lo(D_80126D70) # addiu $v1, $v1, 0x6d70 /* 0A1938 800A0D38 906B0000 */ lbu $t3, ($v1) -/* 0A193C 800A0D3C 3C0C800E */ lui $t4, %hi(D_800E2772) # $t4, 0x800e +/* 0A193C 800A0D3C 3C0C800E */ lui $t4, %hi(D_800E2770+2) # $t4, 0x800e /* 0A1940 800A0D40 11600018 */ beqz $t3, .L800A0DA4 /* 0A1944 800A0D44 8FBF002C */ lw $ra, 0x2c($sp) -/* 0A1948 800A0D48 918C2772 */ lbu $t4, %lo(D_800E2772)($t4) +/* 0A1948 800A0D48 918C2772 */ lbu $t4, %lo(D_800E2770+2)($t4) /* 0A194C 800A0D4C 3C028012 */ lui $v0, %hi(D_80126D37) # $v0, 0x8012 /* 0A1950 800A0D50 15800014 */ bnez $t4, .L800A0DA4 /* 0A1954 800A0D54 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD144.s b/asm/non_matchings/unknown_09F8F0/func_800AD144.s index a5312c28..f6412b9b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD144.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD144.s @@ -34,15 +34,15 @@ glabel func_800AD144 /* 0ADDC4 800AD1C4 00000000 */ nop /* 0ADDC8 800AD1C8 3C19800E */ lui $t9, %hi(D_800E291C) # $t9, 0x800e /* 0ADDCC 800AD1CC 8F39291C */ lw $t9, %lo(D_800E291C)($t9) -/* 0ADDD0 800AD1D0 3C01800E */ lui $at, %hi(D_800E2C38) # $at, 0x800e -/* 0ADDD4 800AD1D4 AC222C38 */ sw $v0, %lo(D_800E2C38)($at) +/* 0ADDD0 800AD1D0 3C01800E */ lui $at, %hi(D_800E2C2C+12) # $at, 0x800e +/* 0ADDD4 800AD1D4 AC222C38 */ sw $v0, %lo(D_800E2C2C+12)($at) /* 0ADDD8 800AD1D8 8F240004 */ lw $a0, 4($t9) /* 0ADDDC 800AD1DC 0C01EB9D */ jal func_8007AE74 /* 0ADDE0 800AD1E0 00000000 */ nop /* 0ADDE4 800AD1E4 3C08800E */ lui $t0, %hi(D_800E291C) # $t0, 0x800e /* 0ADDE8 800AD1E8 8D08291C */ lw $t0, %lo(D_800E291C)($t0) -/* 0ADDEC 800AD1EC 3C01800E */ lui $at, %hi(D_800E2C50) # $at, 0x800e -/* 0ADDF0 800AD1F0 AC222C50 */ sw $v0, %lo(D_800E2C50)($at) +/* 0ADDEC 800AD1EC 3C01800E */ lui $at, %hi(D_800E2C2C+36) # $at, 0x800e +/* 0ADDF0 800AD1F0 AC222C50 */ sw $v0, %lo(D_800E2C2C+36)($at) /* 0ADDF4 800AD1F4 8D04000C */ lw $a0, 0xc($t0) /* 0ADDF8 800AD1F8 0C01F04B */ jal func_8007C12C /* 0ADDFC 800AD1FC 00002825 */ move $a1, $zero diff --git a/src/unknown_09F8F0.c b/src/unknown_09F8F0.c index 416ec7a0..6331d4d9 100644 --- a/src/unknown_09F8F0.c +++ b/src/unknown_09F8F0.c @@ -134,9 +134,9 @@ u16 D_800E2684[118] = { }; // This is probably not right. -s32 D_800E2770[8] = { - 0x00FD0000, 0x00000000, 0x00000000, 0x00000000, - 0x00FF0000, 0x00000000, 0x00000000, 0x00000000 +u8 D_800E2770[32] = { + 0, 0xFD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; s8 D_800E2790 = 1; diff --git a/undefined_syms.txt b/undefined_syms.txt index c5d6acd5..c017ac34 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -23,14 +23,8 @@ osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; - -D_800E1B58 = 0x800E1B58; -D_800E1DA8 = 0x800E1DA8; -D_800E1DB0 = 0x800E1DB0; -D_800E2772 = 0x800E2772; -D_800E2C38 = 0x800E2C38; -D_800E2C50 = 0x800E2C50; eqpower = 0x800E37A0; + D_800E4810 = 0x800E4810; D_800E4878 = 0x800E4878; __RunQueue = 0x800E4888; From 31f24eef2310dbb4a4c7c4c84c8a5c2e4b6d10ba Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 20:07:47 -0500 Subject: [PATCH 24/39] About to do something dumb, so I'm commiting this now. --- .../unknown_0C91A0/func_800C8600.s | 8 +-- .../non_matchings/unknown_0D3160/__osViInit.s | 20 +++---- lib/src/unknown_0D29F0.c | 2 +- lib/src/unknown_0D6C90.c | 2 +- tools/python/undefined_sym_fix.py | 59 +++++++++++++++---- undefined_syms.txt | 4 -- 6 files changed, 65 insertions(+), 30 deletions(-) diff --git a/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s b/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s index 0f24a487..6af16037 100644 --- a/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s +++ b/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s @@ -1,6 +1,6 @@ glabel func_800C8600 -/* 0C9200 800C8600 3C0E800E */ lui $t6, %hi(D_800E4878) # $t6, 0x800e -/* 0C9204 800C8604 8DCE4878 */ lw $t6, %lo(D_800E4878)($t6) +/* 0C9200 800C8600 3C0E800E */ lui $t6, %hi(osViClock) # $t6, 0x800e +/* 0C9204 800C8604 8DCE4878 */ lw $t6, %lo(osViClock)($t6) /* 0C9208 800C8608 44844000 */ mtc1 $a0, $f8 /* 0C920C 800C860C 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 0C9210 800C8610 448E2000 */ mtc1 $t6, $f4 @@ -78,8 +78,8 @@ glabel func_800C8600 /* 0C9318 800C8718 240B0001 */ li $t3, 1 /* 0C931C 800C871C 3C0CA450 */ lui $t4, %hi(D_A4500008) # $t4, 0xa450 /* 0C9320 800C8720 AD8B0008 */ sw $t3, %lo(D_A4500008)($t4) -/* 0C9324 800C8724 3C0D800E */ lui $t5, %hi(D_800E4878) # $t5, 0x800e -/* 0C9328 800C8728 8DAD4878 */ lw $t5, %lo(D_800E4878)($t5) +/* 0C9324 800C8724 3C0D800E */ lui $t5, %hi(osViClock) # $t5, 0x800e +/* 0C9328 800C8728 8DAD4878 */ lw $t5, %lo(osViClock)($t5) /* 0C932C 800C872C 01A5001A */ div $zero, $t5, $a1 /* 0C9330 800C8730 00001012 */ mflo $v0 /* 0C9334 800C8734 14A00002 */ bnez $a1, .L800C8740 diff --git a/lib/asm/non_matchings/unknown_0D3160/__osViInit.s b/lib/asm/non_matchings/unknown_0D3160/__osViInit.s index c94f2547..efa5dc4b 100644 --- a/lib/asm/non_matchings/unknown_0D3160/__osViInit.s +++ b/lib/asm/non_matchings/unknown_0D3160/__osViInit.s @@ -1,12 +1,12 @@ glabel __osViInit /* 0D3710 800D2B10 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0D3714 800D2B14 AFBF0014 */ sw $ra, 0x14($sp) -/* 0D3718 800D2B18 3C04800E */ lui $a0, %hi(D_800E4810) # $a0, 0x800e -/* 0D371C 800D2B1C 24844810 */ addiu $a0, %lo(D_800E4810) # addiu $a0, $a0, 0x4810 +/* 0D3718 800D2B18 3C04800E */ lui $a0, %hi(vi) # $a0, 0x800e +/* 0D371C 800D2B1C 24844810 */ addiu $a0, %lo(vi) # addiu $a0, $a0, 0x4810 /* 0D3720 800D2B20 0C034138 */ jal memzero /* 0D3724 800D2B24 24050060 */ li $a1, 96 -/* 0D3728 800D2B28 3C0E800E */ lui $t6, %hi(D_800E4810) # $t6, 0x800e -/* 0D372C 800D2B2C 25CE4810 */ addiu $t6, %lo(D_800E4810) # addiu $t6, $t6, 0x4810 +/* 0D3728 800D2B28 3C0E800E */ lui $t6, %hi(vi) # $t6, 0x800e +/* 0D372C 800D2B2C 25CE4810 */ addiu $t6, %lo(vi) # addiu $t6, $t6, 0x4810 /* 0D3730 800D2B30 3C01800E */ lui $at, %hi(__osViCurr) # $at, 0x800e /* 0D3734 800D2B34 AC2E4870 */ sw $t6, %lo(__osViCurr)($at) /* 0D3738 800D2B38 3C01800E */ lui $at, %hi(__osViNext) # $at, 0x800e @@ -28,10 +28,10 @@ glabel __osViInit /* 0D3778 800D2B78 254A4760 */ addiu $t2, %lo(D_800E4760) # addiu $t2, $t2, 0x4760 /* 0D377C 800D2B7C 3C0C02F5 */ lui $t4, (0x02F5B2D2 >> 16) # lui $t4, 0x2f5 /* 0D3780 800D2B80 358CB2D2 */ ori $t4, (0x02F5B2D2 & 0xFFFF) # ori $t4, $t4, 0xb2d2 -/* 0D3784 800D2B84 3C01800E */ lui $at, %hi(D_800E4878) # $at, 0x800e +/* 0D3784 800D2B84 3C01800E */ lui $at, %hi(osViClock) # $at, 0x800e /* 0D3788 800D2B88 AD6A0008 */ sw $t2, 8($t3) /* 0D378C 800D2B8C 10000019 */ b .L800D2BF4 -/* 0D3790 800D2B90 AC2C4878 */ sw $t4, %lo(D_800E4878)($at) +/* 0D3790 800D2B90 AC2C4878 */ sw $t4, %lo(osViClock)($at) .L800D2B94: /* 0D3794 800D2B94 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 /* 0D3798 800D2B98 8DAD0300 */ lw $t5, %lo(osTvType)($t5) @@ -44,10 +44,10 @@ glabel __osViInit /* 0D37B4 800D2BB4 25EF47B0 */ addiu $t7, %lo(D_800E47B0) # addiu $t7, $t7, 0x47b0 /* 0D37B8 800D2BB8 3C0E02E6 */ lui $t6, (0x02E6025C >> 16) # lui $t6, 0x2e6 /* 0D37BC 800D2BBC 35CE025C */ ori $t6, (0x02E6025C & 0xFFFF) # ori $t6, $t6, 0x25c -/* 0D37C0 800D2BC0 3C01800E */ lui $at, %hi(D_800E4878) # $at, 0x800e +/* 0D37C0 800D2BC0 3C01800E */ lui $at, %hi(osViClock) # $at, 0x800e /* 0D37C4 800D2BC4 AF0F0008 */ sw $t7, 8($t8) /* 0D37C8 800D2BC8 1000000A */ b .L800D2BF4 -/* 0D37CC 800D2BCC AC2E4878 */ sw $t6, %lo(D_800E4878)($at) +/* 0D37CC 800D2BCC AC2E4878 */ sw $t6, %lo(osViClock)($at) .L800D2BD0: /* 0D37D0 800D2BD0 3C08800E */ lui $t0, %hi(__osViNext) # $t0, 0x800e /* 0D37D4 800D2BD4 8D084874 */ lw $t0, %lo(__osViNext)($t0) @@ -55,9 +55,9 @@ glabel __osViInit /* 0D37DC 800D2BDC 27394710 */ addiu $t9, %lo(D_800E4710) # addiu $t9, $t9, 0x4710 /* 0D37E0 800D2BE0 3C0902E6 */ lui $t1, (0x02E6D354 >> 16) # lui $t1, 0x2e6 /* 0D37E4 800D2BE4 3529D354 */ ori $t1, (0x02E6D354 & 0xFFFF) # ori $t1, $t1, 0xd354 -/* 0D37E8 800D2BE8 3C01800E */ lui $at, %hi(D_800E4878) # $at, 0x800e +/* 0D37E8 800D2BE8 3C01800E */ lui $at, %hi(osViClock) # $at, 0x800e /* 0D37EC 800D2BEC AD190008 */ sw $t9, 8($t0) -/* 0D37F0 800D2BF0 AC294878 */ sw $t1, %lo(D_800E4878)($at) +/* 0D37F0 800D2BF0 AC294878 */ sw $t1, %lo(osViClock)($at) .L800D2BF4: /* 0D37F4 800D2BF4 3C0B800E */ lui $t3, %hi(__osViNext) # $t3, 0x800e /* 0D37F8 800D2BF8 8D6B4874 */ lw $t3, %lo(__osViNext)($t3) diff --git a/lib/src/unknown_0D29F0.c b/lib/src/unknown_0D29F0.c index e2f6d64c..90f10c22 100644 --- a/lib/src/unknown_0D29F0.c +++ b/lib/src/unknown_0D29F0.c @@ -25,7 +25,7 @@ typedef struct /* 0x24 */ __OSViScale y; } __OSViContext; -static __OSViContext vi[2] = {0}; +__OSViContext vi[2] = {0}; __OSViContext *__osViCurr = &vi[0]; __OSViContext *__osViNext = &vi[1]; diff --git a/lib/src/unknown_0D6C90.c b/lib/src/unknown_0D6C90.c index 0f3d8d2d..fc00a63e 100644 --- a/lib/src/unknown_0D6C90.c +++ b/lib/src/unknown_0D6C90.c @@ -12,8 +12,8 @@ struct __osThreadTail } __osThreadTail; struct __osThreadTail __osThreadTail = {0, -1}; -OSThread *__osActiveQueue = &__osThreadTail.next; OSThread *__RunQueue = &__osThreadTail.next; +OSThread *__osActiveQueue = &__osThreadTail.next; extern OSThread *__osRunningThread = NULL; extern OSThread *D_800E4894 = NULL; // __osFaultedThread diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py index 1bac3917..7ca2234d 100644 --- a/tools/python/undefined_sym_fix.py +++ b/tools/python/undefined_sym_fix.py @@ -1,18 +1,57 @@ import subprocess import sys +import subprocess import argparse -parser = argparse.ArgumentParser(description="") -parser.add_argument("baseLabel", help="Base label") -parser.add_argument("badLabel", help="Bad label") -args = parser.parse_args() +def fixBadLabel(): + parser = argparse.ArgumentParser(description="") + parser.add_argument("baseLabel", help="Base label") + parser.add_argument("badLabel", help="Bad label") + args = parser.parse_args() -baseAddress = int(args.baseLabel[-8:], 16) -badAddress = int(args.badLabel[-8:], 16) + baseAddress = int(args.baseLabel[-8:], 16) + badAddress = int(args.badLabel[-8:], 16) -if baseAddress >= badAddress: - raise Exception('baseLabel should be smaller! base = ' + hex(baseAddress) + ', bad = ' + hex(badAddress)) + if baseAddress >= badAddress: + raise Exception('baseLabel should be smaller! base = ' + hex(baseAddress) + ', bad = ' + hex(badAddress)) -newLabel = args.baseLabel + '+' + str(badAddress-baseAddress) + newLabel = args.baseLabel + '+' + str(badAddress-baseAddress) + + subprocess.run(['./rename_sym.sh', args.badLabel, newLabel]) + +def load_syms(): + with open('undefined_syms.txt', 'r') as inFile: + return inFile.read().split('\n') + +def save_syms(syms): + with open('undefined_syms.txt', 'w') as outFile: + outFile.write('\n'.join(syms)) + +def check_is_double(symbol, address): + command = subprocess.run(['fgrep', '-ri', symbol], capture_output=True) + outLines = command.stdout.decode("utf-8").split('\n') + for outLine in outLines: + if 'lwc1' in outLine: + newSym = hex(address - 4)[2:].upper() + '+4' + subprocess.run(['./rename_sym.sh', symbol, newSym]) + return True + return False + +def fixDoubleLoads(): + syms = load_syms() + for i in range(0, len(syms)): + sym = syms[i] + if not sym.startswith('D_'): + continue + symSplit = sym.split(' = ') + symbol = symSplit[0] + address = int(symSplit[1][2:-1], 16) + if address >= 0x800E4BFC and address < 0x800E9BA0 and (address & 4 == 4): + if check_is_double(symbol, address): + syms.pop(i) + i -= 1 + save_syms(syms) + +#fixBadLabel() +fixDoubleLoads() -subprocess.run(['./rename_sym.sh', args.badLabel, newLabel]) diff --git a/undefined_syms.txt b/undefined_syms.txt index c017ac34..59ca3a06 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,10 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_800E4810 = 0x800E4810; -D_800E4878 = 0x800E4878; -__RunQueue = 0x800E4888; -__osActiveQueue = 0x800E488C; D_800E4BFC = 0x800E4BFC; D_800E4C0C = 0x800E4C0C; D_800E4C14 = 0x800E4C14; From 8fcd1d03da18c6f2c8fc337bc56c839090b84d5b Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 01:35:32 -0500 Subject: [PATCH 25/39] Cleared data/rodata addresses from undefined_syms. Now it is onto bss! --- .../unknown_005740/func_80005254.s | 36 +- .../unknown_005740/func_80005D08.s | 14 +- .../unknown_005740/func_800063EC.s | 10 +- .../unknown_005740/func_80006BFC.s | 12 +- .../unknown_005740/func_80006FC8.s | 12 +- .../unknown_005740/func_80007FA4.s | 4 +- .../unknown_005740/func_800099EC.s | 4 +- .../unknown_005740/func_80009AB4.s | 4 +- .../unknown_00BC20/func_80011570.s | 12 +- .../unknown_00BC20/func_80013A0C.s | 4 +- .../unknown_00BC20/func_800159C8.s | 32 +- .../unknown_00BC20/func_80016748.s | 8 +- .../unknown_00BC20/func_80017A18.s | 10 +- .../unknown_00BC20/func_800185E4.s | 8 +- .../unknown_00BC20/func_8001955C.s | 4 +- .../unknown_00BC20/func_8001C6C4.s | 8 +- .../unknown_00BC20/func_8001EFA4.s | 2 +- .../unknown_00BC20/func_8001F460.s | 8 +- .../unknown_0255E0/func_8002581C.s | 4 +- .../unknown_0255E0/func_80026070.s | 8 +- .../unknown_0255E0/func_80026430.s | 12 +- .../unknown_0255E0/func_80027568.s | 6 +- .../unknown_0255E0/func_80028FAC.s | 4 +- .../unknown_0255E0/func_8002A5F8.s | 4 +- .../unknown_0255E0/func_8002A900.s | 6 +- .../unknown_0255E0/func_8002DE30.s | 4 +- .../unknown_032760/func_80033F60.s | 12 +- .../unknown_032760/func_80034860.s | 4 +- .../unknown_032760/func_80035260.s | 10 +- .../unknown_032760/func_800361E0.s | 16 +- .../unknown_032760/func_800389B8.s | 4 +- .../unknown_032760/func_80038AD4.s | 4 +- .../unknown_032760/func_80039330.s | 18 +- .../unknown_032760/func_8003B4BC.s | 4 +- .../unknown_032760/func_8003B988.s | 8 +- .../unknown_032760/func_8003CA68.s | 4 +- .../unknown_032760/func_8003D2B8.s | 4 +- .../unknown_032760/func_8003D5A0.s | 8 +- .../unknown_032760/func_8003E140.s | 6 +- .../unknown_032760/func_8003E694.s | 4 +- .../unknown_032760/func_8003EDD8.s | 4 +- .../unknown_032760/func_8003F2E8.s | 4 +- .../unknown_032760/func_800422F0.s | 4 +- .../unknown_043920/func_80042D20.s | 56 ++-- .../unknown_043920/func_8004447C.s | 4 +- .../unknown_043920/func_800452A0.s | 4 +- .../unknown_043920/func_80046524.s | 78 ++--- .../unknown_043920/func_80048C7C.s | 8 +- .../unknown_043920/func_80048E64.s | 4 +- .../unknown_043920/func_800494E0.s | 4 +- .../unknown_043920/func_80049794.s | 60 ++-- .../unknown_043920/func_8004C140.s | 4 +- .../unknown_043920/func_8004C2B0.s | 16 +- .../unknown_043920/func_8004DE38.s | 10 +- .../unknown_043920/func_8004F7F4.s | 28 +- .../unknown_043920/func_80050A28.s | 66 ++-- .../unknown_043920/func_80052B64.s | 4 +- .../unknown_043920/func_80052D7C.s | 38 +-- .../unknown_043920/func_80053478.s | 8 +- .../unknown_043920/func_80053750.s | 12 +- .../unknown_043920/func_80053E9C.s | 4 +- .../unknown_043920/func_80054110.s | 16 +- .../unknown_043920/func_8005492C.s | 32 +- .../unknown_043920/func_80054FD0.s | 6 +- .../unknown_043920/func_80055EC0.s | 2 +- .../unknown_043920/func_80057A40.s | 16 +- .../unknown_043920/func_800581E8.s | 8 +- .../unknown_043920/func_80059208.s | 4 +- .../unknown_043920/func_80059790.s | 4 +- .../unknown_043920/func_80059E40.s | 8 +- .../unknown_043920/func_8005A6F0.s | 18 +- .../unknown_043920/func_8005B818.s | 28 +- .../unknown_05CEF0/func_8005C364.s | 16 +- .../unknown_05DCD0/func_8005D0D0.s | 16 +- .../unknown_05DCD0/func_8005D820.s | 28 +- .../unknown_05F0C0/func_8005E4C0.s | 8 +- .../unknown_05F690/func_8005EA90.s | 24 +- .../unknown_05F690/func_8005F310.s | 10 +- .../unknown_065D30/__timeToSamplesNoRound.s | 4 +- .../unknown_072E50/func_80072578.s | 4 +- .../unknown_072E50/func_80072718.s | 8 +- .../unknown_072E50/func_80074EB8.s | 5 +- .../unknown_072E50/func_80075000.s | 10 +- .../unknown_072E50/func_800753D8.s | 10 +- .../unknown_072E50/func_800756D4.s | 5 +- .../unknown_080500/MenuLogoScreenLoop.s | 12 +- .../unknown_080500/func_8008FA54.s | 4 +- .../unknown_080500/func_800904E8.s | 8 +- .../unknown_09F8F0/func_8009F034.s | 12 +- .../unknown_09F8F0/func_800A14F0.s | 8 +- .../unknown_09F8F0/func_800A1E48.s | 4 +- .../unknown_09F8F0/func_800A277C.s | 4 +- .../unknown_09F8F0/func_800A6254.s | 8 +- .../unknown_09F8F0/func_800A7520.s | 16 +- .../unknown_09F8F0/func_800A8474.s | 16 +- .../unknown_09F8F0/func_800AA600.s | 4 +- .../unknown_0AEE70/func_800B0010.s | 16 +- .../unknown_0AEE70/func_800B03C0.s | 8 +- .../unknown_0AEE70/func_800B1130.s | 8 +- .../unknown_0CA9A0/func_800CB2D4.s | 4 +- src/unknown_001050.c | 2 +- src/unknown_072E50.c | 3 +- src/unknown_0B7A50.c | 9 +- tools/python/generate_ld.py | 12 + tools/python/undefined_sym_fix.py | 25 +- undefined_syms.txt | 313 ------------------ 106 files changed, 632 insertions(+), 920 deletions(-) diff --git a/asm/non_matchings/unknown_005740/func_80005254.s b/asm/non_matchings/unknown_005740/func_80005254.s index 3e248ea7..c6e6aac3 100644 --- a/asm/non_matchings/unknown_005740/func_80005254.s +++ b/asm/non_matchings/unknown_005740/func_80005254.s @@ -85,9 +85,9 @@ glabel func_80005254 /* 005F28 80005328 00000000 */ nop /* 005F2C 8000532C 24100064 */ li $s0, 100 .L80005330: -/* 005F30 80005330 3C01800E */ lui $at, %hi(D_800E4BFC) # $at, 0x800e +/* 005F30 80005330 3C01800E */ lui $at, %hi(D_800E4BF8 + 4) # $at, 0x800e /* 005F34 80005334 C4354BF8 */ lwc1 $f21, %lo(D_800E4BF8)($at) -/* 005F38 80005338 C4344BFC */ lwc1 $f20, %lo(D_800E4BFC)($at) +/* 005F38 80005338 C4344BFC */ lwc1 $f20, %lo(D_800E4BF8 + 4)($at) /* 005F3C 8000533C 8CE79C38 */ lw $a3, %lo(D_80119C38)($a3) /* 005F40 80005340 26319C38 */ addiu $s1, %lo(D_80119C38) # addiu $s1, $s1, -0x63c8 .L80005344: @@ -270,10 +270,10 @@ glabel func_80005254 /* 0061D0 800055D0 00401825 */ move $v1, $v0 .L800055D4: /* 0061D4 800055D4 44835000 */ mtc1 $v1, $f10 -/* 0061D8 800055D8 3C01800E */ lui $at, %hi(D_800E4C0C) # $at, 0x800e +/* 0061D8 800055D8 3C01800E */ lui $at, %hi(D_800E4C08 + 4) # $at, 0x800e /* 0061DC 800055DC 468051A1 */ cvt.d.w $f6, $f10 /* 0061E0 800055E0 C4254C08 */ lwc1 $f5, %lo(D_800E4C08)($at) -/* 0061E4 800055E4 C4244C0C */ lwc1 $f4, %lo(D_800E4C0C)($at) +/* 0061E4 800055E4 C4244C0C */ lwc1 $f4, %lo(D_800E4C08 + 4)($at) /* 0061E8 800055E8 C4EC003C */ lwc1 $f12, 0x3c($a3) /* 0061EC 800055EC 46262002 */ mul.d $f0, $f4, $f6 /* 0061F0 800055F0 460060A1 */ cvt.d.s $f2, $f12 @@ -315,10 +315,10 @@ glabel func_80005254 /* 006274 80005674 10000012 */ b .L800056C0 /* 006278 80005678 460C4080 */ add.s $f2, $f8, $f12 .L8000567C: -/* 00627C 8000567C 3C01800E */ lui $at, %hi(D_800E4C14) # $at, 0x800e +/* 00627C 8000567C 3C01800E */ lui $at, %hi(D_800E4C10 + 4) # $at, 0x800e /* 006280 80005680 C4EA003C */ lwc1 $f10, 0x3c($a3) /* 006284 80005684 C4274C10 */ lwc1 $f7, %lo(D_800E4C10)($at) -/* 006288 80005688 C4264C14 */ lwc1 $f6, %lo(D_800E4C14)($at) +/* 006288 80005688 C4264C14 */ lwc1 $f6, %lo(D_800E4C10 + 4)($at) /* 00628C 8000568C 46005121 */ cvt.d.s $f4, $f10 /* 006290 80005690 46262202 */ mul.d $f8, $f4, $f6 /* 006294 80005694 46109101 */ sub.s $f4, $f18, $f16 @@ -337,10 +337,10 @@ glabel func_80005254 /* 0062C4 800056C4 3C014080 */ lui $at, 0x4080 /* 0062C8 800056C8 13000010 */ beqz $t8, .L8000570C /* 0062CC 800056CC 3C088012 */ lui $t0, %hi(D_80119C3C) # $t0, 0x8012 -# Used to access D_800E4C18 and D_800E4C1C. +# Used to access D_800E4C18 and D_800E4C18 + 4. /* 0062D0 800056D0 3C01800E */ lui $at, %hi(D_800E4C18) # $at, 0x800e /* 0062D4 800056D4 C4274C18 */ lwc1 $f7, %lo(D_800E4C18)($at) -/* 0062D8 800056D8 C4264C1C */ lwc1 $f6, %lo(D_800E4C1C)($at) +/* 0062D8 800056D8 C4264C1C */ lwc1 $f6, %lo(D_800E4C18 + 4)($at) /* 0062DC 800056DC C4E40040 */ lwc1 $f4, 0x40($a3) /* 0062E0 800056E0 3C014020 */ li $at, 0x40200000 # 2.500000 /* 0062E4 800056E4 46002021 */ cvt.d.s $f0, $f4 @@ -370,9 +370,9 @@ glabel func_80005254 /* 00633C 8000573C 850D0000 */ lh $t5, ($t0) /* 006340 80005740 2401FFFF */ li $at, -1 /* 006344 80005744 11A10006 */ beq $t5, $at, .L80005760 -/* 006348 80005748 3C01800E */ lui $at, %hi(D_800E4C24) # $at, 0x800e +/* 006348 80005748 3C01800E */ lui $at, %hi(D_800E4C20 + 4) # $at, 0x800e /* 00634C 8000574C C4254C20 */ lwc1 $f5, %lo(D_800E4C20)($at) -/* 006350 80005750 C4244C24 */ lwc1 $f4, %lo(D_800E4C24)($at) +/* 006350 80005750 C4244C24 */ lwc1 $f4, %lo(D_800E4C20 + 4)($at) /* 006354 80005754 460012A1 */ cvt.d.s $f10, $f2 /* 006358 80005758 46245180 */ add.d $f6, $f10, $f4 /* 00635C 8000575C 462030A0 */ cvt.s.d $f2, $f6 @@ -451,10 +451,10 @@ glabel func_80005254 /* 006470 80005870 80EF0090 */ lb $t7, 0x90($a3) /* 006474 80005874 44813000 */ mtc1 $at, $f6 /* 006478 80005878 448F4000 */ mtc1 $t7, $f8 -/* 00647C 8000587C 3C01800E */ lui $at, %hi(D_800E4C2C) # $at, 0x800e +/* 00647C 8000587C 3C01800E */ lui $at, %hi(D_800E4C28 + 4) # $at, 0x800e /* 006480 80005880 46804120 */ cvt.s.w $f4, $f8 /* 006484 80005884 C42B4C28 */ lwc1 $f11, %lo(D_800E4C28)($at) -/* 006488 80005888 C42A4C2C */ lwc1 $f10, %lo(D_800E4C2C)($at) +/* 006488 80005888 C42A4C2C */ lwc1 $f10, %lo(D_800E4C28 + 4)($at) /* 00648C 8000588C 46062003 */ div.s $f0, $f4, $f6 /* 006490 80005890 3C0140A0 */ li $at, 0x40A00000 # 5.000000 /* 006494 80005894 460061A1 */ cvt.d.s $f6, $f12 @@ -476,10 +476,10 @@ glabel func_80005254 /* 0064D0 800058D0 4500001A */ bc1f .L8000593C /* 0064D4 800058D4 00000000 */ nop /* 0064D8 800058D8 44985000 */ mtc1 $t8, $f10 -/* 0064DC 800058DC 3C01800E */ lui $at, %hi(D_800E4C34) # $at, 0x800e +/* 0064DC 800058DC 3C01800E */ lui $at, %hi(D_800E4C30 + 4) # $at, 0x800e /* 0064E0 800058E0 46805220 */ cvt.s.w $f8, $f10 /* 0064E4 800058E4 C4254C30 */ lwc1 $f5, %lo(D_800E4C30)($at) -/* 0064E8 800058E8 C4244C34 */ lwc1 $f4, %lo(D_800E4C34)($at) +/* 0064E8 800058E8 C4244C34 */ lwc1 $f4, %lo(D_800E4C30 + 4)($at) /* 0064EC 800058EC 460041A1 */ cvt.d.s $f6, $f8 /* 0064F0 800058F0 46243282 */ mul.d $f10, $f6, $f4 /* 0064F4 800058F4 3C01800E */ lui $at, %hi(D_800E4C38) # $at, 0x800e @@ -510,10 +510,10 @@ glabel func_80005254 /* 006554 80005954 45000018 */ bc1f .L800059B8 /* 006558 80005958 00EA1021 */ addu $v0, $a3, $t2 /* 00655C 8000595C 44993000 */ mtc1 $t9, $f6 -/* 006560 80005960 3C01800E */ lui $at, %hi(D_800E4C44) # $at, 0x800e +/* 006560 80005960 3C01800E */ lui $at, %hi(D_800E4C40 + 4) # $at, 0x800e /* 006564 80005964 46803120 */ cvt.s.w $f4, $f6 /* 006568 80005968 C4294C40 */ lwc1 $f9, %lo(D_800E4C40)($at) -/* 00656C 8000596C C4284C44 */ lwc1 $f8, %lo(D_800E4C44)($at) +/* 00656C 8000596C C4284C44 */ lwc1 $f8, %lo(D_800E4C40 + 4)($at) /* 006570 80005970 460022A1 */ cvt.d.s $f10, $f4 /* 006574 80005974 46285182 */ mul.d $f6, $f10, $f8 /* 006578 80005978 46000121 */ cvt.d.s $f4, $f0 @@ -573,10 +573,10 @@ glabel func_80005254 /* 006640 80005A40 1720000F */ bnez $t9, .L80005A80 /* 006644 80005A44 31AE4000 */ andi $t6, $t5, 0x4000 /* 006648 80005A48 11C0000D */ beqz $t6, .L80005A80 -/* 00664C 80005A4C 3C01800E */ lui $at, %hi(D_800E4C4C) # $at, 0x800e +/* 00664C 80005A4C 3C01800E */ lui $at, %hi(D_800E4C48 + 4) # $at, 0x800e /* 006650 80005A50 C508002C */ lwc1 $f8, 0x2c($t0) /* 006654 80005A54 C42B4C48 */ lwc1 $f11, %lo(D_800E4C48)($at) -/* 006658 80005A58 C42A4C4C */ lwc1 $f10, %lo(D_800E4C4C)($at) +/* 006658 80005A58 C42A4C4C */ lwc1 $f10, %lo(D_800E4C48 + 4)($at) /* 00665C 80005A5C 46004121 */ cvt.d.s $f4, $f8 /* 006660 80005A60 4624503C */ c.lt.d $f10, $f4 /* 006664 80005A64 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_80005D08.s b/asm/non_matchings/unknown_005740/func_80005D08.s index 7047a012..b7414355 100644 --- a/asm/non_matchings/unknown_005740/func_80005D08.s +++ b/asm/non_matchings/unknown_005740/func_80005D08.s @@ -195,7 +195,7 @@ glabel func_80005D08 /* 006B98 80005F98 44805000 */ mtc1 $zero, $f10 /* 006B9C 80005F9C 46008221 */ cvt.d.s $f8, $f16 /* 006BA0 80005FA0 46285032 */ c.eq.d $f10, $f8 -# Used to access D_800E4C58 and D_800E4C5C. +# Used to access D_800E4C58 and D_800E4C58 + 4. /* 006BA4 80005FA4 3C01800E */ lui $at, %hi(D_800E4C58) # $at, 0x800e /* 006BA8 80005FA8 45010034 */ bc1t .L8000607C /* 006BAC 80005FAC 00000000 */ nop @@ -212,10 +212,10 @@ glabel func_80005D08 /* 006BD8 80005FD8 00402825 */ move $a1, $v0 .L80005FDC: /* 006BDC 80005FDC 44853000 */ mtc1 $a1, $f6 -/* 006BE0 80005FE0 3C01800E */ lui $at, %hi(D_800E4C5C) # $at, 0x800e +/* 006BE0 80005FE0 3C01800E */ lui $at, %hi(D_800E4C58 + 4) # $at, 0x800e /* 006BE4 80005FE4 468032A1 */ cvt.d.w $f10, $f6 /* 006BE8 80005FE8 C4254C50 */ lwc1 $f5, %lo(D_800E4C50)($at) -/* 006BEC 80005FEC C4244C54 */ lwc1 $f4, %lo(D_800E4C54)($at) +/* 006BEC 80005FEC C4244C54 */ lwc1 $f4, %lo(D_800E4C50 + 4)($at) /* 006BF0 80005FF0 8D230000 */ lw $v1, ($t1) /* 006BF4 80005FF4 462A2002 */ mul.d $f0, $f4, $f10 /* 006BF8 80005FF8 C46C003C */ lwc1 $f12, 0x3c($v1) @@ -257,7 +257,7 @@ glabel func_80005D08 /* 006C7C 8000607C 8D230000 */ lw $v1, ($t1) /* 006C80 80006080 C4294C58 */ lwc1 $f9, %lo(D_800E4C58)($at) /* 006C84 80006084 C464003C */ lwc1 $f4, 0x3c($v1) -/* 006C88 80006088 C4284C5C */ lwc1 $f8, %lo(D_800E4C5C)($at) +/* 006C88 80006088 C4284C5C */ lwc1 $f8, %lo(D_800E4C58 + 4)($at) /* 006C8C 8000608C 460022A1 */ cvt.d.s $f10, $f4 /* 006C90 80006090 46285182 */ mul.d $f6, $f10, $f8 /* 006C94 80006094 3C048012 */ lui $a0, %hi(D_80119C3C) # $a0, 0x8012 @@ -293,9 +293,9 @@ glabel func_80005D08 /* 006D08 80006108 C7AE001C */ lwc1 $f14, 0x1c($sp) /* 006D0C 8000610C 14400007 */ bnez $v0, .L8000612C /* 006D10 80006110 25299C38 */ addiu $t1, %lo(D_80119C38) # addiu $t1, $t1, -0x63c8 -/* 006D14 80006114 3C01800E */ lui $at, %hi(D_800E4C64) # $at, 0x800e +/* 006D14 80006114 3C01800E */ lui $at, %hi(D_800E4C60 + 4) # $at, 0x800e /* 006D18 80006118 C4254C60 */ lwc1 $f5, %lo(D_800E4C60)($at) -/* 006D1C 8000611C C4244C64 */ lwc1 $f4, %lo(D_800E4C64)($at) +/* 006D1C 8000611C C4244C64 */ lwc1 $f4, %lo(D_800E4C60 + 4)($at) /* 006D20 80006120 460071A1 */ cvt.d.s $f6, $f14 /* 006D24 80006124 46243280 */ add.d $f10, $f6, $f4 /* 006D28 80006128 462053A0 */ cvt.s.d $f14, $f10 @@ -310,7 +310,7 @@ glabel func_80005D08 /* 006D48 80006148 46060100 */ add.s $f4, $f0, $f6 /* 006D4C 8000614C E464005C */ swc1 $f4, 0x5c($v1) /* 006D50 80006150 8D230000 */ lw $v1, ($t1) -/* 006D54 80006154 C42A4C6C */ lwc1 $f10, %lo(D_800E4C6C)($at) +/* 006D54 80006154 C42A4C6C */ lwc1 $f10, %lo(D_800E4C68 + 4)($at) /* 006D58 80006158 C460005C */ lwc1 $f0, 0x5c($v1) /* 006D5C 8000615C C42B4C68 */ lwc1 $f11, %lo(D_800E4C68)($at) /* 006D60 80006160 46000221 */ cvt.d.s $f8, $f0 diff --git a/asm/non_matchings/unknown_005740/func_800063EC.s b/asm/non_matchings/unknown_005740/func_800063EC.s index 0729b783..42836050 100644 --- a/asm/non_matchings/unknown_005740/func_800063EC.s +++ b/asm/non_matchings/unknown_005740/func_800063EC.s @@ -344,7 +344,7 @@ glabel func_800063EC /* 0074A4 800068A4 46049182 */ mul.s $f6, $f18, $f4 /* 0074A8 800068A8 46009221 */ cvt.d.s $f8, $f18 /* 0074AC 800068AC 46285032 */ c.eq.d $f10, $f8 -# Used to access D_800E4C88 and D_800E4C8C. +# Used to access D_800E4C88 and D_800E4C88 + 4. /* 0074B0 800068B0 3C01800E */ lui $at, %hi(D_800E4C88) # $at, 0x800e /* 0074B4 800068B4 45010032 */ bc1t .L80006980 /* 0074B8 800068B8 46067380 */ add.s $f14, $f14, $f6 @@ -361,10 +361,10 @@ glabel func_800063EC /* 0074E4 800068E4 00402025 */ move $a0, $v0 .L800068E8: /* 0074E8 800068E8 44843000 */ mtc1 $a0, $f6 -/* 0074EC 800068EC 3C01800E */ lui $at, %hi(D_800E4C8C) # $at, 0x800e +/* 0074EC 800068EC 3C01800E */ lui $at, %hi(D_800E4C88 + 4) # $at, 0x800e /* 0074F0 800068F0 468032A1 */ cvt.d.w $f10, $f6 /* 0074F4 800068F4 C4254C80 */ lwc1 $f5, %lo(D_800E4C80)($at) -/* 0074F8 800068F8 C4244C84 */ lwc1 $f4, %lo(D_800E4C84)($at) +/* 0074F8 800068F8 C4244C84 */ lwc1 $f4, %lo(D_800E4C80 + 4)($at) /* 0074FC 800068FC C46C003C */ lwc1 $f12, 0x3c($v1) /* 007500 80006900 462A2002 */ mul.d $f0, $f4, $f10 /* 007504 80006904 460060A1 */ cvt.d.s $f2, $f12 @@ -403,7 +403,7 @@ glabel func_800063EC .L80006980: /* 007580 80006980 C464003C */ lwc1 $f4, 0x3c($v1) /* 007584 80006984 C4294C88 */ lwc1 $f9, %lo(D_800E4C88)($at) -/* 007588 80006988 C4284C8C */ lwc1 $f8, %lo(D_800E4C8C)($at) +/* 007588 80006988 C4284C8C */ lwc1 $f8, %lo(D_800E4C88 + 4)($at) /* 00758C 8000698C 460022A1 */ cvt.d.s $f10, $f4 /* 007590 80006990 46285182 */ mul.d $f6, $f10, $f8 /* 007594 80006994 46203120 */ cvt.s.d $f4, $f6 @@ -423,7 +423,7 @@ glabel func_800063EC /* 0075C8 800069C8 46040280 */ add.s $f10, $f0, $f4 /* 0075CC 800069CC E46A005C */ swc1 $f10, 0x5c($v1) /* 0075D0 800069D0 8D230000 */ lw $v1, ($t1) -/* 0075D4 800069D4 C4284C94 */ lwc1 $f8, %lo(D_800E4C94)($at) +/* 0075D4 800069D4 C4284C94 */ lwc1 $f8, %lo(D_800E4C90 + 4)($at) /* 0075D8 800069D8 C466005C */ lwc1 $f6, 0x5c($v1) /* 0075DC 800069DC C4294C90 */ lwc1 $f9, %lo(D_800E4C90)($at) /* 0075E0 800069E0 46003121 */ cvt.d.s $f4, $f6 diff --git a/asm/non_matchings/unknown_005740/func_80006BFC.s b/asm/non_matchings/unknown_005740/func_80006BFC.s index 5f2c3a84..7ee51b5d 100644 --- a/asm/non_matchings/unknown_005740/func_80006BFC.s +++ b/asm/non_matchings/unknown_005740/func_80006BFC.s @@ -173,13 +173,13 @@ glabel func_80006BFC /* 007A48 80006E48 3C01428C */ li $at, 0x428C0000 # 70.000000 /* 007A4C 80006E4C 44816000 */ mtc1 $at, $f12 /* 007A50 80006E50 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 007A54 80006E54 3C01800E */ lui $at, %hi(D_800E4CA4) # $at, 0x800e +/* 007A54 80006E54 3C01800E */ lui $at, %hi(D_800E4CA0 + 4) # $at, 0x800e /* 007A58 80006E58 46026100 */ add.s $f4, $f12, $f2 /* 007A5C 80006E5C C4254CA0 */ lwc1 $f5, %lo(D_800E4CA0)($at) /* 007A60 80006E60 46026201 */ sub.s $f8, $f12, $f2 /* 007A64 80006E64 00000000 */ nop /* 007A68 80006E68 46082183 */ div.s $f6, $f4, $f8 -/* 007A6C 80006E6C C4244CA4 */ lwc1 $f4, %lo(D_800E4CA4)($at) +/* 007A6C 80006E6C C4244CA4 */ lwc1 $f4, %lo(D_800E4CA0 + 4)($at) /* 007A70 80006E70 460002A1 */ cvt.d.s $f10, $f0 /* 007A74 80006E74 46245202 */ mul.d $f8, $f10, $f4 /* 007A78 80006E78 444CF800 */ cfc1 $t4, $31 @@ -228,16 +228,16 @@ glabel func_80006BFC /* 007B24 80006F24 E4460068 */ swc1 $f6, 0x68($v0) /* 007B28 80006F28 3C028012 */ lui $v0, %hi(D_80119C38) # $v0, 0x8012 /* 007B2C 80006F2C 8C429C38 */ lw $v0, %lo(D_80119C38)($v0) -/* 007B30 80006F30 C42A4CAC */ lwc1 $f10, %lo(D_800E4CAC)($at) +/* 007B30 80006F30 C42A4CAC */ lwc1 $f10, %lo(D_800E4CA8 + 4)($at) /* 007B34 80006F34 C4480068 */ lwc1 $f8, 0x68($v0) /* 007B38 80006F38 C42B4CA8 */ lwc1 $f11, %lo(D_800E4CA8)($at) /* 007B3C 80006F3C 46004321 */ cvt.d.s $f12, $f8 /* 007B40 80006F40 462C503C */ c.lt.d $f10, $f12 -# Used to access D_800E4CB8 and D_800E4CBC. +# Used to access D_800E4CB8 and D_800E4CB8 + 4. /* 007B44 80006F44 3C01800E */ lui $at, %hi(D_800E4CB8) # $at, 0x800e /* 007B48 80006F48 45000009 */ bc1f .L80006F70 /* 007B4C 80006F4C 00000000 */ nop -/* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CBC) # $at, 0x800e +/* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CB8 + 4) # $at, 0x800e /* 007B54 80006F54 C4244CB0 */ lwc1 $f4, %lo(D_800E4CB0)($at) /* 007B58 80006F58 00000000 */ nop /* 007B5C 80006F5C E4440068 */ swc1 $f4, 0x68($v0) @@ -247,7 +247,7 @@ glabel func_80006BFC /* 007B6C 80006F6C 846F0000 */ lh $t7, ($v1) .L80006F70: /* 007B70 80006F70 C4274CB8 */ lwc1 $f7, %lo(D_800E4CB8)($at) -/* 007B74 80006F74 C4264CBC */ lwc1 $f6, %lo(D_800E4CBC)($at) +/* 007B74 80006F74 C4264CBC */ lwc1 $f6, %lo(D_800E4CB8 + 4)($at) /* 007B78 80006F78 3C01800E */ lui $at, %hi(D_800E4CC0) # $at, 0x800e /* 007B7C 80006F7C 4626603C */ c.lt.d $f12, $f6 /* 007B80 80006F80 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index 25ceb63c..c75f553f 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -54,10 +54,10 @@ glabel func_80006FC8 /* 007C40 80007040 AFA000AC */ sw $zero, 0xac($sp) /* 007C44 80007044 3C01800E */ lui $at, %hi(D_800E4CC4) # $at, 0x800e /* 007C48 80007048 C43E4CC4 */ lwc1 $f30, %lo(D_800E4CC4)($at) -/* 007C4C 8000704C 3C01800E */ lui $at, %hi(D_800E4CCC) # $at, 0x800e +/* 007C4C 8000704C 3C01800E */ lui $at, %hi(D_800E4CC8 + 4) # $at, 0x800e /* 007C50 80007050 3C148012 */ lui $s4, %hi(D_80119C38) # $s4, 0x8012 /* 007C54 80007054 C43D4CC8 */ lwc1 $f29, %lo(D_800E4CC8)($at) -/* 007C58 80007058 C43C4CCC */ lwc1 $f28, %lo(D_800E4CCC)($at) +/* 007C58 80007058 C43C4CCC */ lwc1 $f28, %lo(D_800E4CC8 + 4)($at) /* 007C5C 8000705C 4480C800 */ mtc1 $zero, $f25 /* 007C60 80007060 4480C000 */ mtc1 $zero, $f24 /* 007C64 80007064 8FBE00D8 */ lw $fp, 0xd8($sp) @@ -536,9 +536,9 @@ glabel func_80006FC8 /* 008348 80007748 1509FE49 */ bne $t0, $t1, .L80007070 /* 00834C 8000774C 26D60004 */ addiu $s6, $s6, 4 .L80007750: -/* 008350 80007750 3C01800E */ lui $at, %hi(D_800E4CDC) # $at, 0x800e +/* 008350 80007750 3C01800E */ lui $at, %hi(D_800E4CD8 + 4) # $at, 0x800e /* 008354 80007754 C43D4CD8 */ lwc1 $f29, %lo(D_800E4CD8)($at) -/* 008358 80007758 C43C4CDC */ lwc1 $f28, %lo(D_800E4CDC)($at) +/* 008358 80007758 C43C4CDC */ lwc1 $f28, %lo(D_800E4CD8 + 4)($at) /* 00835C 8000775C 8FAA007C */ lw $t2, 0x7c($sp) /* 008360 80007760 3C01800E */ lui $at, %hi(D_800E4CE0) # $at, 0x800e /* 008364 80007764 C43E4CE0 */ lwc1 $f30, %lo(D_800E4CE0)($at) @@ -641,9 +641,9 @@ glabel func_80006FC8 .L800078C4: /* 0084C4 800078C4 8FB600C8 */ lw $s6, 0xc8($sp) /* 0084C8 800078C8 194000D7 */ blez $t2, .L80007C28 -/* 0084CC 800078CC 3C01800E */ lui $at, %hi(D_800E4CEC) # $at, 0x800e +/* 0084CC 800078CC 3C01800E */ lui $at, %hi(D_800E4CE8 + 4) # $at, 0x800e /* 0084D0 800078D0 C4394CE8 */ lwc1 $f25, %lo(D_800E4CE8)($at) -/* 0084D4 800078D4 C4384CEC */ lwc1 $f24, %lo(D_800E4CEC)($at) +/* 0084D4 800078D4 C4384CEC */ lwc1 $f24, %lo(D_800E4CE8 + 4)($at) /* 0084D8 800078D8 00000000 */ nop .L800078DC: /* 0084DC 800078DC 8EC80000 */ lw $t0, ($s6) diff --git a/asm/non_matchings/unknown_005740/func_80007FA4.s b/asm/non_matchings/unknown_005740/func_80007FA4.s index b8609c7a..33c1c9f4 100644 --- a/asm/non_matchings/unknown_005740/func_80007FA4.s +++ b/asm/non_matchings/unknown_005740/func_80007FA4.s @@ -6,11 +6,11 @@ glabel D_800E4CF8 glabel func_80007FA4 /* 008BA4 80007FA4 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 008BA8 80007FA8 44818000 */ mtc1 $at, $f16 -/* 008BAC 80007FAC 3C01800E */ lui $at, %hi(D_800E4CFC) # $at, 0x800e +/* 008BAC 80007FAC 3C01800E */ lui $at, %hi(D_800E4CF8 + 4) # $at, 0x800e /* 008BB0 80007FB0 46106101 */ sub.s $f4, $f12, $f16 /* 008BB4 80007FB4 C4334CF8 */ lwc1 $f19, %lo(D_800E4CF8)($at) /* 008BB8 80007FB8 460C8180 */ add.s $f6, $f16, $f12 -/* 008BBC 80007FBC C4324CFC */ lwc1 $f18, %lo(D_800E4CFC)($at) +/* 008BBC 80007FBC C4324CFC */ lwc1 $f18, %lo(D_800E4CF8 + 4)($at) /* 008BC0 80007FC0 46062303 */ div.s $f12, $f4, $f6 /* 008BC4 80007FC4 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 008BC8 80007FC8 44801000 */ mtc1 $zero, $f2 diff --git a/asm/non_matchings/unknown_005740/func_800099EC.s b/asm/non_matchings/unknown_005740/func_800099EC.s index 27e196d5..825f1c13 100644 --- a/asm/non_matchings/unknown_005740/func_800099EC.s +++ b/asm/non_matchings/unknown_005740/func_800099EC.s @@ -26,9 +26,9 @@ glabel func_800099EC /* 00A630 80009A30 44817000 */ mtc1 $at, $f14 /* 00A634 80009A34 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00A638 80009A38 44816000 */ mtc1 $at, $f12 -/* 00A63C 80009A3C 3C01800E */ lui $at, %hi(D_800E4F1C) # $at, 0x800e +/* 00A63C 80009A3C 3C01800E */ lui $at, %hi(D_800E4F18 + 4) # $at, 0x800e /* 00A640 80009A40 C4234F18 */ lwc1 $f3, %lo(D_800E4F18)($at) -/* 00A644 80009A44 C4224F1C */ lwc1 $f2, %lo(D_800E4F1C)($at) +/* 00A644 80009A44 C4224F1C */ lwc1 $f2, %lo(D_800E4F18 + 4)($at) /* 00A648 80009A48 8045017C */ lb $a1, 0x17c($v0) /* 00A64C 80009A4C 00000000 */ nop .L80009A50: diff --git a/asm/non_matchings/unknown_005740/func_80009AB4.s b/asm/non_matchings/unknown_005740/func_80009AB4.s index 46efb78d..ea1e577b 100644 --- a/asm/non_matchings/unknown_005740/func_80009AB4.s +++ b/asm/non_matchings/unknown_005740/func_80009AB4.s @@ -26,9 +26,9 @@ glabel func_80009AB4 /* 00A6F8 80009AF8 44817000 */ mtc1 $at, $f14 /* 00A6FC 80009AFC 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00A700 80009B00 44816000 */ mtc1 $at, $f12 -/* 00A704 80009B04 3C01800E */ lui $at, %hi(D_800E4F24) # $at, 0x800e +/* 00A704 80009B04 3C01800E */ lui $at, %hi(D_800E4F20 + 4) # $at, 0x800e /* 00A708 80009B08 C4234F20 */ lwc1 $f3, %lo(D_800E4F20)($at) -/* 00A70C 80009B0C C4224F24 */ lwc1 $f2, %lo(D_800E4F24)($at) +/* 00A70C 80009B0C C4224F24 */ lwc1 $f2, %lo(D_800E4F20 + 4)($at) /* 00A710 80009B10 804500B8 */ lb $a1, 0xb8($v0) /* 00A714 80009B14 00000000 */ nop .L80009B18: diff --git a/asm/non_matchings/unknown_00BC20/func_80011570.s b/asm/non_matchings/unknown_00BC20/func_80011570.s index bb5a8071..88ba53fd 100644 --- a/asm/non_matchings/unknown_00BC20/func_80011570.s +++ b/asm/non_matchings/unknown_00BC20/func_80011570.s @@ -36,11 +36,11 @@ glabel func_80011570 /* 0121D4 800115D4 00001025 */ move $v0, $zero .L800115D8: /* 0121D8 800115D8 844E003E */ lh $t6, 0x3e($v0) -/* 0121DC 800115DC 3C01800E */ lui $at, %hi(D_800E553C) # $at, 0x800e +/* 0121DC 800115DC 3C01800E */ lui $at, %hi(D_800E5538 + 4) # $at, 0x800e /* 0121E0 800115E0 448E3000 */ mtc1 $t6, $f6 /* 0121E4 800115E4 C42D5538 */ lwc1 $f13, %lo(D_800E5538)($at) /* 0121E8 800115E8 46803221 */ cvt.d.w $f8, $f6 -/* 0121EC 800115EC C42C553C */ lwc1 $f12, %lo(D_800E553C)($at) +/* 0121EC 800115EC C42C553C */ lwc1 $f12, %lo(D_800E5538 + 4)($at) /* 0121F0 800115F0 3C04800E */ lui $a0, %hi(D_800DC848) # $a0, 0x800e /* 0121F4 800115F4 462C4280 */ add.d $f10, $f8, $f12 /* 0121F8 800115F8 00001825 */ move $v1, $zero @@ -66,11 +66,11 @@ glabel func_80011570 /* 012244 80011644 24030001 */ li $v1, 1 .L80011648: /* 012248 80011648 84580042 */ lh $t8, 0x42($v0) -/* 01224C 8001164C 3C01800E */ lui $at, %hi(D_800E5544) # $at, 0x800e +/* 01224C 8001164C 3C01800E */ lui $at, %hi(D_800E5540 + 4) # $at, 0x800e /* 012250 80011650 44985000 */ mtc1 $t8, $f10 /* 012254 80011654 C4275540 */ lwc1 $f7, %lo(D_800E5540)($at) /* 012258 80011658 46805121 */ cvt.d.w $f4, $f10 -/* 01225C 8001165C C4265544 */ lwc1 $f6, %lo(D_800E5544)($at) +/* 01225C 8001165C C4265544 */ lwc1 $f6, %lo(D_800E5540 + 4)($at) /* 012260 80011660 00000000 */ nop /* 012264 80011664 46262200 */ add.d $f8, $f4, $f6 /* 012268 80011668 46204020 */ cvt.s.d $f0, $f8 @@ -81,11 +81,11 @@ glabel func_80011570 /* 01227C 8001167C 24030001 */ li $v1, 1 .L80011680: /* 012280 80011680 84590040 */ lh $t9, 0x40($v0) -/* 012284 80011684 3C01800E */ lui $at, %hi(D_800E554C) # $at, 0x800e +/* 012284 80011684 3C01800E */ lui $at, %hi(D_800E5548 + 4) # $at, 0x800e /* 012288 80011688 44995000 */ mtc1 $t9, $f10 /* 01228C 8001168C C4275548 */ lwc1 $f7, %lo(D_800E5548)($at) /* 012290 80011690 46805121 */ cvt.d.w $f4, $f10 -/* 012294 80011694 C426554C */ lwc1 $f6, %lo(D_800E554C)($at) +/* 012294 80011694 C426554C */ lwc1 $f6, %lo(D_800E5548 + 4)($at) /* 012298 80011698 00000000 */ nop /* 01229C 8001169C 46262201 */ sub.d $f8, $f4, $f6 /* 0122A0 800116A0 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_00BC20/func_80013A0C.s b/asm/non_matchings/unknown_00BC20/func_80013A0C.s index de3e1e6c..8e67b167 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013A0C.s +++ b/asm/non_matchings/unknown_00BC20/func_80013A0C.s @@ -142,10 +142,10 @@ glabel func_80013A0C /* 014808 80013C08 24040002 */ li $a0, 2 .L80013C0C: /* 01480C 80013C0C 44849000 */ mtc1 $a0, $f18 -/* 014810 80013C10 3C01800E */ lui $at, %hi(D_800E557C) # $at, 0x800e +/* 014810 80013C10 3C01800E */ lui $at, %hi(D_800E5578 + 4) # $at, 0x800e /* 014814 80013C14 468091A0 */ cvt.s.w $f6, $f18 /* 014818 80013C18 C4255578 */ lwc1 $f5, %lo(D_800E5578)($at) -/* 01481C 80013C1C C424557C */ lwc1 $f4, %lo(D_800E557C)($at) +/* 01481C 80013C1C C424557C */ lwc1 $f4, %lo(D_800E5578 + 4)($at) /* 014820 80013C20 46003221 */ cvt.d.s $f8, $f6 /* 014824 80013C24 46244282 */ mul.d $f10, $f8, $f4 /* 014828 80013C28 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 diff --git a/asm/non_matchings/unknown_00BC20/func_800159C8.s b/asm/non_matchings/unknown_00BC20/func_800159C8.s index d674ce00..f265333d 100644 --- a/asm/non_matchings/unknown_00BC20/func_800159C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800159C8.s @@ -72,13 +72,13 @@ glabel func_800159C8 /* 016690 80015A90 1441000C */ bne $v0, $at, .L80015AC4 /* 016694 80015A94 00000000 */ nop /* 016698 80015A98 44803000 */ mtc1 $zero, $f6 -/* 01669C 80015A9C 3C01800E */ lui $at, %hi(D_800E55BC) # $at, 0x800e +/* 01669C 80015A9C 3C01800E */ lui $at, %hi(D_800E55B8 + 4) # $at, 0x800e /* 0166A0 80015AA0 4606003C */ c.lt.s $f0, $f6 /* 0166A4 80015AA4 00000000 */ nop /* 0166A8 80015AA8 45000006 */ bc1f .L80015AC4 /* 0166AC 80015AAC 00000000 */ nop /* 0166B0 80015AB0 C42955B8 */ lwc1 $f9, %lo(D_800E55B8)($at) -/* 0166B4 80015AB4 C42855BC */ lwc1 $f8, %lo(D_800E55BC)($at) +/* 0166B4 80015AB4 C42855BC */ lwc1 $f8, %lo(D_800E55B8 + 4)($at) /* 0166B8 80015AB8 46000121 */ cvt.d.s $f4, $f0 /* 0166BC 80015ABC 46282282 */ mul.d $f10, $f4, $f8 /* 0166C0 80015AC0 46205020 */ cvt.s.d $f0, $f10 @@ -410,13 +410,13 @@ glabel func_800159C8 /* 016BA4 80015FA4 8C850064 */ lw $a1, 0x64($a0) /* 016BA8 80015FA8 00001025 */ move $v0, $zero /* 016BAC 80015FAC 80AF01D6 */ lb $t7, 0x1d6($a1) -# Used to access D_800E55E0 and D_800E55E4 +# Used to access D_800E55E0 and D_800E55E0 + 4 /* 016BB0 80015FB0 3C01800E */ lui $at, %hi(D_800E55E0) # $at, 0x800e /* 016BB4 80015FB4 152F0059 */ bne $t1, $t7, .L8001611C /* 016BB8 80015FB8 00000000 */ nop -/* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C4) # $at, 0x800e +/* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C0 + 4) # $at, 0x800e /* 016BC0 80015FC0 C42755C0 */ lwc1 $f7, %lo(D_800E55C0)($at) -/* 016BC4 80015FC4 C42655C4 */ lwc1 $f6, %lo(D_800E55C4)($at) +/* 016BC4 80015FC4 C42655C4 */ lwc1 $f6, %lo(D_800E55C0 + 4)($at) /* 016BC8 80015FC8 46008021 */ cvt.d.s $f0, $f16 /* 016BCC 80015FCC 4620303C */ c.lt.d $f6, $f0 /* 016BD0 80015FD0 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -424,7 +424,7 @@ glabel func_800159C8 /* 016BD8 80015FD8 00000000 */ nop /* 016BDC 80015FDC 44815800 */ mtc1 $at, $f11 /* 016BE0 80015FE0 44805000 */ mtc1 $zero, $f10 -/* 016BE4 80015FE4 3C01800E */ lui $at, %hi(D_800E55CC) # $at, 0x800e +/* 016BE4 80015FE4 3C01800E */ lui $at, %hi(D_800E55C8 + 4) # $at, 0x800e /* 016BE8 80015FE8 4620503C */ c.lt.d $f10, $f0 /* 016BEC 80015FEC 00000000 */ nop /* 016BF0 80015FF0 45000002 */ bc1f .L80015FFC @@ -435,7 +435,7 @@ glabel func_800159C8 /* 016C00 80016000 00000000 */ nop /* 016C04 80016004 C484001C */ lwc1 $f4, 0x1c($a0) /* 016C08 80016008 C42155C8 */ lwc1 $f1, %lo(D_800E55C8)($at) -/* 016C0C 8001600C C42055CC */ lwc1 $f0, %lo(D_800E55CC)($at) +/* 016C0C 8001600C C42055CC */ lwc1 $f0, %lo(D_800E55C8 + 4)($at) /* 016C10 80016010 46002221 */ cvt.d.s $f8, $f4 /* 016C14 80016014 46204182 */ mul.d $f6, $f8, $f0 /* 016C18 80016018 C4840024 */ lwc1 $f4, 0x24($a0) @@ -459,7 +459,7 @@ glabel func_800159C8 /* 016C5C 8001605C 460C2202 */ mul.s $f8, $f4, $f12 /* 016C60 80016060 C480001C */ lwc1 $f0, 0x1c($a0) /* 016C64 80016064 C4E4000C */ lwc1 $f4, 0xc($a3) -# Used to access D_800E55D8 and D_800E55DC. +# Used to access D_800E55D8 and D_800E55D8 + 4. /* 016C68 80016068 3C01800E */ lui $at, %hi(D_800E55D8) # $at, 0x800e /* 016C6C 8001606C 46003282 */ mul.s $f10, $f6, $f0 /* 016C70 80016070 460A4081 */ sub.s $f2, $f8, $f10 @@ -474,11 +474,11 @@ glabel func_800159C8 /* 016C94 80016094 00000000 */ nop /* 016C98 80016098 45000011 */ bc1f .L800160E0 /* 016C9C 8001609C 00000000 */ nop -# Used to access D_800E55D0 and D_800E55D4. +# Used to access D_800E55D0 and D_800E55D0 + 4. /* 016CA0 800160A0 3C01800E */ lui $at, %hi(D_800E55D0) # $at, 0x800e /* 016CA4 800160A4 C486001C */ lwc1 $f6, 0x1c($a0) /* 016CA8 800160A8 C42155D0 */ lwc1 $f1, %lo(D_800E55D0)($at) -/* 016CAC 800160AC C42055D4 */ lwc1 $f0, %lo(D_800E55D4)($at) +/* 016CAC 800160AC C42055D4 */ lwc1 $f0, %lo(D_800E55D0 + 4)($at) /* 016CB0 800160B0 460032A1 */ cvt.d.s $f10, $f6 /* 016CB4 800160B4 46205102 */ mul.d $f4, $f10, $f0 /* 016CB8 800160B8 46202220 */ cvt.s.d $f8, $f4 @@ -494,7 +494,7 @@ glabel func_800159C8 .L800160E0: /* 016CE0 800160E0 C48A001C */ lwc1 $f10, 0x1c($a0) /* 016CE4 800160E4 C42155D8 */ lwc1 $f1, %lo(D_800E55D8)($at) -/* 016CE8 800160E8 C42055DC */ lwc1 $f0, %lo(D_800E55DC)($at) +/* 016CE8 800160E8 C42055DC */ lwc1 $f0, %lo(D_800E55D8 + 4)($at) /* 016CEC 800160EC 46005107 */ neg.s $f4, $f10 /* 016CF0 800160F0 46002221 */ cvt.d.s $f8, $f4 /* 016CF4 800160F4 46204182 */ mul.d $f6, $f8, $f0 @@ -509,7 +509,7 @@ glabel func_800159C8 /* 016D18 80016118 E4AA011C */ swc1 $f10, 0x11c($a1) .L8001611C: /* 016D1C 8001611C C42555E0 */ lwc1 $f5, %lo(D_800E55E0)($at) -/* 016D20 80016120 C42455E4 */ lwc1 $f4, %lo(D_800E55E4)($at) +/* 016D20 80016120 C42455E4 */ lwc1 $f4, %lo(D_800E55E0 + 4)($at) /* 016D24 80016124 46008021 */ cvt.d.s $f0, $f16 /* 016D28 80016128 4620203C */ c.lt.d $f4, $f0 /* 016D2C 8001612C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -651,7 +651,7 @@ glabel func_800159C8 /* 016F30 80016330 15380070 */ bne $t1, $t8, .L800164F4 /* 016F34 80016334 8FBF0014 */ lw $ra, 0x14($sp) /* 016F38 80016338 84F90048 */ lh $t9, 0x48($a3) -/* 016F3C 8001633C 3C01800E */ lui $at, %hi(D_800E55EC) # $at, 0x800e +/* 016F3C 8001633C 3C01800E */ lui $at, %hi(D_800E55E8 + 4) # $at, 0x800e /* 016F40 80016340 1539006C */ bne $t1, $t9, .L800164F4 /* 016F44 80016344 8FBF0014 */ lw $ra, 0x14($sp) /* 016F48 80016348 910A0012 */ lbu $t2, 0x12($t0) @@ -659,7 +659,7 @@ glabel func_800159C8 /* 016F50 80016350 C42755E8 */ lwc1 $f7, %lo(D_800E55E8)($at) /* 016F54 80016354 014C5823 */ subu $t3, $t2, $t4 /* 016F58 80016358 448B5000 */ mtc1 $t3, $f10 -/* 016F5C 8001635C C42655EC */ lwc1 $f6, %lo(D_800E55EC)($at) +/* 016F5C 8001635C C42655EC */ lwc1 $f6, %lo(D_800E55E8 + 4)($at) /* 016F60 80016360 46805120 */ cvt.s.w $f4, $f10 /* 016F64 80016364 8C850064 */ lw $a1, 0x64($a0) /* 016F68 80016368 8CED0064 */ lw $t5, 0x64($a3) @@ -681,7 +681,7 @@ glabel func_800159C8 .L800163A8: /* 016FA8 800163A8 8FB8004C */ lw $t8, 0x4c($sp) .L800163AC: -/* 016FAC 800163AC 3C01800E */ lui $at, %hi(D_800E55F4) # $at, 0x800e +/* 016FAC 800163AC 3C01800E */ lui $at, %hi(D_800E55F0 + 4) # $at, 0x800e /* 016FB0 800163B0 83020189 */ lb $v0, 0x189($t8) /* 016FB4 800163B4 00000000 */ nop /* 016FB8 800163B8 10400006 */ beqz $v0, .L800163D4 @@ -701,7 +701,7 @@ glabel func_800159C8 /* 016FEC 800163EC E7AC0068 */ swc1 $f12, 0x68($sp) .L800163F0: /* 016FF0 800163F0 C42155F0 */ lwc1 $f1, %lo(D_800E55F0)($at) -/* 016FF4 800163F4 C42055F4 */ lwc1 $f0, %lo(D_800E55F4)($at) +/* 016FF4 800163F4 C42055F4 */ lwc1 $f0, %lo(D_800E55F0 + 4)($at) /* 016FF8 800163F8 46008121 */ cvt.d.s $f4, $f16 /* 016FFC 800163FC 4624003C */ c.lt.d $f0, $f4 /* 017000 80016400 E7AC0068 */ swc1 $f12, 0x68($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80016748.s b/asm/non_matchings/unknown_00BC20/func_80016748.s index a31b8785..28a7cfe0 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016748.s +++ b/asm/non_matchings/unknown_00BC20/func_80016748.s @@ -79,12 +79,12 @@ glabel func_80016748 /* 017460 80016860 0000F025 */ move $fp, $zero /* 017464 80016864 1B0000BF */ blez $t8, .L80016B64 /* 017468 80016868 00009025 */ move $s2, $zero -/* 01746C 8001686C 3C01800E */ lui $at, %hi(D_800E55FC) # $at, 0x800e +/* 01746C 8001686C 3C01800E */ lui $at, %hi(D_800E55F8 + 4) # $at, 0x800e /* 017470 80016870 C43D55F8 */ lwc1 $f29, %lo(D_800E55F8)($at) -/* 017474 80016874 C43C55FC */ lwc1 $f28, %lo(D_800E55FC)($at) -/* 017478 80016878 3C01800E */ lui $at, %hi(D_800E5604) # $at, 0x800e +/* 017474 80016874 C43C55FC */ lwc1 $f28, %lo(D_800E55F8 + 4)($at) +/* 017478 80016878 3C01800E */ lui $at, %hi(D_800E5600 + 4) # $at, 0x800e /* 01747C 8001687C C43B5600 */ lwc1 $f27, %lo(D_800E5600)($at) -/* 017480 80016880 C43A5604 */ lwc1 $f26, %lo(D_800E5604)($at) +/* 017480 80016880 C43A5604 */ lwc1 $f26, %lo(D_800E5600 + 4)($at) /* 017484 80016884 4480C000 */ mtc1 $zero, $f24 /* 017488 80016888 2417000A */ li $s7, 10 .L8001688C: diff --git a/asm/non_matchings/unknown_00BC20/func_80017A18.s b/asm/non_matchings/unknown_00BC20/func_80017A18.s index e9d175c5..394e9c77 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017A18.s +++ b/asm/non_matchings/unknown_00BC20/func_80017A18.s @@ -110,7 +110,7 @@ glabel func_80017A18 /* 018798 80017B98 3C01800E */ lui $at, %hi(D_800E5608) # $at, 0x800e /* 01879C 80017B9C 46048402 */ mul.s $f16, $f16, $f4 /* 0187A0 80017BA0 46125001 */ sub.s $f0, $f10, $f18 -/* 0187A4 80017BA4 C42A560C */ lwc1 $f10, %lo(D_800E560C)($at) +/* 0187A4 80017BA4 C42A560C */ lwc1 $f10, %lo(D_800E5608 + 4)($at) /* 0187A8 80017BA8 E7BC0060 */ swc1 $f28, 0x60($sp) /* 0187AC 80017BAC 460E8380 */ add.s $f14, $f16, $f14 /* 0187B0 80017BB0 E7B40068 */ swc1 $f20, 0x68($sp) @@ -123,9 +123,9 @@ glabel func_80017A18 /* 0187CC 80017BCC 46126581 */ sub.s $f22, $f12, $f18 /* 0187D0 80017BD0 4500006D */ bc1f .L80017D88 /* 0187D4 80017BD4 E7A80070 */ swc1 $f8, 0x70($sp) -/* 0187D8 80017BD8 3C01800E */ lui $at, %hi(D_800E5614) # $at, 0x800e +/* 0187D8 80017BD8 3C01800E */ lui $at, %hi(D_800E5610 + 4) # $at, 0x800e /* 0187DC 80017BDC C4295610 */ lwc1 $f9, %lo(D_800E5610)($at) -/* 0187E0 80017BE0 C4285614 */ lwc1 $f8, %lo(D_800E5614)($at) +/* 0187E0 80017BE0 C4285614 */ lwc1 $f8, %lo(D_800E5610 + 4)($at) /* 0187E4 80017BE4 4600B2A1 */ cvt.d.s $f10, $f22 /* 0187E8 80017BE8 4628503C */ c.lt.d $f10, $f8 /* 0187EC 80017BEC C7AA0060 */ lwc1 $f10, 0x60($sp) @@ -186,9 +186,9 @@ glabel func_80017A18 /* 0188B8 80017CB8 00000000 */ nop .L80017CBC: /* 0188BC 80017CBC 10C00032 */ beqz $a2, .L80017D88 -/* 0188C0 80017CC0 3C01800E */ lui $at, %hi(D_800E561C) # $at, 0x800e +/* 0188C0 80017CC0 3C01800E */ lui $at, %hi(D_800E5618 + 4) # $at, 0x800e /* 0188C4 80017CC4 C4295618 */ lwc1 $f9, %lo(D_800E5618)($at) -/* 0188C8 80017CC8 C428561C */ lwc1 $f8, %lo(D_800E561C)($at) +/* 0188C8 80017CC8 C428561C */ lwc1 $f8, %lo(D_800E5618 + 4)($at) /* 0188CC 80017CCC 4600D1A1 */ cvt.d.s $f6, $f26 /* 0188D0 80017CD0 4626403C */ c.lt.d $f8, $f6 /* 0188D4 80017CD4 240D0001 */ li $t5, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_800185E4.s b/asm/non_matchings/unknown_00BC20/func_800185E4.s index c14c05b7..2e81bbd2 100644 --- a/asm/non_matchings/unknown_00BC20/func_800185E4.s +++ b/asm/non_matchings/unknown_00BC20/func_800185E4.s @@ -249,23 +249,23 @@ glabel func_800185E4 /* 019580 80018980 14790019 */ bne $v1, $t9, .L800189E8 /* 019584 80018984 00000000 */ nop /* 019588 80018988 8CE20064 */ lw $v0, 0x64($a3) -/* 01958C 8001898C 3C01800E */ lui $at, %hi(D_800E5624) # $at, 0x800e +/* 01958C 8001898C 3C01800E */ lui $at, %hi(D_800E5620 + 4) # $at, 0x800e /* 019590 80018990 844C0000 */ lh $t4, ($v0) /* 019594 80018994 00000000 */ nop /* 019598 80018998 154C0013 */ bne $t2, $t4, .L800189E8 /* 01959C 8001899C 00000000 */ nop /* 0195A0 800189A0 C4275620 */ lwc1 $f7, %lo(D_800E5620)($at) -/* 0195A4 800189A4 C4265624 */ lwc1 $f6, %lo(D_800E5624)($at) +/* 0195A4 800189A4 C4265624 */ lwc1 $f6, %lo(D_800E5620 + 4)($at) /* 0195A8 800189A8 460000A1 */ cvt.d.s $f2, $f0 /* 0195AC 800189AC 4626103C */ c.lt.d $f2, $f6 -/* 0195B0 800189B0 3C01800E */ lui $at, %hi(D_800E562C) # $at, 0x800e +/* 0195B0 800189B0 3C01800E */ lui $at, %hi(D_800E5628 + 4) # $at, 0x800e /* 0195B4 800189B4 45000003 */ bc1f .L800189C4 /* 0195B8 800189B8 00000000 */ nop /* 0195BC 800189BC 100000A6 */ b .L80018C58 /* 0195C0 800189C0 2402FF9C */ li $v0, -100 .L800189C4: /* 0195C4 800189C4 C4255628 */ lwc1 $f5, %lo(D_800E5628)($at) -/* 0195C8 800189C8 C424562C */ lwc1 $f4, %lo(D_800E562C)($at) +/* 0195C8 800189C8 C424562C */ lwc1 $f4, %lo(D_800E5628 + 4)($at) /* 0195CC 800189CC 00000000 */ nop /* 0195D0 800189D0 4622203C */ c.lt.d $f4, $f2 /* 0195D4 800189D4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001955C.s b/asm/non_matchings/unknown_00BC20/func_8001955C.s index f2b5cef5..2dfd8db8 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001955C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001955C.s @@ -124,13 +124,13 @@ glabel func_8001955C /* 01A318 80019718 0C0326B4 */ jal sqrtf /* 01A31C 8001971C 46123300 */ add.s $f12, $f6, $f18 /* 01A320 80019720 44802000 */ mtc1 $zero, $f4 -/* 01A324 80019724 3C01800E */ lui $at, %hi(D_800E5634) # $at, 0x800e +/* 01A324 80019724 3C01800E */ lui $at, %hi(D_800E5630 + 4) # $at, 0x800e /* 01A328 80019728 46040032 */ c.eq.s $f0, $f4 /* 01A32C 8001972C 00000000 */ nop /* 01A330 80019730 45010011 */ bc1t .L80019778 /* 01A334 80019734 00000000 */ nop /* 01A338 80019738 C4295630 */ lwc1 $f9, %lo(D_800E5630)($at) -/* 01A33C 8001973C C4285634 */ lwc1 $f8, %lo(D_800E5634)($at) +/* 01A33C 8001973C C4285634 */ lwc1 $f8, %lo(D_800E5630 + 4)($at) /* 01A340 80019740 460002A1 */ cvt.d.s $f10, $f0 /* 01A344 80019744 00000000 */ nop /* 01A348 80019748 462A4183 */ div.d $f6, $f8, $f10 diff --git a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s index ed14d98e..447e4b4b 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s @@ -38,10 +38,10 @@ glabel func_8001C6C4 /* 01D324 8001C724 AFA600F0 */ sw $a2, 0xf0($sp) /* 01D328 8001C728 15C00009 */ bnez $t6, .L8001C750 /* 01D32C 8001C72C AFA700F4 */ sw $a3, 0xf4($sp) -/* 01D330 8001C730 3C01800E */ lui $at, %hi(D_800E564C) # $at, 0x800e +/* 01D330 8001C730 3C01800E */ lui $at, %hi(D_800E5648 + 4) # $at, 0x800e /* 01D334 8001C734 C7A400F0 */ lwc1 $f4, 0xf0($sp) /* 01D338 8001C738 C4295648 */ lwc1 $f9, %lo(D_800E5648)($at) -/* 01D33C 8001C73C C428564C */ lwc1 $f8, %lo(D_800E564C)($at) +/* 01D33C 8001C73C C428564C */ lwc1 $f8, %lo(D_800E5648 + 4)($at) /* 01D340 8001C740 460021A1 */ cvt.d.s $f6, $f4 /* 01D344 8001C744 46283282 */ mul.d $f10, $f6, $f8 /* 01D348 8001C748 46205420 */ cvt.s.d $f16, $f10 @@ -208,9 +208,9 @@ glabel func_8001C6C4 /* 01D5AC 8001C9AC 46120032 */ c.eq.s $f0, $f18 /* 01D5B0 8001C9B0 460A5402 */ mul.s $f16, $f10, $f10 /* 01D5B4 8001C9B4 4501000D */ bc1t .L8001C9EC -/* 01D5B8 8001C9B8 3C01800E */ lui $at, %hi(D_800E565C) # $at, 0x800e +/* 01D5B8 8001C9B8 3C01800E */ lui $at, %hi(D_800E5658 + 4) # $at, 0x800e /* 01D5BC 8001C9BC C4295658 */ lwc1 $f9, %lo(D_800E5658)($at) -/* 01D5C0 8001C9C0 C428565C */ lwc1 $f8, %lo(D_800E565C)($at) +/* 01D5C0 8001C9C0 C428565C */ lwc1 $f8, %lo(D_800E5658 + 4)($at) /* 01D5C4 8001C9C4 46000121 */ cvt.d.s $f4, $f0 /* 01D5C8 8001C9C8 00000000 */ nop /* 01D5CC 8001C9CC 46244183 */ div.d $f6, $f8, $f4 diff --git a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s index e4176f0b..c8c7a36d 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s @@ -77,7 +77,7 @@ glabel func_8001EFA4 /* 01FCB0 8001F0B0 00000000 */ nop /* 01FCB4 8001F0B4 A60D0028 */ sh $t5, 0x28($s0) /* 01FCB8 8001F0B8 822E0014 */ lb $t6, 0x14($s1) -/* 01FCBC 8001F0BC C430566C */ lwc1 $f16, %lo(D_800E566C)($at) +/* 01FCBC 8001F0BC C430566C */ lwc1 $f16, %lo(D_800E5668 + 4)($at) /* 01FCC0 8001F0C0 448E3000 */ mtc1 $t6, $f6 /* 01FCC4 8001F0C4 C4315668 */ lwc1 $f17, %lo(D_800E5668)($at) /* 01FCC8 8001F0C8 46803220 */ cvt.s.w $f8, $f6 diff --git a/asm/non_matchings/unknown_00BC20/func_8001F460.s b/asm/non_matchings/unknown_00BC20/func_8001F460.s index 3895b23e..585f2357 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F460.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F460.s @@ -43,14 +43,14 @@ glabel func_8001F460 /* 0200D4 8001F4D4 44992000 */ mtc1 $t9, $f4 /* 0200D8 8001F4D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0200DC 8001F4DC 46802020 */ cvt.s.w $f0, $f4 -/* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5674) # $at, 0x800e +/* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5670 + 4) # $at, 0x800e /* 0200E4 8001F4E4 00008025 */ move $s0, $zero /* 0200E8 8001F4E8 E7A00114 */ swc1 $f0, 0x114($sp) /* 0200EC 8001F4EC 8ED30064 */ lw $s3, 0x64($s6) /* 0200F0 8001F4F0 15C00007 */ bnez $t6, .L8001F510 /* 0200F4 8001F4F4 24110004 */ li $s1, 4 /* 0200F8 8001F4F8 C4295670 */ lwc1 $f9, %lo(D_800E5670)($at) -/* 0200FC 8001F4FC C4285674 */ lwc1 $f8, %lo(D_800E5674)($at) +/* 0200FC 8001F4FC C4285674 */ lwc1 $f8, %lo(D_800E5670 + 4)($at) /* 020100 8001F500 460001A1 */ cvt.d.s $f6, $f0 /* 020104 8001F504 46283282 */ mul.d $f10, $f6, $f8 /* 020108 8001F508 46205120 */ cvt.s.d $f4, $f10 @@ -1720,11 +1720,11 @@ glabel func_8001F460 /* 021970 80020D70 030FC821 */ addu $t9, $t8, $t7 /* 021974 80020D74 032EC021 */ addu $t8, $t9, $t6 /* 021978 80020D78 8F0F0000 */ lw $t7, ($t8) -/* 02197C 80020D7C 3C01800E */ lui $at, %hi(D_800E5684) # $at, 0x800e +/* 02197C 80020D7C 3C01800E */ lui $at, %hi(D_800E5680 + 4) # $at, 0x800e /* 021980 80020D80 8DF1003C */ lw $s1, 0x3c($t7) /* 021984 80020D84 C4215680 */ lwc1 $f1, %lo(D_800E5680)($at) /* 021988 80020D88 82390014 */ lb $t9, 0x14($s1) -/* 02198C 80020D8C C4205684 */ lwc1 $f0, %lo(D_800E5684)($at) +/* 02198C 80020D8C C4205684 */ lwc1 $f0, %lo(D_800E5680 + 4)($at) /* 021990 80020D90 44995000 */ mtc1 $t9, $f10 /* 021994 80020D94 00000000 */ nop /* 021998 80020D98 46805220 */ cvt.s.w $f8, $f10 diff --git a/asm/non_matchings/unknown_0255E0/func_8002581C.s b/asm/non_matchings/unknown_0255E0/func_8002581C.s index 6013280d..04ca0f70 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002581C.s +++ b/asm/non_matchings/unknown_0255E0/func_8002581C.s @@ -64,9 +64,9 @@ glabel func_8002581C /* 026500 80025900 0004C400 */ sll $t8, $a0, 0x10 /* 026504 80025904 0C01C1FE */ jal func_800707F8 /* 026508 80025908 00182403 */ sra $a0, $t8, 0x10 -/* 02650C 8002590C 3C01800E */ lui $at, %hi(D_800E5E64) # $at, 0x800e +/* 02650C 8002590C 3C01800E */ lui $at, %hi(D_800E5E60 + 4) # $at, 0x800e /* 026510 80025910 C42F5E60 */ lwc1 $f15, %lo(D_800E5E60)($at) -/* 026514 80025914 C42E5E64 */ lwc1 $f14, %lo(D_800E5E64)($at) +/* 026514 80025914 C42E5E64 */ lwc1 $f14, %lo(D_800E5E60 + 4)($at) /* 026518 80025918 4600D221 */ cvt.d.s $f8, $f26 /* 02651C 8002591C 462E4282 */ mul.d $f10, $f8, $f14 /* 026520 80025920 8E020000 */ lw $v0, ($s0) diff --git a/asm/non_matchings/unknown_0255E0/func_80026070.s b/asm/non_matchings/unknown_0255E0/func_80026070.s index 61967b04..c5646d1b 100644 --- a/asm/non_matchings/unknown_0255E0/func_80026070.s +++ b/asm/non_matchings/unknown_0255E0/func_80026070.s @@ -169,7 +169,7 @@ glabel func_80026070 /* 026EDC 800262DC 46061282 */ mul.s $f10, $f2, $f6 /* 026EE0 800262E0 C7A60050 */ lwc1 $f6, 0x50($sp) /* 026EE4 800262E4 C42CD4A8 */ lwc1 $f12, %lo(D_8011D4A8)($at) -/* 026EE8 800262E8 3C01800E */ lui $at, %hi(D_800E5E6C) # $at, 0x800e +/* 026EE8 800262E8 3C01800E */ lui $at, %hi(D_800E5E68 + 4) # $at, 0x800e /* 026EEC 800262EC 460A4100 */ add.s $f4, $f8, $f10 /* 026EF0 800262F0 C7AA0058 */ lwc1 $f10, 0x58($sp) /* 026EF4 800262F4 46003202 */ mul.s $f8, $f6, $f0 @@ -186,14 +186,14 @@ glabel func_80026070 /* 026F20 80026320 46007486 */ mov.s $f18, $f14 .L80026324: /* 026F24 80026324 C42D5E68 */ lwc1 $f13, %lo(D_800E5E68)($at) -/* 026F28 80026328 C42C5E6C */ lwc1 $f12, %lo(D_800E5E6C)($at) +/* 026F28 80026328 C42C5E6C */ lwc1 $f12, %lo(D_800E5E68 + 4)($at) /* 026F2C 8002632C 46009021 */ cvt.d.s $f0, $f18 /* 026F30 80026330 462C003C */ c.lt.d $f0, $f12 -/* 026F34 80026334 3C01800E */ lui $at, %hi(D_800E5E74) # $at, 0x800e +/* 026F34 80026334 3C01800E */ lui $at, %hi(D_800E5E70 + 4) # $at, 0x800e /* 026F38 80026338 45010038 */ bc1t .L8002641C /* 026F3C 8002633C E7B20064 */ swc1 $f18, 0x64($sp) /* 026F40 80026340 C42F5E70 */ lwc1 $f15, %lo(D_800E5E70)($at) -/* 026F44 80026344 C42E5E74 */ lwc1 $f14, %lo(D_800E5E74)($at) +/* 026F44 80026344 C42E5E74 */ lwc1 $f14, %lo(D_800E5E70 + 4)($at) /* 026F48 80026348 460080A1 */ cvt.d.s $f2, $f16 /* 026F4C 8002634C 4622703C */ c.lt.d $f14, $f2 /* 026F50 80026350 E7B00060 */ swc1 $f16, 0x60($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_80026430.s b/asm/non_matchings/unknown_0255E0/func_80026430.s index 34a25dd3..94f0bde6 100644 --- a/asm/non_matchings/unknown_0255E0/func_80026430.s +++ b/asm/non_matchings/unknown_0255E0/func_80026430.s @@ -43,11 +43,11 @@ glabel func_80026430 /* 0270B0 800264B0 E7B4001C */ swc1 $f20, 0x1c($sp) /* 0270B4 800264B4 A7A0010E */ sh $zero, 0x10e($sp) /* 0270B8 800264B8 84840020 */ lh $a0, 0x20($a0) -/* 0270BC 800264BC 3C01800E */ lui $at, %hi(D_800E5E7C) # $at, 0x800e +/* 0270BC 800264BC 3C01800E */ lui $at, %hi(D_800E5E78 + 4) # $at, 0x800e /* 0270C0 800264C0 188001BC */ blez $a0, .L80026BB4 /* 0270C4 800264C4 27BE00B8 */ addiu $fp, $sp, 0xb8 /* 0270C8 800264C8 C43F5E78 */ lwc1 $f31, %lo(D_800E5E78)($at) -/* 0270CC 800264CC C43E5E7C */ lwc1 $f30, %lo(D_800E5E7C)($at) +/* 0270CC 800264CC C43E5E7C */ lwc1 $f30, %lo(D_800E5E78 + 4)($at) /* 0270D0 800264D0 4480A800 */ mtc1 $zero, $f21 /* 0270D4 800264D4 4480A000 */ mtc1 $zero, $f20 /* 0270D8 800264D8 27B500D0 */ addiu $s5, $sp, 0xd0 @@ -243,7 +243,7 @@ glabel func_80026430 /* 0273A8 800267A8 C7A00094 */ lwc1 $f0, 0x94($sp) /* 0273AC 800267AC 460E3202 */ mul.s $f8, $f6, $f14 /* 0273B0 800267B0 C7A400B0 */ lwc1 $f4, 0xb0($sp) -/* 0273B4 800267B4 3C01800E */ lui $at, %hi(D_800E5E84) # $at, 0x800e +/* 0273B4 800267B4 3C01800E */ lui $at, %hi(D_800E5E80 + 4) # $at, 0x800e /* 0273B8 800267B8 00008025 */ move $s0, $zero /* 0273BC 800267BC 46040282 */ mul.s $f10, $f0, $f4 /* 0273C0 800267C0 C7A400AC */ lwc1 $f4, 0xac($sp) @@ -258,7 +258,7 @@ glabel func_80026430 /* 0273E4 800267E4 460A0182 */ mul.s $f6, $f0, $f10 /* 0273E8 800267E8 C7AA00C4 */ lwc1 $f10, 0xc4($sp) /* 0273EC 800267EC 46064100 */ add.s $f4, $f8, $f6 -/* 0273F0 800267F0 C4285E84 */ lwc1 $f8, %lo(D_800E5E84)($at) +/* 0273F0 800267F0 C4285E84 */ lwc1 $f8, %lo(D_800E5E80 + 4)($at) /* 0273F4 800267F4 46005021 */ cvt.d.s $f0, $f10 /* 0273F8 800267F8 4628003C */ c.lt.d $f0, $f8 /* 0273FC 800267FC 46162300 */ add.s $f12, $f4, $f22 @@ -271,13 +271,13 @@ glabel func_80026430 /* 027414 80026814 4620F03C */ c.lt.d $f30, $f0 /* 027418 80026818 C7A600C8 */ lwc1 $f6, 0xc8($sp) /* 02741C 8002681C 45000004 */ bc1f .L80026830 -/* 027420 80026820 3C01800E */ lui $at, %hi(D_800E5E8C) # $at, 0x800e +/* 027420 80026820 3C01800E */ lui $at, %hi(D_800E5E88 + 4) # $at, 0x800e /* 027424 80026824 344E0002 */ ori $t6, $v0, 2 /* 027428 80026828 000EC600 */ sll $t8, $t6, 0x18 /* 02742C 8002682C 00181603 */ sra $v0, $t8, 0x18 .L80026830: /* 027430 80026830 C4255E88 */ lwc1 $f5, %lo(D_800E5E88)($at) -/* 027434 80026834 C4245E8C */ lwc1 $f4, %lo(D_800E5E8C)($at) +/* 027434 80026834 C4245E8C */ lwc1 $f4, %lo(D_800E5E88 + 4)($at) /* 027438 80026838 46003021 */ cvt.d.s $f0, $f6 /* 02743C 8002683C 4624003C */ c.lt.d $f0, $f4 /* 027440 80026840 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_80027568.s b/asm/non_matchings/unknown_0255E0/func_80027568.s index b064a279..8883023f 100644 --- a/asm/non_matchings/unknown_0255E0/func_80027568.s +++ b/asm/non_matchings/unknown_0255E0/func_80027568.s @@ -134,7 +134,7 @@ glabel func_80027568 /* 028338 80027738 E7A0005C */ swc1 $f0, 0x5c($sp) /* 02833C 8002773C 46003221 */ cvt.d.s $f8, $f6 /* 028340 80027740 462A4101 */ sub.d $f4, $f8, $f10 -/* 028344 80027744 C4285E94 */ lwc1 $f8, %lo(D_800E5E94)($at) +/* 028344 80027744 C4285E94 */ lwc1 $f8, %lo(D_800E5E90 + 4)($at) /* 028348 80027748 46202320 */ cvt.s.d $f12, $f4 /* 02834C 8002774C C4295E90 */ lwc1 $f9, %lo(D_800E5E90)($at) /* 028350 80027750 460061A1 */ cvt.d.s $f6, $f12 @@ -146,7 +146,7 @@ glabel func_80027568 /* 028368 80027768 C5700010 */ lwc1 $f16, 0x10($t3) /* 02836C 8002776C 46027282 */ mul.s $f10, $f14, $f2 /* 028370 80027770 C5720014 */ lwc1 $f18, 0x14($t3) -/* 028374 80027774 3C01800E */ lui $at, %hi(D_800E5E9C) # $at, 0x800e +/* 028374 80027774 3C01800E */ lui $at, %hi(D_800E5E98 + 4) # $at, 0x800e /* 028378 80027778 00001025 */ move $v0, $zero /* 02837C 8002777C 4610A102 */ mul.s $f4, $f20, $f16 /* 028380 80027780 00000000 */ nop @@ -154,7 +154,7 @@ glabel func_80027568 /* 028388 80027788 46045180 */ add.s $f6, $f10, $f4 /* 02838C 8002778C C4275E98 */ lwc1 $f7, %lo(D_800E5E98)($at) /* 028390 80027790 46083280 */ add.s $f10, $f6, $f8 -/* 028394 80027794 C4265E9C */ lwc1 $f6, %lo(D_800E5E9C)($at) +/* 028394 80027794 C4265E9C */ lwc1 $f6, %lo(D_800E5E98 + 4)($at) /* 028398 80027798 46185000 */ add.s $f0, $f10, $f24 /* 02839C 8002779C C7A8005C */ lwc1 $f8, 0x5c($sp) /* 0283A0 800277A0 46000121 */ cvt.d.s $f4, $f0 diff --git a/asm/non_matchings/unknown_0255E0/func_80028FAC.s b/asm/non_matchings/unknown_0255E0/func_80028FAC.s index 69e0bce7..aab03875 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028FAC.s +++ b/asm/non_matchings/unknown_0255E0/func_80028FAC.s @@ -153,7 +153,7 @@ glabel func_80028FAC /* 029DC0 800291C0 10400033 */ beqz $v0, .L80029290 /* 029DC4 800291C4 8FA3016C */ lw $v1, 0x16c($sp) /* 029DC8 800291C8 8639002E */ lh $t9, 0x2e($s1) -/* 029DCC 800291CC 3C01800E */ lui $at, %hi(D_800E5EA4) # $at, 0x800e +/* 029DCC 800291CC 3C01800E */ lui $at, %hi(D_800E5EA0 + 4) # $at, 0x800e /* 029DD0 800291D0 02D94021 */ addu $t0, $s6, $t9 /* 029DD4 800291D4 910A0001 */ lbu $t2, 1($t0) /* 029DD8 800291D8 00000000 */ nop @@ -161,7 +161,7 @@ glabel func_80028FAC /* 029DE0 800291E0 00000000 */ nop /* 029DE4 800291E4 C6260034 */ lwc1 $f6, 0x34($s1) /* 029DE8 800291E8 C4255EA0 */ lwc1 $f5, %lo(D_800E5EA0)($at) -/* 029DEC 800291EC C4245EA4 */ lwc1 $f4, %lo(D_800E5EA4)($at) +/* 029DEC 800291EC C4245EA4 */ lwc1 $f4, %lo(D_800E5EA0 + 4)($at) /* 029DF0 800291F0 46003221 */ cvt.d.s $f8, $f6 /* 029DF4 800291F4 4628203C */ c.lt.d $f4, $f8 /* 029DF8 800291F8 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s index 00355b84..a7672b2d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s @@ -181,10 +181,10 @@ glabel func_8002A5F8 /* 02B480 8002A880 3C028012 */ lui $v0, %hi(D_8011D380) # $v0, 0x8012 /* 02B484 8002A884 2442D380 */ addiu $v0, %lo(D_8011D380) # addiu $v0, $v0, -0x2c80 /* 02B488 8002A888 E4400000 */ swc1 $f0, ($v0) -/* 02B48C 8002A88C 3C01800E */ lui $at, %hi(D_800E5EAC) # $at, 0x800e +/* 02B48C 8002A88C 3C01800E */ lui $at, %hi(D_800E5EA8 + 4) # $at, 0x800e /* 02B490 8002A890 C4460000 */ lwc1 $f6, ($v0) /* 02B494 8002A894 C42B5EA8 */ lwc1 $f11, %lo(D_800E5EA8)($at) -/* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EAC)($at) +/* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EA8 + 4)($at) /* 02B49C 8002A89C 46003221 */ cvt.d.s $f8, $f6 /* 02B4A0 8002A8A0 462A403C */ c.lt.d $f8, $f10 /* 02B4A4 8002A8A4 3C018012 */ lui $at, %hi(D_8011B0BC) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_0255E0/func_8002A900.s b/asm/non_matchings/unknown_0255E0/func_8002A900.s index c752834e..b090a238 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A900.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A900.s @@ -63,7 +63,7 @@ glabel func_8002A900 /* 02B5CC 8002A9CC 44833000 */ mtc1 $v1, $f6 /* 02B5D0 8002A9D0 8FA5003C */ lw $a1, 0x3c($sp) /* 02B5D4 8002A9D4 46803320 */ cvt.s.w $f12, $f6 -/* 02B5D8 8002A9D8 3C01800E */ lui $at, %hi(D_800E5EB4) # $at, 0x800e +/* 02B5D8 8002A9D8 3C01800E */ lui $at, %hi(D_800E5EB0 + 4) # $at, 0x800e /* 02B5DC 8002A9DC 4600603C */ c.lt.s $f12, $f0 /* 02B5E0 8002A9E0 00000000 */ nop /* 02B5E4 8002A9E4 45000003 */ bc1f .L8002A9F4 @@ -74,7 +74,7 @@ glabel func_8002A900 /* 02B5F4 8002A9F4 44834000 */ mtc1 $v1, $f8 /* 02B5F8 8002A9F8 C4255EB0 */ lwc1 $f5, %lo(D_800E5EB0)($at) /* 02B5FC 8002A9FC 468042A1 */ cvt.d.w $f10, $f8 -/* 02B600 8002AA00 C4245EB4 */ lwc1 $f4, %lo(D_800E5EB4)($at) +/* 02B600 8002AA00 C4245EB4 */ lwc1 $f4, %lo(D_800E5EB0 + 4)($at) /* 02B604 8002AA04 00000000 */ nop /* 02B608 8002AA08 46245182 */ mul.d $f6, $f10, $f4 /* 02B60C 8002AA0C 462030A0 */ cvt.s.d $f2, $f6 @@ -104,7 +104,7 @@ glabel func_8002A900 /* 02B66C 8002AA6C 3C01800E */ lui $at, %hi(D_800E5EB8) # $at, 0x800e /* 02B670 8002AA70 460051A1 */ cvt.d.s $f6, $f10 /* 02B674 8002AA74 46262201 */ sub.d $f8, $f4, $f6 -/* 02B678 8002AA78 C4265EBC */ lwc1 $f6, %lo(D_800E5EBC)($at) +/* 02B678 8002AA78 C4265EBC */ lwc1 $f6, %lo(D_800E5EB8 + 4)($at) /* 02B67C 8002AA7C 462042A0 */ cvt.s.d $f10, $f8 /* 02B680 8002AA80 C4275EB8 */ lwc1 $f7, %lo(D_800E5EB8)($at) /* 02B684 8002AA84 46005121 */ cvt.d.s $f4, $f10 diff --git a/asm/non_matchings/unknown_0255E0/func_8002DE30.s b/asm/non_matchings/unknown_0255E0/func_8002DE30.s index a6d02aad..810d1f7d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002DE30.s +++ b/asm/non_matchings/unknown_0255E0/func_8002DE30.s @@ -104,9 +104,9 @@ glabel func_8002DE30 /* 02EBB4 8002DFB4 00005025 */ move $t2, $zero /* 02EBB8 8002DFB8 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 02EBBC 8002DFBC 4481B000 */ mtc1 $at, $f22 -/* 02EBC0 8002DFC0 3C01800E */ lui $at, %hi(D_800E5F44) # $at, 0x800e +/* 02EBC0 8002DFC0 3C01800E */ lui $at, %hi(D_800E5F40 + 4) # $at, 0x800e /* 02EBC4 8002DFC4 C4355F40 */ lwc1 $f21, %lo(D_800E5F40)($at) -/* 02EBC8 8002DFC8 C4345F44 */ lwc1 $f20, %lo(D_800E5F44)($at) +/* 02EBC8 8002DFC8 C4345F44 */ lwc1 $f20, %lo(D_800E5F40 + 4)($at) /* 02EBCC 8002DFCC 8EA2000C */ lw $v0, 0xc($s5) /* 02EBD0 8002DFD0 24120003 */ li $s2, 3 /* 02EBD4 8002DFD4 2411000A */ li $s1, 10 diff --git a/asm/non_matchings/unknown_032760/func_80033F60.s b/asm/non_matchings/unknown_032760/func_80033F60.s index 6a16baf0..f16888ac 100644 --- a/asm/non_matchings/unknown_032760/func_80033F60.s +++ b/asm/non_matchings/unknown_032760/func_80033F60.s @@ -20,9 +20,9 @@ glabel func_80033F60 /* 034B84 80033F84 00808025 */ move $s0, $a0 /* 034B88 80033F88 15E00008 */ bnez $t7, .L80033FAC /* 034B8C 80033F8C E7A0007C */ swc1 $f0, 0x7c($sp) -/* 034B90 80033F90 3C01800E */ lui $at, %hi(D_800E5FE4) # $at, 0x800e +/* 034B90 80033F90 3C01800E */ lui $at, %hi(D_800E5FE0 + 4) # $at, 0x800e /* 034B94 80033F94 C4295FE0 */ lwc1 $f9, %lo(D_800E5FE0)($at) -/* 034B98 80033F98 C4285FE4 */ lwc1 $f8, %lo(D_800E5FE4)($at) +/* 034B98 80033F98 C4285FE4 */ lwc1 $f8, %lo(D_800E5FE0 + 4)($at) /* 034B9C 80033F9C 460001A1 */ cvt.d.s $f6, $f0 /* 034BA0 80033FA0 46283282 */ mul.d $f10, $f6, $f8 /* 034BA4 80033FA4 46205120 */ cvt.s.d $f4, $f10 @@ -55,10 +55,10 @@ glabel func_80033F60 .L8003400C: /* 034C0C 8003400C C466000C */ lwc1 $f6, 0xc($v1) /* 034C10 80034010 C608000C */ lwc1 $f8, 0xc($s0) -/* 034C14 80034014 3C01800E */ lui $at, %hi(D_800E5FEC) # $at, 0x800e +/* 034C14 80034014 3C01800E */ lui $at, %hi(D_800E5FE8 + 4) # $at, 0x800e /* 034C18 80034018 46083281 */ sub.s $f10, $f6, $f8 /* 034C1C 8003401C C4335FE8 */ lwc1 $f19, %lo(D_800E5FE8)($at) -/* 034C20 80034020 C4325FEC */ lwc1 $f18, %lo(D_800E5FEC)($at) +/* 034C20 80034020 C4325FEC */ lwc1 $f18, %lo(D_800E5FE8 + 4)($at) /* 034C24 80034024 46005121 */ cvt.d.s $f4, $f10 /* 034C28 80034028 46322182 */ mul.d $f6, $f4, $f18 /* 034C2C 8003402C 3C014024 */ li $at, 0x40240000 # 2.562500 @@ -332,10 +332,10 @@ glabel func_80033F60 /* 03502C 8003442C 0C00FF11 */ jal func_8003FC44 /* 035030 80034430 E7A80014 */ swc1 $f8, 0x14($sp) .L80034434: -/* 035034 80034434 3C01800E */ lui $at, %hi(D_800E5FF4) # $at, 0x800e +/* 035034 80034434 3C01800E */ lui $at, %hi(D_800E5FF0 + 4) # $at, 0x800e /* 035038 80034438 C60A0008 */ lwc1 $f10, 8($s0) /* 03503C 8003443C C4275FF0 */ lwc1 $f7, %lo(D_800E5FF0)($at) -/* 035040 80034440 C4265FF4 */ lwc1 $f6, %lo(D_800E5FF4)($at) +/* 035040 80034440 C4265FF4 */ lwc1 $f6, %lo(D_800E5FF0 + 4)($at) /* 035044 80034444 46005121 */ cvt.d.s $f4, $f10 /* 035048 80034448 46262202 */ mul.d $f8, $f4, $f6 /* 03504C 8003444C 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 diff --git a/asm/non_matchings/unknown_032760/func_80034860.s b/asm/non_matchings/unknown_032760/func_80034860.s index 7ef7f2fd..15263e57 100644 --- a/asm/non_matchings/unknown_032760/func_80034860.s +++ b/asm/non_matchings/unknown_032760/func_80034860.s @@ -18,9 +18,9 @@ glabel func_80034860 /* 035484 80034884 00004025 */ move $t0, $zero /* 035488 80034888 15E00007 */ bnez $t7, .L800348A8 /* 03548C 8003488C 46001006 */ mov.s $f0, $f2 -/* 035490 80034890 3C01800E */ lui $at, %hi(D_800E5FFC) # $at, 0x800e +/* 035490 80034890 3C01800E */ lui $at, %hi(D_800E5FF8 + 4) # $at, 0x800e /* 035494 80034894 C4295FF8 */ lwc1 $f9, %lo(D_800E5FF8)($at) -/* 035498 80034898 C4285FFC */ lwc1 $f8, %lo(D_800E5FFC)($at) +/* 035498 80034898 C4285FFC */ lwc1 $f8, %lo(D_800E5FF8 + 4)($at) /* 03549C 8003489C 460011A1 */ cvt.d.s $f6, $f2 /* 0354A0 800348A0 46283282 */ mul.d $f10, $f6, $f8 /* 0354A4 800348A4 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80035260.s b/asm/non_matchings/unknown_032760/func_80035260.s index 9eef6a6b..6531724f 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/func_80035260.s @@ -20,9 +20,9 @@ glabel func_80035260 /* 035E84 80035284 00808025 */ move $s0, $a0 /* 035E88 80035288 15C00007 */ bnez $t6, .L800352A8 /* 035E8C 8003528C 46001006 */ mov.s $f0, $f2 -/* 035E90 80035290 3C01800E */ lui $at, %hi(D_800E6014) # $at, 0x800e +/* 035E90 80035290 3C01800E */ lui $at, %hi(D_800E6010 + 4) # $at, 0x800e /* 035E94 80035294 C4296010 */ lwc1 $f9, %lo(D_800E6010)($at) -/* 035E98 80035298 C4286014 */ lwc1 $f8, %lo(D_800E6014)($at) +/* 035E98 80035298 C4286014 */ lwc1 $f8, %lo(D_800E6010 + 4)($at) /* 035E9C 8003529C 460011A1 */ cvt.d.s $f6, $f2 /* 035EA0 800352A0 46283282 */ mul.d $f10, $f6, $f8 /* 035EA4 800352A4 46205020 */ cvt.s.d $f0, $f10 @@ -88,10 +88,10 @@ glabel func_80035260 /* 035F88 80035388 C606000C */ lwc1 $f6, 0xc($s0) /* 035F8C 8003538C C7A00038 */ lwc1 $f0, 0x38($sp) /* 035F90 80035390 46068101 */ sub.s $f4, $f16, $f6 -/* 035F94 80035394 3C01800E */ lui $at, %hi(D_800E601C) # $at, 0x800e +/* 035F94 80035394 3C01800E */ lui $at, %hi(D_800E6018 + 4) # $at, 0x800e /* 035F98 80035398 46002283 */ div.s $f10, $f4, $f0 /* 035F9C 8003539C C4236018 */ lwc1 $f3, %lo(D_800E6018)($at) -/* 035FA0 800353A0 C422601C */ lwc1 $f2, %lo(D_800E601C)($at) +/* 035FA0 800353A0 C422601C */ lwc1 $f2, %lo(D_800E6018 + 4)($at) /* 035FA4 800353A4 C6120010 */ lwc1 $f18, 0x10($s0) /* 035FA8 800353A8 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 035FAC 800353AC E60A001C */ swc1 $f10, 0x1c($s0) @@ -131,7 +131,7 @@ glabel func_80035260 /* 036034 80035434 E612001C */ swc1 $f18, 0x1c($s0) /* 036038 80035438 462022A0 */ cvt.s.d $f10, $f4 /* 03603C 8003543C E60A0024 */ swc1 $f10, 0x24($s0) -/* 036040 80035440 C4306024 */ lwc1 $f16, %lo(D_800E6024)($at) +/* 036040 80035440 C4306024 */ lwc1 $f16, %lo(D_800E6020 + 4)($at) /* 036044 80035444 C4316020 */ lwc1 $f17, %lo(D_800E6020)($at) /* 036048 80035448 460044A1 */ cvt.d.s $f18, $f8 /* 03604C 8003544C 46309182 */ mul.d $f6, $f18, $f16 diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/func_800361E0.s index d4d9789e..ac2666b8 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/func_800361E0.s @@ -24,9 +24,9 @@ glabel func_800361E0 /* 036E0C 8003620C 46000086 */ mov.s $f2, $f0 /* 036E10 80036210 15E00007 */ bnez $t7, .L80036230 /* 036E14 80036214 E7A4006C */ swc1 $f4, 0x6c($sp) -/* 036E18 80036218 3C01800E */ lui $at, %hi(D_800E602C) # $at, 0x800e +/* 036E18 80036218 3C01800E */ lui $at, %hi(D_800E6028 + 4) # $at, 0x800e /* 036E1C 8003621C C42B6028 */ lwc1 $f11, %lo(D_800E6028)($at) -/* 036E20 80036220 C42A602C */ lwc1 $f10, %lo(D_800E602C)($at) +/* 036E20 80036220 C42A602C */ lwc1 $f10, %lo(D_800E6028 + 4)($at) /* 036E24 80036224 46000221 */ cvt.d.s $f8, $f0 /* 036E28 80036228 462A4482 */ mul.d $f18, $f8, $f10 /* 036E2C 8003622C 462090A0 */ cvt.s.d $f2, $f18 @@ -133,10 +133,10 @@ glabel func_800361E0 /* 036FAC 800363AC 8E0D0078 */ lw $t5, 0x78($s0) /* 036FB0 800363B0 8FA3005C */ lw $v1, 0x5c($sp) /* 036FB4 800363B4 15A00047 */ bnez $t5, .L800364D4 -/* 036FB8 800363B8 3C01800E */ lui $at, %hi(D_800E6034) # $at, 0x800e +/* 036FB8 800363B8 3C01800E */ lui $at, %hi(D_800E6030 + 4) # $at, 0x800e /* 036FBC 800363BC C7B20070 */ lwc1 $f18, 0x70($sp) /* 036FC0 800363C0 C42B6030 */ lwc1 $f11, %lo(D_800E6030)($at) -/* 036FC4 800363C4 C42A6034 */ lwc1 $f10, %lo(D_800E6034)($at) +/* 036FC4 800363C4 C42A6034 */ lwc1 $f10, %lo(D_800E6030 + 4)($at) /* 036FC8 800363C8 46009221 */ cvt.d.s $f8, $f18 /* 036FCC 800363CC 462A403C */ c.lt.d $f8, $f10 /* 036FD0 800363D0 00000000 */ nop @@ -407,10 +407,10 @@ glabel func_800361E0 /* 0373A4 800367A4 00000000 */ nop /* 0373A8 800367A8 24030010 */ li $v1, 16 .L800367AC: -/* 0373AC 800367AC 3C01800E */ lui $at, %hi(D_800E603C) # $at, 0x800e +/* 0373AC 800367AC 3C01800E */ lui $at, %hi(D_800E6038 + 4) # $at, 0x800e /* 0373B0 800367B0 0003C903 */ sra $t9, $v1, 4 /* 0373B4 800367B4 C4216038 */ lwc1 $f1, %lo(D_800E6038)($at) -/* 0373B8 800367B8 C420603C */ lwc1 $f0, %lo(D_800E603C)($at) +/* 0373B8 800367B8 C420603C */ lwc1 $f0, %lo(D_800E6038 + 4)($at) /* 0373BC 800367BC 00994021 */ addu $t0, $a0, $t9 /* 0373C0 800367C0 A6080000 */ sh $t0, ($s0) /* 0373C4 800367C4 C7B20078 */ lwc1 $f18, 0x78($sp) @@ -451,10 +451,10 @@ glabel func_800361E0 /* 03744C 8003684C 10000099 */ b .L80036AB4 /* 037450 80036850 C7AA006C */ lwc1 $f10, 0x6c($sp) .L80036854: -/* 037454 80036854 3C01800E */ lui $at, %hi(D_800E6044) # $at, 0x800e +/* 037454 80036854 3C01800E */ lui $at, %hi(D_800E6040 + 4) # $at, 0x800e /* 037458 80036858 C7A40078 */ lwc1 $f4, 0x78($sp) /* 03745C 8003685C C4216040 */ lwc1 $f1, %lo(D_800E6040)($at) -/* 037460 80036860 C4206044 */ lwc1 $f0, %lo(D_800E6044)($at) +/* 037460 80036860 C4206044 */ lwc1 $f0, %lo(D_800E6040 + 4)($at) /* 037464 80036864 460024A1 */ cvt.d.s $f18, $f4 /* 037468 80036868 46209202 */ mul.d $f8, $f18, $f0 /* 03746C 8003686C 240A0001 */ li $t2, 1 diff --git a/asm/non_matchings/unknown_032760/func_800389B8.s b/asm/non_matchings/unknown_032760/func_800389B8.s index f33667dc..406d5c38 100644 --- a/asm/non_matchings/unknown_032760/func_800389B8.s +++ b/asm/non_matchings/unknown_032760/func_800389B8.s @@ -12,9 +12,9 @@ glabel func_800389B8 /* 0395CC 800389CC AFBF0014 */ sw $ra, 0x14($sp) /* 0395D0 800389D0 15C00007 */ bnez $t6, .L800389F0 /* 0395D4 800389D4 46001006 */ mov.s $f0, $f2 -/* 0395D8 800389D8 3C01800E */ lui $at, %hi(D_800E6054) # $at, 0x800e +/* 0395D8 800389D8 3C01800E */ lui $at, %hi(D_800E6050 + 4) # $at, 0x800e /* 0395DC 800389DC C4296050 */ lwc1 $f9, %lo(D_800E6050)($at) -/* 0395E0 800389E0 C4286054 */ lwc1 $f8, %lo(D_800E6054)($at) +/* 0395E0 800389E0 C4286054 */ lwc1 $f8, %lo(D_800E6050 + 4)($at) /* 0395E4 800389E4 460011A1 */ cvt.d.s $f6, $f2 /* 0395E8 800389E8 46283282 */ mul.d $f10, $f6, $f8 /* 0395EC 800389EC 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80038AD4.s b/asm/non_matchings/unknown_032760/func_80038AD4.s index 1e4562ef..c1bb434f 100644 --- a/asm/non_matchings/unknown_032760/func_80038AD4.s +++ b/asm/non_matchings/unknown_032760/func_80038AD4.s @@ -12,9 +12,9 @@ glabel func_80038AD4 /* 0396E8 80038AE8 AFBF0014 */ sw $ra, 0x14($sp) /* 0396EC 80038AEC 15C00007 */ bnez $t6, .L80038B0C /* 0396F0 80038AF0 46001006 */ mov.s $f0, $f2 -/* 0396F4 80038AF4 3C01800E */ lui $at, %hi(D_800E605C) # $at, 0x800e +/* 0396F4 80038AF4 3C01800E */ lui $at, %hi(D_800E6058 + 4) # $at, 0x800e /* 0396F8 80038AF8 C4296058 */ lwc1 $f9, %lo(D_800E6058)($at) -/* 0396FC 80038AFC C428605C */ lwc1 $f8, %lo(D_800E605C)($at) +/* 0396FC 80038AFC C428605C */ lwc1 $f8, %lo(D_800E6058 + 4)($at) /* 039700 80038B00 460011A1 */ cvt.d.s $f6, $f2 /* 039704 80038B04 46283282 */ mul.d $f10, $f6, $f8 /* 039708 80038B08 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 9e814259..c7a5784d 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -35,9 +35,9 @@ glabel func_80039330 /* 039F60 80039360 46001006 */ mov.s $f0, $f2 /* 039F64 80039364 15E00007 */ bnez $t7, .L80039384 /* 039F68 80039368 E7A40098 */ swc1 $f4, 0x98($sp) -/* 039F6C 8003936C 3C01800E */ lui $at, %hi(D_800E6064) # $at, 0x800e +/* 039F6C 8003936C 3C01800E */ lui $at, %hi(D_800E6060 + 4) # $at, 0x800e /* 039F70 80039370 C42B6060 */ lwc1 $f11, %lo(D_800E6060)($at) -/* 039F74 80039374 C42A6064 */ lwc1 $f10, %lo(D_800E6064)($at) +/* 039F74 80039374 C42A6064 */ lwc1 $f10, %lo(D_800E6060 + 4)($at) /* 039F78 80039378 46001221 */ cvt.d.s $f8, $f2 /* 039F7C 8003937C 462A4402 */ mul.d $f16, $f8, $f10 /* 039F80 80039380 46208020 */ cvt.s.d $f0, $f16 @@ -103,10 +103,10 @@ glabel func_80039330 /* 03A064 80039464 8E190078 */ lw $t9, 0x78($s0) /* 03A068 80039468 00003025 */ move $a2, $zero /* 03A06C 8003946C 1720003C */ bnez $t9, .L80039560 -/* 03A070 80039470 3C01800E */ lui $at, %hi(D_800E606C) # $at, 0x800e +/* 03A070 80039470 3C01800E */ lui $at, %hi(D_800E6068 + 4) # $at, 0x800e /* 03A074 80039474 C7A6009C */ lwc1 $f6, 0x9c($sp) /* 03A078 80039478 C4316068 */ lwc1 $f17, %lo(D_800E6068)($at) -/* 03A07C 8003947C C430606C */ lwc1 $f16, %lo(D_800E606C)($at) +/* 03A07C 8003947C C430606C */ lwc1 $f16, %lo(D_800E6068 + 4)($at) /* 03A080 80039480 46003221 */ cvt.d.s $f8, $f6 /* 03A084 80039484 4630403C */ c.lt.d $f8, $f16 /* 03A088 80039488 00000000 */ nop @@ -567,7 +567,7 @@ glabel L80039AE0 /* 03A708 80039B08 462022A0 */ cvt.s.d $f10, $f4 /* 03A70C 80039B0C E62A0004 */ swc1 $f10, 4($s1) /* 03A710 80039B10 C6280004 */ lwc1 $f8, 4($s1) -/* 03A714 80039B14 C4326144 */ lwc1 $f18, %lo(D_800E6144)($at) +/* 03A714 80039B14 C4326144 */ lwc1 $f18, %lo(D_800E6140 + 4)($at) /* 03A718 80039B18 C4336140 */ lwc1 $f19, %lo(D_800E6140)($at) /* 03A71C 80039B1C 460041A1 */ cvt.d.s $f6, $f8 /* 03A720 80039B20 4626903C */ c.lt.d $f18, $f6 @@ -1415,10 +1415,10 @@ glabel L8003A5AC /* 03B360 8003A760 000F2403 */ sra $a0, $t7, 0x10 /* 03B364 8003A764 C7AC0048 */ lwc1 $f12, 0x48($sp) /* 03B368 8003A768 C7B200A8 */ lwc1 $f18, 0xa8($sp) -/* 03B36C 8003A76C 3C01800E */ lui $at, %hi(D_800E6154) # $at, 0x800e +/* 03B36C 8003A76C 3C01800E */ lui $at, %hi(D_800E6150 + 4) # $at, 0x800e /* 03B370 8003A770 46126402 */ mul.s $f16, $f12, $f18 /* 03B374 8003A774 C4236150 */ lwc1 $f3, %lo(D_800E6150)($at) -/* 03B378 8003A778 C4226154 */ lwc1 $f2, %lo(D_800E6154)($at) +/* 03B378 8003A778 C4226154 */ lwc1 $f2, %lo(D_800E6150 + 4)($at) /* 03B37C 8003A77C 02002025 */ move $a0, $s0 /* 03B380 8003A780 460082A1 */ cvt.d.s $f10, $f16 /* 03B384 8003A784 46225202 */ mul.d $f8, $f10, $f2 @@ -1433,11 +1433,11 @@ glabel L8003A5AC /* 03B3A8 8003A7A8 0C00455C */ jal func_80011570 /* 03B3AC 8003A7AC 00000000 */ nop /* 03B3B0 8003A7B0 8FB900B4 */ lw $t9, 0xb4($sp) -/* 03B3B4 8003A7B4 3C01800E */ lui $at, %hi(D_800E615C) # $at, 0x800e +/* 03B3B4 8003A7B4 3C01800E */ lui $at, %hi(D_800E6158 + 4) # $at, 0x800e /* 03B3B8 8003A7B8 44994000 */ mtc1 $t9, $f8 /* 03B3BC 8003A7BC C4276158 */ lwc1 $f7, %lo(D_800E6158)($at) /* 03B3C0 8003A7C0 46804121 */ cvt.d.w $f4, $f8 -/* 03B3C4 8003A7C4 C426615C */ lwc1 $f6, %lo(D_800E615C)($at) +/* 03B3C4 8003A7C4 C426615C */ lwc1 $f6, %lo(D_800E6158 + 4)($at) /* 03B3C8 8003A7C8 C6300004 */ lwc1 $f16, 4($s1) /* 03B3CC 8003A7CC 46262482 */ mul.d $f18, $f4, $f6 /* 03B3D0 8003A7D0 460082A1 */ cvt.d.s $f10, $f16 diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/func_8003B4BC.s index 4ca2c046..24d3ca79 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/func_8003B4BC.s @@ -16,9 +16,9 @@ glabel func_8003B4BC /* 03C0E0 8003B4E0 AFA50054 */ sw $a1, 0x54($sp) /* 03C0E4 8003B4E4 15E00007 */ bnez $t7, .L8003B504 /* 03C0E8 8003B4E8 46000086 */ mov.s $f2, $f0 -/* 03C0EC 8003B4EC 3C01800E */ lui $at, %hi(D_800E6164) # $at, 0x800e +/* 03C0EC 8003B4EC 3C01800E */ lui $at, %hi(D_800E6160 + 4) # $at, 0x800e /* 03C0F0 8003B4F0 C4296160 */ lwc1 $f9, %lo(D_800E6160)($at) -/* 03C0F4 8003B4F4 C4286164 */ lwc1 $f8, %lo(D_800E6164)($at) +/* 03C0F4 8003B4F4 C4286164 */ lwc1 $f8, %lo(D_800E6160 + 4)($at) /* 03C0F8 8003B4F8 460001A1 */ cvt.d.s $f6, $f0 /* 03C0FC 8003B4FC 46283282 */ mul.d $f10, $f6, $f8 /* 03C100 8003B500 462050A0 */ cvt.s.d $f2, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003B988.s b/asm/non_matchings/unknown_032760/func_8003B988.s index 3fe49df6..855d9eac 100644 --- a/asm/non_matchings/unknown_032760/func_8003B988.s +++ b/asm/non_matchings/unknown_032760/func_8003B988.s @@ -19,9 +19,9 @@ glabel func_8003B988 /* 03C5B0 8003B9B0 46000086 */ mov.s $f2, $f0 /* 03C5B4 8003B9B4 17000007 */ bnez $t8, .L8003B9D4 /* 03C5B8 8003B9B8 AFAE0034 */ sw $t6, 0x34($sp) -/* 03C5BC 8003B9BC 3C01800E */ lui $at, %hi(D_800E616C) # $at, 0x800e +/* 03C5BC 8003B9BC 3C01800E */ lui $at, %hi(D_800E6168 + 4) # $at, 0x800e /* 03C5C0 8003B9C0 C4296168 */ lwc1 $f9, %lo(D_800E6168)($at) -/* 03C5C4 8003B9C4 C428616C */ lwc1 $f8, %lo(D_800E616C)($at) +/* 03C5C4 8003B9C4 C428616C */ lwc1 $f8, %lo(D_800E6168 + 4)($at) /* 03C5C8 8003B9C8 460001A1 */ cvt.d.s $f6, $f0 /* 03C5CC 8003B9CC 46283282 */ mul.d $f10, $f6, $f8 /* 03C5D0 8003B9D0 462050A0 */ cvt.s.d $f2, $f10 @@ -324,10 +324,10 @@ glabel func_8003B988 /* 03CA1C 8003BE1C 2401FFFF */ li $at, -1 /* 03CA20 8003BE20 14C30015 */ bne $a2, $v1, .L8003BE78 /* 03CA24 8003BE24 00000000 */ nop -/* 03CA28 8003BE28 3C01800E */ lui $at, %hi(D_800E6174) # $at, 0x800e +/* 03CA28 8003BE28 3C01800E */ lui $at, %hi(D_800E6170 + 4) # $at, 0x800e /* 03CA2C 8003BE2C C5120000 */ lwc1 $f18, ($t0) /* 03CA30 8003BE30 C4276170 */ lwc1 $f7, %lo(D_800E6170)($at) -/* 03CA34 8003BE34 C4266174 */ lwc1 $f6, %lo(D_800E6174)($at) +/* 03CA34 8003BE34 C4266174 */ lwc1 $f6, %lo(D_800E6170 + 4)($at) /* 03CA38 8003BE38 C6100010 */ lwc1 $f16, 0x10($s0) /* 03CA3C 8003BE3C 46009121 */ cvt.d.s $f4, $f18 /* 03CA40 8003BE40 46262200 */ add.d $f8, $f4, $f6 diff --git a/asm/non_matchings/unknown_032760/func_8003CA68.s b/asm/non_matchings/unknown_032760/func_8003CA68.s index 7204ae6d..778100e7 100644 --- a/asm/non_matchings/unknown_032760/func_8003CA68.s +++ b/asm/non_matchings/unknown_032760/func_8003CA68.s @@ -17,9 +17,9 @@ glabel func_8003CA68 /* 03D690 8003CA90 00808025 */ move $s0, $a0 /* 03D694 8003CA94 15E00007 */ bnez $t7, .L8003CAB4 /* 03D698 8003CA98 46000306 */ mov.s $f12, $f0 -/* 03D69C 8003CA9C 3C01800E */ lui $at, %hi(D_800E617C) # $at, 0x800e +/* 03D69C 8003CA9C 3C01800E */ lui $at, %hi(D_800E6178 + 4) # $at, 0x800e /* 03D6A0 8003CAA0 C4296178 */ lwc1 $f9, %lo(D_800E6178)($at) -/* 03D6A4 8003CAA4 C428617C */ lwc1 $f8, %lo(D_800E617C)($at) +/* 03D6A4 8003CAA4 C428617C */ lwc1 $f8, %lo(D_800E6178 + 4)($at) /* 03D6A8 8003CAA8 460001A1 */ cvt.d.s $f6, $f0 /* 03D6AC 8003CAAC 46283282 */ mul.d $f10, $f6, $f8 /* 03D6B0 8003CAB0 46205320 */ cvt.s.d $f12, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003D2B8.s b/asm/non_matchings/unknown_032760/func_8003D2B8.s index cbc7533b..815b39aa 100644 --- a/asm/non_matchings/unknown_032760/func_8003D2B8.s +++ b/asm/non_matchings/unknown_032760/func_8003D2B8.s @@ -15,9 +15,9 @@ glabel func_8003D2B8 /* 03DED8 8003D2D8 AFA5002C */ sw $a1, 0x2c($sp) /* 03DEDC 8003D2DC 15E00007 */ bnez $t7, .L8003D2FC /* 03DEE0 8003D2E0 46001006 */ mov.s $f0, $f2 -/* 03DEE4 8003D2E4 3C01800E */ lui $at, %hi(D_800E618C) # $at, 0x800e +/* 03DEE4 8003D2E4 3C01800E */ lui $at, %hi(D_800E6188 + 4) # $at, 0x800e /* 03DEE8 8003D2E8 C4296188 */ lwc1 $f9, %lo(D_800E6188)($at) -/* 03DEEC 8003D2EC C428618C */ lwc1 $f8, %lo(D_800E618C)($at) +/* 03DEEC 8003D2EC C428618C */ lwc1 $f8, %lo(D_800E6188 + 4)($at) /* 03DEF0 8003D2F0 460011A1 */ cvt.d.s $f6, $f2 /* 03DEF4 8003D2F4 46283282 */ mul.d $f10, $f6, $f8 /* 03DEF8 8003D2F8 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/func_8003D5A0.s index 108cf425..d9adafde 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/func_8003D5A0.s @@ -19,9 +19,9 @@ glabel func_8003D5A0 /* 03E1C0 8003D5C0 AFA50074 */ sw $a1, 0x74($sp) /* 03E1C4 8003D5C4 15E00007 */ bnez $t7, .L8003D5E4 /* 03E1C8 8003D5C8 46001006 */ mov.s $f0, $f2 -/* 03E1CC 8003D5CC 3C01800E */ lui $at, %hi(D_800E6194) # $at, 0x800e +/* 03E1CC 8003D5CC 3C01800E */ lui $at, %hi(D_800E6190 + 4) # $at, 0x800e /* 03E1D0 8003D5D0 C4296190 */ lwc1 $f9, %lo(D_800E6190)($at) -/* 03E1D4 8003D5D4 C4286194 */ lwc1 $f8, %lo(D_800E6194)($at) +/* 03E1D4 8003D5D4 C4286194 */ lwc1 $f8, %lo(D_800E6190 + 4)($at) /* 03E1D8 8003D5D8 460011A1 */ cvt.d.s $f6, $f2 /* 03E1DC 8003D5DC 46283282 */ mul.d $f10, $f6, $f8 /* 03E1E0 8003D5E0 46205020 */ cvt.s.d $f0, $f10 @@ -154,9 +154,9 @@ glabel func_8003D5A0 /* 03E3CC 8003D7CC 818E0009 */ lb $t6, 9($t4) /* 03E3D0 8003D7D0 00000000 */ nop /* 03E3D4 8003D7D4 11C10016 */ beq $t6, $at, .L8003D830 -/* 03E3D8 8003D7D8 3C01800E */ lui $at, %hi(D_800E619C) # $at, 0x800e +/* 03E3D8 8003D7D8 3C01800E */ lui $at, %hi(D_800E6198 + 4) # $at, 0x800e /* 03E3DC 8003D7DC C4216198 */ lwc1 $f1, %lo(D_800E6198)($at) -/* 03E3E0 8003D7E0 C420619C */ lwc1 $f0, %lo(D_800E619C)($at) +/* 03E3E0 8003D7E0 C420619C */ lwc1 $f0, %lo(D_800E6198 + 4)($at) /* 03E3E4 8003D7E4 C60A0020 */ lwc1 $f10, 0x20($s0) /* 03E3E8 8003D7E8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 03E3EC 8003D7EC 44819800 */ mtc1 $at, $f19 diff --git a/asm/non_matchings/unknown_032760/func_8003E140.s b/asm/non_matchings/unknown_032760/func_8003E140.s index 043f429c..0d1d01ac 100644 --- a/asm/non_matchings/unknown_032760/func_8003E140.s +++ b/asm/non_matchings/unknown_032760/func_8003E140.s @@ -34,7 +34,7 @@ glabel func_8003E140 /* 03ED98 8003E198 462054A0 */ cvt.s.d $f18, $f10 /* 03ED9C 8003E19C E4920008 */ swc1 $f18, 8($a0) /* 03EDA0 8003E1A0 C4900008 */ lwc1 $f16, 8($a0) -/* 03EDA4 8003E1A4 C42661AC */ lwc1 $f6, %lo(D_800E61AC)($at) +/* 03EDA4 8003E1A4 C42661AC */ lwc1 $f6, %lo(D_800E61A8 + 4)($at) /* 03EDA8 8003E1A8 C42761A8 */ lwc1 $f7, %lo(D_800E61A8)($at) /* 03EDAC 8003E1AC 46008021 */ cvt.d.s $f0, $f16 /* 03EDB0 8003E1B0 4626003C */ c.lt.d $f0, $f6 @@ -48,9 +48,9 @@ glabel func_8003E140 /* 03EDD0 8003E1D0 00000000 */ nop /* 03EDD4 8003E1D4 46002021 */ cvt.d.s $f0, $f4 .L8003E1D8: -/* 03EDD8 8003E1D8 3C01800E */ lui $at, %hi(D_800E61BC) # $at, 0x800e +/* 03EDD8 8003E1D8 3C01800E */ lui $at, %hi(D_800E61B8 + 4) # $at, 0x800e /* 03EDDC 8003E1DC C42B61B8 */ lwc1 $f11, %lo(D_800E61B8)($at) -/* 03EDE0 8003E1E0 C42A61BC */ lwc1 $f10, %lo(D_800E61BC)($at) +/* 03EDE0 8003E1E0 C42A61BC */ lwc1 $f10, %lo(D_800E61B8 + 4)($at) /* 03EDE4 8003E1E4 02002025 */ move $a0, $s0 /* 03EDE8 8003E1E8 462A003C */ c.lt.d $f0, $f10 /* 03EDEC 8003E1EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index 87bd5787..ca434080 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -53,11 +53,11 @@ glabel func_8003E694 /* 03F34C 8003E74C 448B8000 */ mtc1 $t3, $f16 /* 03F350 8003E750 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 03F354 8003E754 46808020 */ cvt.s.w $f0, $f16 -/* 03F358 8003E758 3C01800E */ lui $at, %hi(D_800E61F4) # $at, 0x800e +/* 03F358 8003E758 3C01800E */ lui $at, %hi(D_800E61F0 + 4) # $at, 0x800e /* 03F35C 8003E75C 15800006 */ bnez $t4, .L8003E778 /* 03F360 8003E760 46000086 */ mov.s $f2, $f0 /* 03F364 8003E764 C42561F0 */ lwc1 $f5, %lo(D_800E61F0)($at) -/* 03F368 8003E768 C42461F4 */ lwc1 $f4, %lo(D_800E61F4)($at) +/* 03F368 8003E768 C42461F4 */ lwc1 $f4, %lo(D_800E61F0 + 4)($at) /* 03F36C 8003E76C 460004A1 */ cvt.d.s $f18, $f0 /* 03F370 8003E770 46249182 */ mul.d $f6, $f18, $f4 /* 03F374 8003E774 462030A0 */ cvt.s.d $f2, $f6 diff --git a/asm/non_matchings/unknown_032760/func_8003EDD8.s b/asm/non_matchings/unknown_032760/func_8003EDD8.s index 08e1871b..70c5ced4 100644 --- a/asm/non_matchings/unknown_032760/func_8003EDD8.s +++ b/asm/non_matchings/unknown_032760/func_8003EDD8.s @@ -14,10 +14,10 @@ glabel func_8003EDD8 /* 03F9F4 8003EDF4 104000A1 */ beqz $v0, .L8003F07C /* 03F9F8 8003EDF8 00C08825 */ move $s1, $a2 /* 03F9FC 8003EDFC 8C430064 */ lw $v1, 0x64($v0) -/* 03FA00 8003EE00 3C01800E */ lui $at, %hi(D_800E61FC) # $at, 0x800e +/* 03FA00 8003EE00 3C01800E */ lui $at, %hi(D_800E61F8 + 4) # $at, 0x800e /* 03FA04 8003EE04 846E01BA */ lh $t6, 0x1ba($v1) /* 03FA08 8003EE08 C42D61F8 */ lwc1 $f13, %lo(D_800E61F8)($at) -/* 03FA0C 8003EE0C C42C61FC */ lwc1 $f12, %lo(D_800E61FC)($at) +/* 03FA0C 8003EE0C C42C61FC */ lwc1 $f12, %lo(D_800E61F8 + 4)($at) /* 03FA10 8003EE10 000E7843 */ sra $t7, $t6, 1 /* 03FA14 8003EE14 A4CF0014 */ sh $t7, 0x14($a2) /* 03FA18 8003EE18 847801BC */ lh $t8, 0x1bc($v1) diff --git a/asm/non_matchings/unknown_032760/func_8003F2E8.s b/asm/non_matchings/unknown_032760/func_8003F2E8.s index a54a1930..44bda8d0 100644 --- a/asm/non_matchings/unknown_032760/func_8003F2E8.s +++ b/asm/non_matchings/unknown_032760/func_8003F2E8.s @@ -28,9 +28,9 @@ glabel func_8003F2E8 /* 03FF1C 8003F31C 46001006 */ mov.s $f0, $f2 /* 03FF20 8003F320 15600007 */ bnez $t3, .L8003F340 /* 03FF24 8003F324 AFB90064 */ sw $t9, 0x64($sp) -/* 03FF28 8003F328 3C01800E */ lui $at, %hi(D_800E6204) # $at, 0x800e +/* 03FF28 8003F328 3C01800E */ lui $at, %hi(D_800E6200 + 4) # $at, 0x800e /* 03FF2C 8003F32C C4296200 */ lwc1 $f9, %lo(D_800E6200)($at) -/* 03FF30 8003F330 C4286204 */ lwc1 $f8, %lo(D_800E6204)($at) +/* 03FF30 8003F330 C4286204 */ lwc1 $f8, %lo(D_800E6200 + 4)($at) /* 03FF34 8003F334 460011A1 */ cvt.d.s $f6, $f2 /* 03FF38 8003F338 46283282 */ mul.d $f10, $f6, $f8 /* 03FF3C 8003F33C 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index ef6064ee..e1e5cb25 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -29,9 +29,9 @@ glabel func_800422F0 /* 042F20 80042320 E7B4001C */ swc1 $f20, 0x1c($sp) /* 042F24 80042324 15C00007 */ bnez $t6, .L80042344 /* 042F28 80042328 46000086 */ mov.s $f2, $f0 -/* 042F2C 8004232C 3C01800E */ lui $at, %hi(D_800E6254) # $at, 0x800e +/* 042F2C 8004232C 3C01800E */ lui $at, %hi(D_800E6250 + 4) # $at, 0x800e /* 042F30 80042330 C4296250 */ lwc1 $f9, %lo(D_800E6250)($at) -/* 042F34 80042334 C4286254 */ lwc1 $f8, %lo(D_800E6254)($at) +/* 042F34 80042334 C4286254 */ lwc1 $f8, %lo(D_800E6250 + 4)($at) /* 042F38 80042338 460001A1 */ cvt.d.s $f6, $f0 /* 042F3C 8004233C 46283282 */ mul.d $f10, $f6, $f8 /* 042F40 80042340 462050A0 */ cvt.s.d $f2, $f10 diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index 633d653d..62b5b94d 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -886,10 +886,10 @@ glabel func_80042D20 /* 0445A0 800439A0 15E1000F */ bne $t7, $at, .L800439E0 /* 0445A4 800439A4 00000000 */ nop /* 0445A8 800439A8 1060000D */ beqz $v1, .L800439E0 -/* 0445AC 800439AC 3C01800E */ lui $at, %hi(D_800E62AC) # $at, 0x800e +/* 0445AC 800439AC 3C01800E */ lui $at, %hi(D_800E62A8 + 4) # $at, 0x800e /* 0445B0 800439B0 C7B20090 */ lwc1 $f18, 0x90($sp) /* 0445B4 800439B4 C42B62A8 */ lwc1 $f11, %lo(D_800E62A8)($at) -/* 0445B8 800439B8 C42A62AC */ lwc1 $f10, %lo(D_800E62AC)($at) +/* 0445B8 800439B8 C42A62AC */ lwc1 $f10, %lo(D_800E62A8 + 4)($at) /* 0445BC 800439BC 460091A1 */ cvt.d.s $f6, $f18 /* 0445C0 800439C0 462A303C */ c.lt.d $f6, $f10 /* 0445C4 800439C4 240E0001 */ li $t6, 1 @@ -904,36 +904,36 @@ glabel func_80042D20 /* 0445E4 800439E4 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) /* 0445E8 800439E8 8FB90054 */ lw $t9, 0x54($sp) /* 0445EC 800439EC 15E00050 */ bnez $t7, .L80043B30 -/* 0445F0 800439F0 3C01800E */ lui $at, %hi(D_800E62B4) # $at, 0x800e +/* 0445F0 800439F0 3C01800E */ lui $at, %hi(D_800E62B0 + 4) # $at, 0x800e /* 0445F4 800439F4 C72E0004 */ lwc1 $f14, 4($t9) /* 0445F8 800439F8 C43162B0 */ lwc1 $f17, %lo(D_800E62B0)($at) -/* 0445FC 800439FC C43062B4 */ lwc1 $f16, %lo(D_800E62B4)($at) +/* 0445FC 800439FC C43062B4 */ lwc1 $f16, %lo(D_800E62B0 + 4)($at) /* 044600 80043A00 46007221 */ cvt.d.s $f8, $f14 /* 044604 80043A04 46304102 */ mul.d $f4, $f8, $f16 -/* 044608 80043A08 3C01800E */ lui $at, %hi(D_800E62BC) # $at, 0x800e +/* 044608 80043A08 3C01800E */ lui $at, %hi(D_800E62B8 + 4) # $at, 0x800e /* 04460C 80043A0C C43362B8 */ lwc1 $f19, %lo(D_800E62B8)($at) -/* 044610 80043A10 C43262BC */ lwc1 $f18, %lo(D_800E62BC)($at) -/* 044614 80043A14 3C01800E */ lui $at, %hi(D_800E62C4) # $at, 0x800e +/* 044610 80043A10 C43262BC */ lwc1 $f18, %lo(D_800E62B8 + 4)($at) +/* 044614 80043A14 3C01800E */ lui $at, %hi(D_800E62C0 + 4) # $at, 0x800e /* 044618 80043A18 C42B62C0 */ lwc1 $f11, %lo(D_800E62C0)($at) -/* 04461C 80043A1C C42A62C4 */ lwc1 $f10, %lo(D_800E62C4)($at) +/* 04461C 80043A1C C42A62C4 */ lwc1 $f10, %lo(D_800E62C0 + 4)($at) /* 044620 80043A20 46322180 */ add.d $f6, $f4, $f18 /* 044624 80043A24 AFA9005C */ sw $t1, 0x5c($sp) /* 044628 80043A28 462A3203 */ div.d $f8, $f6, $f10 /* 04462C 80043A2C 0C0326B4 */ jal sqrtf /* 044630 80043A30 46204320 */ cvt.s.d $f12, $f8 /* 044634 80043A34 8FB80054 */ lw $t8, 0x54($sp) -/* 044638 80043A38 3C01800E */ lui $at, %hi(D_800E62CC) # $at, 0x800e +/* 044638 80043A38 3C01800E */ lui $at, %hi(D_800E62C8 + 4) # $at, 0x800e /* 04463C 80043A3C C7020000 */ lwc1 $f2, ($t8) /* 044640 80043A40 C42562C8 */ lwc1 $f5, %lo(D_800E62C8)($at) -/* 044644 80043A44 C42462CC */ lwc1 $f4, %lo(D_800E62CC)($at) +/* 044644 80043A44 C42462CC */ lwc1 $f4, %lo(D_800E62C8 + 4)($at) /* 044648 80043A48 46001421 */ cvt.d.s $f16, $f2 /* 04464C 80043A4C 46248482 */ mul.d $f18, $f16, $f4 -/* 044650 80043A50 3C01800E */ lui $at, %hi(D_800E62D4) # $at, 0x800e +/* 044650 80043A50 3C01800E */ lui $at, %hi(D_800E62D0 + 4) # $at, 0x800e /* 044654 80043A54 C42762D0 */ lwc1 $f7, %lo(D_800E62D0)($at) -/* 044658 80043A58 C42662D4 */ lwc1 $f6, %lo(D_800E62D4)($at) -/* 04465C 80043A5C 3C01800E */ lui $at, %hi(D_800E62DC) # $at, 0x800e +/* 044658 80043A58 C42662D4 */ lwc1 $f6, %lo(D_800E62D0 + 4)($at) +/* 04465C 80043A5C 3C01800E */ lui $at, %hi(D_800E62D8 + 4) # $at, 0x800e /* 044660 80043A60 C42962D8 */ lwc1 $f9, %lo(D_800E62D8)($at) -/* 044664 80043A64 C42862DC */ lwc1 $f8, %lo(D_800E62DC)($at) +/* 044664 80043A64 C42862DC */ lwc1 $f8, %lo(D_800E62D8 + 4)($at) /* 044668 80043A68 46269280 */ add.d $f10, $f18, $f6 /* 04466C 80043A6C E7A00080 */ swc1 $f0, 0x80($sp) /* 044670 80043A70 46285403 */ div.d $f16, $f10, $f8 @@ -958,10 +958,10 @@ glabel func_80042D20 /* 0446BC 80043ABC 1420000B */ bnez $at, .L80043AEC /* 0446C0 80043AC0 46006086 */ mov.s $f2, $f12 /* 0446C4 80043AC4 44992000 */ mtc1 $t9, $f4 -/* 0446C8 80043AC8 3C01800E */ lui $at, %hi(D_800E62E4) # $at, 0x800e +/* 0446C8 80043AC8 3C01800E */ lui $at, %hi(D_800E62E0 + 4) # $at, 0x800e /* 0446CC 80043ACC 468021A0 */ cvt.s.w $f6, $f4 /* 0446D0 80043AD0 C42B62E0 */ lwc1 $f11, %lo(D_800E62E0)($at) -/* 0446D4 80043AD4 C42A62E4 */ lwc1 $f10, %lo(D_800E62E4)($at) +/* 0446D4 80043AD4 C42A62E4 */ lwc1 $f10, %lo(D_800E62E0 + 4)($at) /* 0446D8 80043AD8 46003221 */ cvt.d.s $f8, $f6 /* 0446DC 80043ADC 462A4402 */ mul.d $f16, $f8, $f10 /* 0446E0 80043AE0 460064A1 */ cvt.d.s $f18, $f12 @@ -969,17 +969,17 @@ glabel func_80042D20 /* 0446E8 80043AE8 462020A0 */ cvt.s.d $f2, $f4 .L80043AEC: /* 0446EC 80043AEC 46021182 */ mul.s $f6, $f2, $f2 -/* 0446F0 80043AF0 3C01800E */ lui $at, %hi(D_800E62EC) # $at, 0x800e +/* 0446F0 80043AF0 3C01800E */ lui $at, %hi(D_800E62E8 + 4) # $at, 0x800e /* 0446F4 80043AF4 C42B62E8 */ lwc1 $f11, %lo(D_800E62E8)($at) -/* 0446F8 80043AF8 C42A62EC */ lwc1 $f10, %lo(D_800E62EC)($at) +/* 0446F8 80043AF8 C42A62EC */ lwc1 $f10, %lo(D_800E62E8 + 4)($at) /* 0446FC 80043AFC 46003221 */ cvt.d.s $f8, $f6 /* 044700 80043B00 462A4482 */ mul.d $f18, $f8, $f10 -/* 044704 80043B04 3C01800E */ lui $at, %hi(D_800E62F4) # $at, 0x800e +/* 044704 80043B04 3C01800E */ lui $at, %hi(D_800E62F0 + 4) # $at, 0x800e /* 044708 80043B08 C43162F0 */ lwc1 $f17, %lo(D_800E62F0)($at) -/* 04470C 80043B0C C43062F4 */ lwc1 $f16, %lo(D_800E62F4)($at) -/* 044710 80043B10 3C01800E */ lui $at, %hi(D_800E62FC) # $at, 0x800e +/* 04470C 80043B0C C43062F4 */ lwc1 $f16, %lo(D_800E62F0 + 4)($at) +/* 044710 80043B10 3C01800E */ lui $at, %hi(D_800E62F8 + 4) # $at, 0x800e /* 044714 80043B14 C42762F8 */ lwc1 $f7, %lo(D_800E62F8)($at) -/* 044718 80043B18 C42662FC */ lwc1 $f6, %lo(D_800E62FC)($at) +/* 044718 80043B18 C42662FC */ lwc1 $f6, %lo(D_800E62F8 + 4)($at) /* 04471C 80043B1C 46309101 */ sub.d $f4, $f18, $f16 /* 044720 80043B20 00000000 */ nop /* 044724 80043B24 46262203 */ div.d $f8, $f4, $f6 @@ -992,10 +992,10 @@ glabel func_80042D20 /* 04473C 80043B3C 821801CA */ lb $t8, 0x1ca($s0) /* 044740 80043B40 24010003 */ li $at, 3 /* 044744 80043B44 1701000A */ bne $t8, $at, .L80043B70 -/* 044748 80043B48 3C01800E */ lui $at, %hi(D_800E6304) # $at, 0x800e +/* 044748 80043B48 3C01800E */ lui $at, %hi(D_800E6300 + 4) # $at, 0x800e /* 04474C 80043B4C C7B20094 */ lwc1 $f18, 0x94($sp) /* 044750 80043B50 C42B6300 */ lwc1 $f11, %lo(D_800E6300)($at) -/* 044754 80043B54 C42A6304 */ lwc1 $f10, %lo(D_800E6304)($at) +/* 044754 80043B54 C42A6304 */ lwc1 $f10, %lo(D_800E6300 + 4)($at) /* 044758 80043B58 46009421 */ cvt.d.s $f16, $f18 /* 04475C 80043B5C 4630503C */ c.lt.d $f10, $f16 /* 044760 80043B60 240E0002 */ li $t6, 2 @@ -1120,10 +1120,10 @@ glabel func_80042D20 /* 044914 80043D14 24010001 */ li $at, 1 /* 044918 80043D18 17210033 */ bne $t9, $at, .L80043DE8 /* 04491C 80043D1C A4600000 */ sh $zero, ($v1) -/* 044920 80043D20 3C01800E */ lui $at, %hi(D_800E630C) # $at, 0x800e +/* 044920 80043D20 3C01800E */ lui $at, %hi(D_800E6308 + 4) # $at, 0x800e /* 044924 80043D24 C7B00094 */ lwc1 $f16, 0x94($sp) /* 044928 80043D28 C42B6308 */ lwc1 $f11, %lo(D_800E6308)($at) -/* 04492C 80043D2C C42A630C */ lwc1 $f10, %lo(D_800E630C)($at) +/* 04492C 80043D2C C42A630C */ lwc1 $f10, %lo(D_800E6308 + 4)($at) /* 044930 80043D30 46008121 */ cvt.d.s $f4, $f16 /* 044934 80043D34 4624503C */ c.lt.d $f10, $f4 /* 044938 80043D38 3C014000 */ li $at, 0x40000000 # 2.000000 @@ -1188,10 +1188,10 @@ glabel func_80042D20 /* 044A10 80043E10 AC590000 */ sw $t9, ($v0) /* 044A14 80043E14 372E4000 */ ori $t6, $t9, 0x4000 /* 044A18 80043E18 AC4E0000 */ sw $t6, ($v0) -/* 044A1C 80043E1C 3C01800E */ lui $at, %hi(D_800E6314) # $at, 0x800e +/* 044A1C 80043E1C 3C01800E */ lui $at, %hi(D_800E6310 + 4) # $at, 0x800e /* 044A20 80043E20 C610002C */ lwc1 $f16, 0x2c($s0) /* 044A24 80043E24 C4336310 */ lwc1 $f19, %lo(D_800E6310)($at) -/* 044A28 80043E28 C4326314 */ lwc1 $f18, %lo(D_800E6314)($at) +/* 044A28 80043E28 C4326314 */ lwc1 $f18, %lo(D_800E6310 + 4)($at) /* 044A2C 80043E2C 460082A1 */ cvt.d.s $f10, $f16 /* 044A30 80043E30 462A903C */ c.lt.d $f18, $f10 /* 044A34 80043E34 35D98000 */ ori $t9, $t6, 0x8000 diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 92af9e13..4f3d2469 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -614,10 +614,10 @@ glabel L80044ADC .L80044D20: /* 045920 80044D20 AC2DD528 */ sw $t5, %lo(D_8011D528)($at) .L80044D24: -/* 045924 80044D24 3C01800E */ lui $at, %hi(D_800E6354) # $at, 0x800e +/* 045924 80044D24 3C01800E */ lui $at, %hi(D_800E6350 + 4) # $at, 0x800e /* 045928 80044D28 C7B0005C */ lwc1 $f16, 0x5c($sp) /* 04592C 80044D2C C4336350 */ lwc1 $f19, %lo(D_800E6350)($at) -/* 045930 80044D30 C4326354 */ lwc1 $f18, %lo(D_800E6354)($at) +/* 045930 80044D30 C4326354 */ lwc1 $f18, %lo(D_800E6350 + 4)($at) /* 045934 80044D34 46008121 */ cvt.d.s $f4, $f16 /* 045938 80044D38 4632203C */ c.lt.d $f4, $f18 /* 04593C 80044D3C 8FAB006C */ lw $t3, 0x6c($sp) diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index d765453b..74e69563 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -647,13 +647,13 @@ glabel L80045B58 /* 04676C 80045B6C A2A001CD */ sb $zero, 0x1cd($s5) glabel L80045B70 /* 046770 80045B70 82A90173 */ lb $t1, 0x173($s5) -/* 046774 80045B74 3C01800E */ lui $at, %hi(D_800E63A4) # $at, 0x800e +/* 046774 80045B74 3C01800E */ lui $at, %hi(D_800E63A0 + 4) # $at, 0x800e /* 046778 80045B78 15200002 */ bnez $t1, .L80045B84 /* 04677C 80045B7C 3C028012 */ lui $v0, %hi(D_8011D530) # $v0, 0x8012 /* 046780 80045B80 A2A001CD */ sb $zero, 0x1cd($s5) .L80045B84: /* 046784 80045B84 C42963A0 */ lwc1 $f9, %lo(D_800E63A0)($at) -/* 046788 80045B88 C42863A4 */ lwc1 $f8, %lo(D_800E63A4)($at) +/* 046788 80045B88 C42863A4 */ lwc1 $f8, %lo(D_800E63A0 + 4)($at) /* 04678C 80045B8C 460011A1 */ cvt.d.s $f6, $f2 /* 046790 80045B90 4628303C */ c.lt.d $f6, $f8 /* 046794 80045B94 2442D530 */ addiu $v0, %lo(D_8011D530) # addiu $v0, $v0, -0x2ad0 diff --git a/asm/non_matchings/unknown_043920/func_80046524.s b/asm/non_matchings/unknown_043920/func_80046524.s index 4128d38c..54c14747 100644 --- a/asm/non_matchings/unknown_043920/func_80046524.s +++ b/asm/non_matchings/unknown_043920/func_80046524.s @@ -66,10 +66,10 @@ glabel func_80046524 /* 047144 80046544 AFA5012C */ sw $a1, 0x12c($sp) /* 047148 80046548 10400009 */ beqz $v0, .L80046570 /* 04714C 8004654C 3C0A8012 */ lui $t2, %hi(D_8011D586) # $t2, 0x8012 -/* 047150 80046550 3C01800E */ lui $at, %hi(D_800E63AC) # $at, 0x800e +/* 047150 80046550 3C01800E */ lui $at, %hi(D_800E63A8 + 4) # $at, 0x800e /* 047154 80046554 C7A4012C */ lwc1 $f4, 0x12c($sp) /* 047158 80046558 C42963A8 */ lwc1 $f9, %lo(D_800E63A8)($at) -/* 04715C 8004655C C42863AC */ lwc1 $f8, %lo(D_800E63AC)($at) +/* 04715C 8004655C C42863AC */ lwc1 $f8, %lo(D_800E63A8 + 4)($at) /* 047160 80046560 460021A1 */ cvt.d.s $f6, $f4 /* 047164 80046564 46283282 */ mul.d $f10, $f6, $f8 /* 047168 80046568 46205120 */ cvt.s.d $f4, $f10 @@ -210,9 +210,9 @@ glabel func_80046524 /* 04735C 8004675C 1140001E */ beqz $t2, .L800467D8 /* 047360 80046760 00000000 */ nop /* 047364 80046764 C7A4012C */ lwc1 $f4, 0x12c($sp) -/* 047368 80046768 3C01800E */ lui $at, %hi(D_800E63B4) # $at, 0x800e +/* 047368 80046768 3C01800E */ lui $at, %hi(D_800E63B0 + 4) # $at, 0x800e /* 04736C 8004676C C42B63B0 */ lwc1 $f11, %lo(D_800E63B0)($at) -/* 047370 80046770 C42A63B4 */ lwc1 $f10, %lo(D_800E63B4)($at) +/* 047370 80046770 C42A63B4 */ lwc1 $f10, %lo(D_800E63B0 + 4)($at) /* 047374 80046774 46002221 */ cvt.d.s $f8, $f4 /* 047378 80046778 462A4182 */ mul.d $f6, $f8, $f10 /* 04737C 8004677C E7A80054 */ swc1 $f8, 0x54($sp) @@ -240,9 +240,9 @@ glabel func_80046524 /* 0473D4 800467D4 C60E002C */ lwc1 $f14, 0x2c($s0) .L800467D8: /* 0473D8 800467D8 C7A4012C */ lwc1 $f4, 0x12c($sp) -/* 0473DC 800467DC 3C01800E */ lui $at, %hi(D_800E63BC) # $at, 0x800e +/* 0473DC 800467DC 3C01800E */ lui $at, %hi(D_800E63B8 + 4) # $at, 0x800e /* 0473E0 800467E0 C42763B8 */ lwc1 $f7, %lo(D_800E63B8)($at) -/* 0473E4 800467E4 C42663BC */ lwc1 $f6, %lo(D_800E63BC)($at) +/* 0473E4 800467E4 C42663BC */ lwc1 $f6, %lo(D_800E63B8 + 4)($at) /* 0473E8 800467E8 46002221 */ cvt.d.s $f8, $f4 /* 0473EC 800467EC 46264282 */ mul.d $f10, $f8, $f6 /* 0473F0 800467F0 E7A80054 */ swc1 $f8, 0x54($sp) @@ -305,9 +305,9 @@ glabel func_80046524 /* 0474C4 800468C4 8C84D528 */ lw $a0, %lo(D_8011D528)($a0) /* 0474C8 800468C8 45000008 */ bc1f .L800468EC /* 0474CC 800468CC 308E4000 */ andi $t6, $a0, 0x4000 -/* 0474D0 800468D0 3C01800E */ lui $at, %hi(D_800E63C4) # $at, 0x800e +/* 0474D0 800468D0 3C01800E */ lui $at, %hi(D_800E63C0 + 4) # $at, 0x800e /* 0474D4 800468D4 C42763C0 */ lwc1 $f7, %lo(D_800E63C0)($at) -/* 0474D8 800468D8 C42663C4 */ lwc1 $f6, %lo(D_800E63C4)($at) +/* 0474D8 800468D8 C42663C4 */ lwc1 $f6, %lo(D_800E63C0 + 4)($at) /* 0474DC 800468DC 460062A1 */ cvt.d.s $f10, $f12 /* 0474E0 800468E0 46265102 */ mul.d $f4, $f10, $f6 /* 0474E4 800468E4 46202220 */ cvt.s.d $f8, $f4 @@ -326,9 +326,9 @@ glabel func_80046524 /* 047514 80046914 00000000 */ nop /* 047518 80046918 45000024 */ bc1f .L800469AC .L8004691C: -/* 04751C 8004691C 3C01800E */ lui $at, %hi(D_800E63CC) # $at, 0x800e +/* 04751C 8004691C 3C01800E */ lui $at, %hi(D_800E63C8 + 4) # $at, 0x800e /* 047520 80046920 C42563C8 */ lwc1 $f5, %lo(D_800E63C8)($at) -/* 047524 80046924 C42463CC */ lwc1 $f4, %lo(D_800E63CC)($at) +/* 047524 80046924 C42463CC */ lwc1 $f4, %lo(D_800E63C8 + 4)($at) /* 047528 80046928 C7A60054 */ lwc1 $f6, 0x54($sp) /* 04752C 8004692C C60A00B8 */ lwc1 $f10, 0xb8($s0) /* 047530 80046930 46243202 */ mul.d $f8, $f6, $f4 @@ -338,7 +338,7 @@ glabel func_80046524 /* 047540 80046940 462022A0 */ cvt.s.d $f10, $f4 /* 047544 80046944 E60A00B8 */ swc1 $f10, 0xb8($s0) /* 047548 80046948 C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 04754C 8004694C C42663D4 */ lwc1 $f6, %lo(D_800E63D4)($at) +/* 04754C 8004694C C42663D4 */ lwc1 $f6, %lo(D_800E63D0 + 4)($at) /* 047550 80046950 C42763D0 */ lwc1 $f7, %lo(D_800E63D0)($at) /* 047554 80046954 46004121 */ cvt.d.s $f4, $f8 /* 047558 80046958 4624303C */ c.lt.d $f6, $f4 @@ -365,9 +365,9 @@ glabel func_80046524 /* 0475A4 800469A4 10000019 */ b .L80046A0C /* 0475A8 800469A8 3C014040 */ lui $at, 0x4040 .L800469AC: -/* 0475AC 800469AC 3C01800E */ lui $at, %hi(D_800E63E4) # $at, 0x800e +/* 0475AC 800469AC 3C01800E */ lui $at, %hi(D_800E63E0 + 4) # $at, 0x800e /* 0475B0 800469B0 C42963E0 */ lwc1 $f9, %lo(D_800E63E0)($at) -/* 0475B4 800469B4 C42863E4 */ lwc1 $f8, %lo(D_800E63E4)($at) +/* 0475B4 800469B4 C42863E4 */ lwc1 $f8, %lo(D_800E63E0 + 4)($at) /* 0475B8 800469B8 C7AB0050 */ lwc1 $f11, 0x50($sp) /* 0475BC 800469BC C7AA0054 */ lwc1 $f10, 0x54($sp) /* 0475C0 800469C0 C60400B8 */ lwc1 $f4, 0xb8($s0) @@ -406,9 +406,9 @@ glabel func_80046524 /* 047640 80046A40 4628303C */ c.lt.d $f6, $f8 /* 047644 80046A44 00000000 */ nop /* 047648 80046A48 45000007 */ bc1f .L80046A68 -/* 04764C 80046A4C 3C01800E */ lui $at, %hi(D_800E63EC) # $at, 0x800e +/* 04764C 80046A4C 3C01800E */ lui $at, %hi(D_800E63E8 + 4) # $at, 0x800e /* 047650 80046A50 C42B63E8 */ lwc1 $f11, %lo(D_800E63E8)($at) -/* 047654 80046A54 C42A63EC */ lwc1 $f10, %lo(D_800E63EC)($at) +/* 047654 80046A54 C42A63EC */ lwc1 $f10, %lo(D_800E63E8 + 4)($at) /* 047658 80046A58 46006121 */ cvt.d.s $f4, $f12 /* 04765C 80046A5C 462A2182 */ mul.d $f6, $f4, $f10 /* 047660 80046A60 46203220 */ cvt.s.d $f8, $f6 @@ -924,11 +924,11 @@ glabel func_80046524 .L800471D0: /* 047DD0 800471D0 3C01800E */ lui $at, %hi(D_800E63F0) # $at, 0x800e /* 047DD4 800471D4 C42263F0 */ lwc1 $f2, %lo(D_800E63F0)($at) -/* 047DD8 800471D8 3C01800E */ lui $at, %hi(D_800E63FC) # $at, 0x800e +/* 047DD8 800471D8 3C01800E */ lui $at, %hi(D_800E63F8 + 4) # $at, 0x800e /* 047DDC 800471DC E7A200FC */ swc1 $f2, 0xfc($sp) /* 047DE0 800471E0 C6280020 */ lwc1 $f8, 0x20($s1) /* 047DE4 800471E4 C42563F8 */ lwc1 $f5, %lo(D_800E63F8)($at) -/* 047DE8 800471E8 C42463FC */ lwc1 $f4, %lo(D_800E63FC)($at) +/* 047DE8 800471E8 C42463FC */ lwc1 $f4, %lo(D_800E63F8 + 4)($at) /* 047DEC 800471EC 46004021 */ cvt.d.s $f0, $f8 /* 047DF0 800471F0 46240182 */ mul.d $f6, $f0, $f4 /* 047DF4 800471F4 C7AB0050 */ lwc1 $f11, 0x50($sp) @@ -992,9 +992,9 @@ glabel func_80046524 /* 047ED4 800472D4 46283100 */ add.d $f4, $f6, $f8 /* 047ED8 800472D8 44814800 */ mtc1 $at, $f9 /* 047EDC 800472DC 46245182 */ mul.d $f6, $f10, $f4 -/* 047EE0 800472E0 3C01800E */ lui $at, %hi(D_800E6404) # $at, 0x800e +/* 047EE0 800472E0 3C01800E */ lui $at, %hi(D_800E6400 + 4) # $at, 0x800e /* 047EE4 800472E4 C42B6400 */ lwc1 $f11, %lo(D_800E6400)($at) -/* 047EE8 800472E8 C42A6404 */ lwc1 $f10, %lo(D_800E6404)($at) +/* 047EE8 800472E8 C42A6404 */ lwc1 $f10, %lo(D_800E6400 + 4)($at) /* 047EEC 800472EC 44804000 */ mtc1 $zero, $f8 /* 047EF0 800472F0 462A0103 */ div.d $f4, $f0, $f10 /* 047EF4 800472F4 462033A0 */ cvt.s.d $f14, $f6 @@ -1162,11 +1162,11 @@ glabel func_80046524 /* 04814C 8004754C 45000010 */ bc1f .L80047590 /* 048150 80047550 00000000 */ nop /* 048154 80047554 8E0F0148 */ lw $t7, 0x148($s0) -/* 048158 80047558 3C01800E */ lui $at, %hi(D_800E640C) # $at, 0x800e +/* 048158 80047558 3C01800E */ lui $at, %hi(D_800E6408 + 4) # $at, 0x800e /* 04815C 8004755C 15E0000C */ bnez $t7, .L80047590 /* 048160 80047560 00000000 */ nop /* 048164 80047564 C42B6408 */ lwc1 $f11, %lo(D_800E6408)($at) -/* 048168 80047568 C42A640C */ lwc1 $f10, %lo(D_800E640C)($at) +/* 048168 80047568 C42A640C */ lwc1 $f10, %lo(D_800E6408 + 4)($at) /* 04816C 8004756C 46001121 */ cvt.d.s $f4, $f2 /* 048170 80047570 462A2202 */ mul.d $f8, $f4, $f10 /* 048174 80047574 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -1185,9 +1185,9 @@ glabel func_80046524 /* 0481A0 800475A0 A3A900AF */ sb $t1, 0xaf($sp) /* 0481A4 800475A4 0C015C88 */ jal func_80057220 /* 0481A8 800475A8 E7B20104 */ swc1 $f18, 0x104($sp) -/* 0481AC 800475AC 3C01800E */ lui $at, %hi(D_800E6414) # $at, 0x800e +/* 0481AC 800475AC 3C01800E */ lui $at, %hi(D_800E6410 + 4) # $at, 0x800e /* 0481B0 800475B0 C4296410 */ lwc1 $f9, %lo(D_800E6410)($at) -/* 0481B4 800475B4 C4286414 */ lwc1 $f8, %lo(D_800E6414)($at) +/* 0481B4 800475B4 C4286414 */ lwc1 $f8, %lo(D_800E6410 + 4)($at) /* 0481B8 800475B8 460001A1 */ cvt.d.s $f6, $f0 /* 0481BC 800475BC 46283102 */ mul.d $f4, $f6, $f8 /* 0481C0 800475C0 C7B20104 */ lwc1 $f18, 0x104($sp) @@ -1498,10 +1498,10 @@ glabel func_80046524 /* 04863C 80047A3C 44805000 */ mtc1 $zero, $f10 /* 048640 80047A40 46002221 */ cvt.d.s $f8, $f4 /* 048644 80047A44 462A4182 */ mul.d $f6, $f8, $f10 -/* 048648 80047A48 3C01800E */ lui $at, %hi(D_800E641C) # $at, 0x800e +/* 048648 80047A48 3C01800E */ lui $at, %hi(D_800E6418 + 4) # $at, 0x800e /* 04864C 80047A4C C4296418 */ lwc1 $f9, %lo(D_800E6418)($at) -/* 048650 80047A50 C428641C */ lwc1 $f8, %lo(D_800E641C)($at) -/* 048654 80047A54 3C01800E */ lui $at, %hi(D_800E6424) # $at, 0x800e +/* 048650 80047A50 C428641C */ lwc1 $f8, %lo(D_800E6418 + 4)($at) +/* 048654 80047A54 3C01800E */ lui $at, %hi(D_800E6420 + 4) # $at, 0x800e /* 048658 80047A58 46203420 */ cvt.s.d $f16, $f6 /* 04865C 80047A5C 3C0E8012 */ lui $t6, %hi(D_8011D528) # $t6, 0x8012 /* 048660 80047A60 46008121 */ cvt.d.s $f4, $f16 @@ -1517,7 +1517,7 @@ glabel func_80046524 /* 048688 80047A88 46000307 */ neg.s $f12, $f0 .L80047A8C: /* 04868C 80047A8C C4296420 */ lwc1 $f9, %lo(D_800E6420)($at) -/* 048690 80047A90 C4286424 */ lwc1 $f8, %lo(D_800E6424)($at) +/* 048690 80047A90 C4286424 */ lwc1 $f8, %lo(D_800E6420 + 4)($at) /* 048694 80047A94 460062A1 */ cvt.d.s $f10, $f12 /* 048698 80047A98 462A403C */ c.lt.d $f8, $f10 /* 04869C 80047A9C 00000000 */ nop @@ -1547,10 +1547,10 @@ glabel func_80046524 /* 0486F8 80047AF8 10000039 */ b .L80047BE0 /* 0486FC 80047AFC E62A0024 */ swc1 $f10, 0x24($s1) .L80047B00: -/* 048700 80047B00 3C01800E */ lui $at, %hi(D_800E642C) # $at, 0x800e +/* 048700 80047B00 3C01800E */ lui $at, %hi(D_800E6428 + 4) # $at, 0x800e /* 048704 80047B04 C6040030 */ lwc1 $f4, 0x30($s0) /* 048708 80047B08 C4276428 */ lwc1 $f7, %lo(D_800E6428)($at) -/* 04870C 80047B0C C426642C */ lwc1 $f6, %lo(D_800E642C)($at) +/* 04870C 80047B0C C426642C */ lwc1 $f6, %lo(D_800E6428 + 4)($at) /* 048710 80047B10 46002021 */ cvt.d.s $f0, $f4 /* 048714 80047B14 46260202 */ mul.d $f8, $f0, $f6 /* 048718 80047B18 8C84D528 */ lw $a0, %lo(D_8011D528)($a0) @@ -1567,10 +1567,10 @@ glabel func_80046524 /* 048744 80047B44 308D4000 */ andi $t5, $a0, 0x4000 /* 048748 80047B48 28410028 */ slti $at, $v0, 0x28 /* 04874C 80047B4C 10200009 */ beqz $at, .L80047B74 -/* 048750 80047B50 3C01800E */ lui $at, %hi(D_800E6434) # $at, 0x800e +/* 048750 80047B50 3C01800E */ lui $at, %hi(D_800E6430 + 4) # $at, 0x800e /* 048754 80047B54 C7A400F4 */ lwc1 $f4, 0xf4($sp) /* 048758 80047B58 C4296430 */ lwc1 $f9, %lo(D_800E6430)($at) -/* 04875C 80047B5C C4286434 */ lwc1 $f8, %lo(D_800E6434)($at) +/* 04875C 80047B5C C4286434 */ lwc1 $f8, %lo(D_800E6430 + 4)($at) /* 048760 80047B60 460021A1 */ cvt.d.s $f6, $f4 /* 048764 80047B64 46283282 */ mul.d $f10, $f6, $f8 /* 048768 80047B68 46205120 */ cvt.s.d $f4, $f10 @@ -1858,9 +1858,9 @@ glabel func_80046524 /* 048BA0 80047FA0 00000000 */ nop /* 048BA4 80047FA4 45000007 */ bc1f .L80047FC4 .L80047FA8: -/* 048BA8 80047FA8 3C01800E */ lui $at, %hi(D_800E643C) # $at, 0x800e +/* 048BA8 80047FA8 3C01800E */ lui $at, %hi(D_800E6438 + 4) # $at, 0x800e /* 048BAC 80047FAC C42B6438 */ lwc1 $f11, %lo(D_800E6438)($at) -/* 048BB0 80047FB0 C42A643C */ lwc1 $f10, %lo(D_800E643C)($at) +/* 048BB0 80047FB0 C42A643C */ lwc1 $f10, %lo(D_800E6438 + 4)($at) /* 048BB4 80047FB4 00000000 */ nop /* 048BB8 80047FB8 462A0102 */ mul.d $f4, $f0, $f10 /* 048BBC 80047FBC 10000003 */ b .L80047FCC @@ -1883,9 +1883,9 @@ glabel func_80046524 /* 048BF8 80047FF8 00000000 */ nop /* 048BFC 80047FFC 45000007 */ bc1f .L8004801C .L80048000: -/* 048C00 80048000 3C01800E */ lui $at, %hi(D_800E6444) # $at, 0x800e +/* 048C00 80048000 3C01800E */ lui $at, %hi(D_800E6440 + 4) # $at, 0x800e /* 048C04 80048004 C42B6440 */ lwc1 $f11, %lo(D_800E6440)($at) -/* 048C08 80048008 C42A6444 */ lwc1 $f10, %lo(D_800E6444)($at) +/* 048C08 80048008 C42A6444 */ lwc1 $f10, %lo(D_800E6440 + 4)($at) /* 048C0C 8004800C 00000000 */ nop /* 048C10 80048010 462A0102 */ mul.d $f4, $f0, $f10 /* 048C14 80048014 1000000B */ b .L80048044 @@ -1962,7 +1962,7 @@ glabel func_80046524 /* 048D18 80048118 462032A0 */ cvt.s.d $f10, $f6 /* 048D1C 8004811C E60A00D4 */ swc1 $f10, 0xd4($s0) /* 048D20 80048120 C60400D4 */ lwc1 $f4, 0xd4($s0) -/* 048D24 80048124 C428644C */ lwc1 $f8, %lo(D_800E644C)($at) +/* 048D24 80048124 C428644C */ lwc1 $f8, %lo(D_800E6448 + 4)($at) /* 048D28 80048128 C4296448 */ lwc1 $f9, %lo(D_800E6448)($at) /* 048D2C 8004812C 460020A1 */ cvt.d.s $f2, $f4 /* 048D30 80048130 4622403C */ c.lt.d $f8, $f2 @@ -2018,9 +2018,9 @@ glabel func_80046524 /* 048DEC 800481EC 00000000 */ nop /* 048DF0 800481F0 46007021 */ cvt.d.s $f0, $f14 .L800481F4: -/* 048DF4 800481F4 3C01800E */ lui $at, %hi(D_800E645C) # $at, 0x800e +/* 048DF4 800481F4 3C01800E */ lui $at, %hi(D_800E6458 + 4) # $at, 0x800e /* 048DF8 800481F8 C4296458 */ lwc1 $f9, %lo(D_800E6458)($at) -/* 048DFC 800481FC C428645C */ lwc1 $f8, %lo(D_800E645C)($at) +/* 048DFC 800481FC C428645C */ lwc1 $f8, %lo(D_800E6458 + 4)($at) /* 048E00 80048200 C62A0010 */ lwc1 $f10, 0x10($s1) /* 048E04 80048204 46280182 */ mul.d $f6, $f0, $f8 /* 048E08 80048208 C7A40118 */ lwc1 $f4, 0x118($sp) @@ -2210,7 +2210,7 @@ glabel func_80046524 /* 0490B4 800484B4 E6280020 */ swc1 $f8, 0x20($s1) /* 0490B8 800484B8 C60A0008 */ lwc1 $f10, 8($s0) /* 0490BC 800484BC C604002C */ lwc1 $f4, 0x2c($s0) -/* 0490C0 800484C0 C4286464 */ lwc1 $f8, %lo(D_800E6464)($at) +/* 0490C0 800484C0 C4286464 */ lwc1 $f8, %lo(D_800E6460 + 4)($at) /* 0490C4 800484C4 C4296460 */ lwc1 $f9, %lo(D_800E6460)($at) /* 0490C8 800484C8 46005021 */ cvt.d.s $f0, $f10 /* 0490CC 800484CC 460021A1 */ cvt.d.s $f6, $f4 diff --git a/asm/non_matchings/unknown_043920/func_80048C7C.s b/asm/non_matchings/unknown_043920/func_80048C7C.s index 117b389f..aab88adb 100644 --- a/asm/non_matchings/unknown_043920/func_80048C7C.s +++ b/asm/non_matchings/unknown_043920/func_80048C7C.s @@ -97,9 +97,9 @@ glabel L80048DAC /* 0499B0 80048DB0 10000027 */ b .L80048E50 /* 0499B4 80048DB4 A20901ED */ sb $t1, 0x1ed($s0) glabel L80048DB8 -/* 0499B8 80048DB8 3C01800E */ lui $at, %hi(D_800E648C) # $at, 0x800e +/* 0499B8 80048DB8 3C01800E */ lui $at, %hi(D_800E6488 + 4) # $at, 0x800e /* 0499BC 80048DBC C4216488 */ lwc1 $f1, %lo(D_800E6488)($at) -/* 0499C0 80048DC0 C420648C */ lwc1 $f0, %lo(D_800E648C)($at) +/* 0499C0 80048DC0 C420648C */ lwc1 $f0, %lo(D_800E6488 + 4)($at) /* 0499C4 80048DC4 240A0078 */ li $t2, 120 /* 0499C8 80048DC8 A60A0204 */ sh $t2, 0x204($s0) /* 0499CC 80048DCC C490001C */ lwc1 $f16, 0x1c($a0) @@ -127,10 +127,10 @@ glabel L80048E18 /* 049A1C 80048E1C 240B0001 */ li $t3, 1 /* 049A20 80048E20 A20B01F1 */ sb $t3, 0x1f1($s0) /* 049A24 80048E24 E600002C */ swc1 $f0, 0x2c($s0) -/* 049A28 80048E28 3C01800E */ lui $at, %hi(D_800E6494) # $at, 0x800e +/* 049A28 80048E28 3C01800E */ lui $at, %hi(D_800E6490 + 4) # $at, 0x800e /* 049A2C 80048E2C C4860020 */ lwc1 $f6, 0x20($a0) /* 049A30 80048E30 C42B6490 */ lwc1 $f11, %lo(D_800E6490)($at) -/* 049A34 80048E34 C42A6494 */ lwc1 $f10, %lo(D_800E6494)($at) +/* 049A34 80048E34 C42A6494 */ lwc1 $f10, %lo(D_800E6490 + 4)($at) /* 049A38 80048E38 46003221 */ cvt.d.s $f8, $f6 /* 049A3C 80048E3C 462A4400 */ add.d $f16, $f8, $f10 /* 049A40 80048E40 24050139 */ li $a1, 313 diff --git a/asm/non_matchings/unknown_043920/func_80048E64.s b/asm/non_matchings/unknown_043920/func_80048E64.s index 3fbdec9e..ac090e74 100644 --- a/asm/non_matchings/unknown_043920/func_80048E64.s +++ b/asm/non_matchings/unknown_043920/func_80048E64.s @@ -158,11 +158,11 @@ glabel func_80048E64 /* 049C8C 8004908C 46100102 */ mul.s $f4, $f0, $f16 /* 049C90 80049090 3C0140C0 */ li $at, 0x40C00000 # 6.000000 /* 049C94 80049094 44814000 */ mtc1 $at, $f8 -/* 049C98 80049098 3C01800E */ lui $at, %hi(D_800E649C) # $at, 0x800e +/* 049C98 80049098 3C01800E */ lui $at, %hi(D_800E6498 + 4) # $at, 0x800e /* 049C9C 8004909C 46002187 */ neg.s $f6, $f4 /* 049CA0 800490A0 46083082 */ mul.s $f2, $f6, $f8 /* 049CA4 800490A4 C42B6498 */ lwc1 $f11, %lo(D_800E6498)($at) -/* 049CA8 800490A8 C42A649C */ lwc1 $f10, %lo(D_800E649C)($at) +/* 049CA8 800490A8 C42A649C */ lwc1 $f10, %lo(D_800E6498 + 4)($at) /* 049CAC 800490AC 3C014282 */ li $at, 0x42820000 # 65.000000 /* 049CB0 800490B0 46001121 */ cvt.d.s $f4, $f2 /* 049CB4 800490B4 4624503C */ c.lt.d $f10, $f4 diff --git a/asm/non_matchings/unknown_043920/func_800494E0.s b/asm/non_matchings/unknown_043920/func_800494E0.s index 4ebc8a01..44cb35e8 100644 --- a/asm/non_matchings/unknown_043920/func_800494E0.s +++ b/asm/non_matchings/unknown_043920/func_800494E0.s @@ -21,7 +21,7 @@ glabel func_800494E0 /* 04A118 80049518 46802020 */ cvt.s.w $f0, $f4 /* 04A11C 8004951C 44800000 */ mtc1 $zero, $f0 /* 04A120 80049520 C4A2002C */ lwc1 $f2, 0x2c($a1) -/* 04A124 80049524 3C01800E */ lui $at, %hi(D_800E64A4) # $at, 0x800e +/* 04A124 80049524 3C01800E */ lui $at, %hi(D_800E64A0 + 4) # $at, 0x800e /* 04A128 80049528 4600103C */ c.lt.s $f2, $f0 /* 04A12C 8004952C 00000000 */ nop /* 04A130 80049530 45000002 */ bc1f .L8004953C @@ -29,7 +29,7 @@ glabel func_800494E0 /* 04A138 80049538 46001087 */ neg.s $f2, $f2 .L8004953C: /* 04A13C 8004953C C42964A0 */ lwc1 $f9, %lo(D_800E64A0)($at) -/* 04A140 80049540 C42864A4 */ lwc1 $f8, %lo(D_800E64A4)($at) +/* 04A140 80049540 C42864A4 */ lwc1 $f8, %lo(D_800E64A0 + 4)($at) /* 04A144 80049544 460011A1 */ cvt.d.s $f6, $f2 /* 04A148 80049548 46283282 */ mul.d $f10, $f6, $f8 /* 04A14C 8004954C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 diff --git a/asm/non_matchings/unknown_043920/func_80049794.s b/asm/non_matchings/unknown_043920/func_80049794.s index dfd316ec..a68ef66d 100644 --- a/asm/non_matchings/unknown_043920/func_80049794.s +++ b/asm/non_matchings/unknown_043920/func_80049794.s @@ -63,10 +63,10 @@ glabel func_80049794 /* 04A3B8 800497B8 0C00384E */ jal func_8000E138 /* 04A3BC 800497BC AFA500FC */ sw $a1, 0xfc($sp) /* 04A3C0 800497C0 10400008 */ beqz $v0, .L800497E4 -/* 04A3C4 800497C4 3C01800E */ lui $at, %hi(D_800E64AC) # $at, 0x800e +/* 04A3C4 800497C4 3C01800E */ lui $at, %hi(D_800E64A8 + 4) # $at, 0x800e /* 04A3C8 800497C8 C7A400FC */ lwc1 $f4, 0xfc($sp) /* 04A3CC 800497CC C42964A8 */ lwc1 $f9, %lo(D_800E64A8)($at) -/* 04A3D0 800497D0 C42864AC */ lwc1 $f8, %lo(D_800E64AC)($at) +/* 04A3D0 800497D0 C42864AC */ lwc1 $f8, %lo(D_800E64A8 + 4)($at) /* 04A3D4 800497D4 460021A1 */ cvt.d.s $f6, $f4 /* 04A3D8 800497D8 46283282 */ mul.d $f10, $f6, $f8 /* 04A3DC 800497DC 462054A0 */ cvt.s.d $f18, $f10 @@ -209,12 +209,12 @@ glabel func_80049794 /* 04A5D8 800499D8 1122000D */ beq $t1, $v0, .L80049A10 /* 04A5DC 800499DC 3C0E8012 */ lui $t6, %hi(D_8011D5B0) # $t6, 0x8012 /* 04A5E0 800499E0 8DCED5B0 */ lw $t6, %lo(D_8011D5B0)($t6) -/* 04A5E4 800499E4 3C01800E */ lui $at, %hi(D_800E64B4) # $at, 0x800e +/* 04A5E4 800499E4 3C01800E */ lui $at, %hi(D_800E64B0 + 4) # $at, 0x800e /* 04A5E8 800499E8 01C57821 */ addu $t7, $t6, $a1 /* 04A5EC 800499EC 8DF80004 */ lw $t8, 4($t7) /* 04A5F0 800499F0 C42B64B0 */ lwc1 $f11, %lo(D_800E64B0)($at) /* 04A5F4 800499F4 C7060008 */ lwc1 $f6, 8($t8) -/* 04A5F8 800499F8 C42A64B4 */ lwc1 $f10, %lo(D_800E64B4)($at) +/* 04A5F8 800499F8 C42A64B4 */ lwc1 $f10, %lo(D_800E64B0 + 4)($at) /* 04A5FC 800499FC 46003221 */ cvt.d.s $f8, $f6 /* 04A600 80049A00 462A403C */ c.lt.d $f8, $f10 /* 04A604 80049A04 00000000 */ nop @@ -406,10 +406,10 @@ glabel func_80049794 /* 04A8A8 80049CA8 3C198012 */ lui $t9, %hi(D_8011D528) # $t9, 0x8012 /* 04A8AC 80049CAC 31CF8000 */ andi $t7, $t6, 0x8000 /* 04A8B0 80049CB0 11E00019 */ beqz $t7, .L80049D18 -/* 04A8B4 80049CB4 3C01800E */ lui $at, %hi(D_800E64BC) # $at, 0x800e +/* 04A8B4 80049CB4 3C01800E */ lui $at, %hi(D_800E64B8 + 4) # $at, 0x800e /* 04A8B8 80049CB8 C7A800FC */ lwc1 $f8, 0xfc($sp) /* 04A8BC 80049CBC C42564B8 */ lwc1 $f5, %lo(D_800E64B8)($at) -/* 04A8C0 80049CC0 C42464BC */ lwc1 $f4, %lo(D_800E64BC)($at) +/* 04A8C0 80049CC0 C42464BC */ lwc1 $f4, %lo(D_800E64B8 + 4)($at) /* 04A8C4 80049CC4 46004021 */ cvt.d.s $f0, $f8 /* 04A8C8 80049CC8 46240182 */ mul.d $f6, $f0, $f4 /* 04A8CC 80049CCC C60A00B4 */ lwc1 $f10, 0xb4($s0) @@ -432,10 +432,10 @@ glabel func_80049794 /* 04A910 80049D10 10000017 */ b .L80049D70 /* 04A914 80049D14 E60800B4 */ swc1 $f8, 0xb4($s0) .L80049D18: -/* 04A918 80049D18 3C01800E */ lui $at, %hi(D_800E64C4) # $at, 0x800e +/* 04A918 80049D18 3C01800E */ lui $at, %hi(D_800E64C0 + 4) # $at, 0x800e /* 04A91C 80049D1C C7AA00FC */ lwc1 $f10, 0xfc($sp) /* 04A920 80049D20 C42764C0 */ lwc1 $f7, %lo(D_800E64C0)($at) -/* 04A924 80049D24 C42664C4 */ lwc1 $f6, %lo(D_800E64C4)($at) +/* 04A924 80049D24 C42664C4 */ lwc1 $f6, %lo(D_800E64C0 + 4)($at) /* 04A928 80049D28 46005021 */ cvt.d.s $f0, $f10 /* 04A92C 80049D2C 46260202 */ mul.d $f8, $f0, $f6 /* 04A930 80049D30 C61200B4 */ lwc1 $f18, 0xb4($s0) @@ -481,9 +481,9 @@ glabel func_80049794 /* 04A9C8 80049DC8 00000000 */ nop /* 04A9CC 80049DCC 4500002B */ bc1f .L80049E7C .L80049DD0: -/* 04A9D0 80049DD0 3C01800E */ lui $at, %hi(D_800E64CC) # $at, 0x800e +/* 04A9D0 80049DD0 3C01800E */ lui $at, %hi(D_800E64C8 + 4) # $at, 0x800e /* 04A9D4 80049DD4 C42B64C8 */ lwc1 $f11, %lo(D_800E64C8)($at) -/* 04A9D8 80049DD8 C42A64CC */ lwc1 $f10, %lo(D_800E64CC)($at) +/* 04A9D8 80049DD8 C42A64CC */ lwc1 $f10, %lo(D_800E64C8 + 4)($at) /* 04A9DC 80049DDC C60400B8 */ lwc1 $f4, 0xb8($s0) /* 04A9E0 80049DE0 462A0482 */ mul.d $f18, $f0, $f10 /* 04A9E4 80049DE4 46002221 */ cvt.d.s $f8, $f4 @@ -493,7 +493,7 @@ glabel func_80049794 /* 04A9F4 80049DF4 46203120 */ cvt.s.d $f4, $f6 /* 04A9F8 80049DF8 E60400B8 */ swc1 $f4, 0xb8($s0) /* 04A9FC 80049DFC C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 04AA00 80049E00 C42A64D4 */ lwc1 $f10, %lo(D_800E64D4)($at) +/* 04AA00 80049E00 C42A64D4 */ lwc1 $f10, %lo(D_800E64D0 + 4)($at) /* 04AA04 80049E04 C42B64D0 */ lwc1 $f11, %lo(D_800E64D0)($at) /* 04AA08 80049E08 460044A1 */ cvt.d.s $f18, $f8 /* 04AA0C 80049E0C 4632503C */ c.lt.d $f10, $f18 @@ -527,9 +527,9 @@ glabel func_80049794 /* 04AA74 80049E74 10000015 */ b .L80049ECC /* 04AA78 80049E78 E7A200C4 */ swc1 $f2, 0xc4($sp) .L80049E7C: -/* 04AA7C 80049E7C 3C01800E */ lui $at, %hi(D_800E64E4) # $at, 0x800e +/* 04AA7C 80049E7C 3C01800E */ lui $at, %hi(D_800E64E0 + 4) # $at, 0x800e /* 04AA80 80049E80 C42564E0 */ lwc1 $f5, %lo(D_800E64E0)($at) -/* 04AA84 80049E84 C42464E4 */ lwc1 $f4, %lo(D_800E64E4)($at) +/* 04AA84 80049E84 C42464E4 */ lwc1 $f4, %lo(D_800E64E0 + 4)($at) /* 04AA88 80049E88 C61200B8 */ lwc1 $f18, 0xb8($s0) /* 04AA8C 80049E8C 46240202 */ mul.d $f8, $f0, $f4 /* 04AA90 80049E90 460091A1 */ cvt.d.s $f6, $f18 @@ -915,15 +915,15 @@ glabel func_80049794 /* 04B02C 8004A42C 4626203C */ c.lt.d $f4, $f6 /* 04B030 8004A430 C7AA00C8 */ lwc1 $f10, 0xc8($sp) /* 04B034 8004A434 4500000F */ bc1f .L8004A474 -/* 04B038 8004A438 3C01800E */ lui $at, %hi(D_800E64FC) # $at, 0x800e +/* 04B038 8004A438 3C01800E */ lui $at, %hi(D_800E64F8 + 4) # $at, 0x800e /* 04B03C 8004A43C C42964F8 */ lwc1 $f9, %lo(D_800E64F8)($at) -/* 04B040 8004A440 C42864FC */ lwc1 $f8, %lo(D_800E64FC)($at) +/* 04B040 8004A440 C42864FC */ lwc1 $f8, %lo(D_800E64F8 + 4)($at) /* 04B044 8004A444 460054A1 */ cvt.d.s $f18, $f10 /* 04B048 8004A448 46289102 */ mul.d $f4, $f18, $f8 -/* 04B04C 8004A44C 3C01800E */ lui $at, %hi(D_800E6504) # $at, 0x800e +/* 04B04C 8004A44C 3C01800E */ lui $at, %hi(D_800E6500 + 4) # $at, 0x800e /* 04B050 8004A450 C7AA00C4 */ lwc1 $f10, 0xc4($sp) /* 04B054 8004A454 C4296500 */ lwc1 $f9, %lo(D_800E6500)($at) -/* 04B058 8004A458 C4286504 */ lwc1 $f8, %lo(D_800E6504)($at) +/* 04B058 8004A458 C4286504 */ lwc1 $f8, %lo(D_800E6500 + 4)($at) /* 04B05C 8004A45C 462021A0 */ cvt.s.d $f6, $f4 /* 04B060 8004A460 460054A1 */ cvt.d.s $f18, $f10 /* 04B064 8004A464 46289102 */ mul.d $f4, $f18, $f8 @@ -1776,10 +1776,10 @@ glabel func_80049794 /* 04BC8C 8004B08C 44882000 */ mtc1 $t0, $f4 /* 04BC90 8004B090 C606002C */ lwc1 $f6, 0x2c($s0) /* 04BC94 8004B094 46802220 */ cvt.s.w $f8, $f4 -/* 04BC98 8004B098 3C01800E */ lui $at, %hi(D_800E6514) # $at, 0x800e +/* 04BC98 8004B098 3C01800E */ lui $at, %hi(D_800E6510 + 4) # $at, 0x800e /* 04BC9C 8004B09C C4256510 */ lwc1 $f5, %lo(D_800E6510)($at) /* 04BCA0 8004B0A0 46083482 */ mul.s $f18, $f6, $f8 -/* 04BCA4 8004B0A4 C4246514 */ lwc1 $f4, %lo(D_800E6514)($at) +/* 04BCA4 8004B0A4 C4246514 */ lwc1 $f4, %lo(D_800E6510 + 4)($at) /* 04BCA8 8004B0A8 C628001C */ lwc1 $f8, 0x1c($s1) /* 04BCAC 8004B0AC 3C028012 */ lui $v0, %hi(D_8011D528) # $v0, 0x8012 /* 04BCB0 8004B0B0 460092A1 */ cvt.d.s $f10, $f18 @@ -1977,10 +1977,10 @@ glabel func_80049794 /* 04BF7C 8004B37C 0C015C88 */ jal func_80057220 /* 04BF80 8004B380 E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04BF84 8004B384 C7AE00DC */ lwc1 $f14, 0xdc($sp) -/* 04BF88 8004B388 3C01800E */ lui $at, %hi(D_800E651C) # $at, 0x800e +/* 04BF88 8004B388 3C01800E */ lui $at, %hi(D_800E6518 + 4) # $at, 0x800e /* 04BF8C 8004B38C 46007382 */ mul.s $f14, $f14, $f0 /* 04BF90 8004B390 C4296518 */ lwc1 $f9, %lo(D_800E6518)($at) -/* 04BF94 8004B394 C428651C */ lwc1 $f8, %lo(D_800E651C)($at) +/* 04BF94 8004B394 C428651C */ lwc1 $f8, %lo(D_800E6518 + 4)($at) /* 04BF98 8004B398 820201D3 */ lb $v0, 0x1d3($s0) /* 04BF9C 8004B39C 460071A1 */ cvt.d.s $f6, $f14 /* 04BFA0 8004B3A0 46283282 */ mul.d $f10, $f6, $f8 @@ -2017,9 +2017,9 @@ glabel func_80049794 /* 04C014 8004B414 820D01E2 */ lb $t5, 0x1e2($s0) /* 04C018 8004B418 C7A400C8 */ lwc1 $f4, 0xc8($sp) /* 04C01C 8004B41C 15A0000F */ bnez $t5, .L8004B45C -/* 04C020 8004B420 3C01800E */ lui $at, %hi(D_800E6524) # $at, 0x800e +/* 04C020 8004B420 3C01800E */ lui $at, %hi(D_800E6520 + 4) # $at, 0x800e /* 04C024 8004B424 C4296520 */ lwc1 $f9, %lo(D_800E6520)($at) -/* 04C028 8004B428 C4286524 */ lwc1 $f8, %lo(D_800E6524)($at) +/* 04C028 8004B428 C4286524 */ lwc1 $f8, %lo(D_800E6520 + 4)($at) /* 04C02C 8004B42C 460021A1 */ cvt.d.s $f6, $f4 /* 04C030 8004B430 4628303C */ c.lt.d $f6, $f8 /* 04C034 8004B434 00000000 */ nop @@ -2187,10 +2187,10 @@ glabel func_80049794 /* 04C29C 8004B69C 2401FFFF */ li $at, -1 /* 04C2A0 8004B6A0 1441004E */ bne $v0, $at, .L8004B7DC .L8004B6A4: -/* 04C2A4 8004B6A4 3C01800E */ lui $at, %hi(D_800E6534) # $at, 0x800e +/* 04C2A4 8004B6A4 3C01800E */ lui $at, %hi(D_800E6530 + 4) # $at, 0x800e /* 04C2A8 8004B6A8 C612002C */ lwc1 $f18, 0x2c($s0) /* 04C2AC 8004B6AC C42B6530 */ lwc1 $f11, %lo(D_800E6530)($at) -/* 04C2B0 8004B6B0 C42A6534 */ lwc1 $f10, %lo(D_800E6534)($at) +/* 04C2B0 8004B6B0 C42A6534 */ lwc1 $f10, %lo(D_800E6530 + 4)($at) /* 04C2B4 8004B6B4 460091A1 */ cvt.d.s $f6, $f18 /* 04C2B8 8004B6B8 462A3202 */ mul.d $f8, $f6, $f10 /* 04C2BC 8004B6BC 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 @@ -2302,7 +2302,7 @@ glabel func_80049794 /* 04C454 8004B854 46049281 */ sub.s $f10, $f18, $f4 /* 04C458 8004B858 E62A0024 */ swc1 $f10, 0x24($s1) /* 04C45C 8004B85C C606002C */ lwc1 $f6, 0x2c($s0) -/* 04C460 8004B860 C424653C */ lwc1 $f4, %lo(D_800E653C)($at) +/* 04C460 8004B860 C424653C */ lwc1 $f4, %lo(D_800E6538 + 4)($at) /* 04C464 8004B864 C4256538 */ lwc1 $f5, %lo(D_800E6538)($at) /* 04C468 8004B868 460034A1 */ cvt.d.s $f18, $f6 /* 04C46C 8004B86C 46249282 */ mul.d $f10, $f18, $f4 @@ -2398,9 +2398,9 @@ glabel func_80049794 /* 04C5C8 8004B9C8 00000000 */ nop /* 04C5CC 8004B9CC 45000007 */ bc1f .L8004B9EC .L8004B9D0: -/* 04C5D0 8004B9D0 3C01800E */ lui $at, %hi(D_800E6544) # $at, 0x800e +/* 04C5D0 8004B9D0 3C01800E */ lui $at, %hi(D_800E6540 + 4) # $at, 0x800e /* 04C5D4 8004B9D4 C4336540 */ lwc1 $f19, %lo(D_800E6540)($at) -/* 04C5D8 8004B9D8 C4326544 */ lwc1 $f18, %lo(D_800E6544)($at) +/* 04C5D8 8004B9D8 C4326544 */ lwc1 $f18, %lo(D_800E6540 + 4)($at) /* 04C5DC 8004B9DC 00000000 */ nop /* 04C5E0 8004B9E0 46320102 */ mul.d $f4, $f0, $f18 /* 04C5E4 8004B9E4 10000003 */ b .L8004B9F4 @@ -2421,9 +2421,9 @@ glabel func_80049794 /* 04C618 8004BA18 00000000 */ nop /* 04C61C 8004BA1C 45000007 */ bc1f .L8004BA3C .L8004BA20: -/* 04C620 8004BA20 3C01800E */ lui $at, %hi(D_800E654C) # $at, 0x800e +/* 04C620 8004BA20 3C01800E */ lui $at, %hi(D_800E6548 + 4) # $at, 0x800e /* 04C624 8004BA24 C4276548 */ lwc1 $f7, %lo(D_800E6548)($at) -/* 04C628 8004BA28 C426654C */ lwc1 $f6, %lo(D_800E654C)($at) +/* 04C628 8004BA28 C426654C */ lwc1 $f6, %lo(D_800E6548 + 4)($at) /* 04C62C 8004BA2C 00000000 */ nop /* 04C630 8004BA30 46260282 */ mul.d $f10, $f0, $f6 /* 04C634 8004BA34 10000008 */ b .L8004BA58 diff --git a/asm/non_matchings/unknown_043920/func_8004C140.s b/asm/non_matchings/unknown_043920/func_8004C140.s index 327ce778..3bcba56e 100644 --- a/asm/non_matchings/unknown_043920/func_8004C140.s +++ b/asm/non_matchings/unknown_043920/func_8004C140.s @@ -88,9 +88,9 @@ glabel func_8004C140 /* 04CE5C 8004C25C 1000000F */ b .L8004C29C /* 04CE60 8004C260 A20C01DB */ sb $t4, 0x1db($s0) .L8004C264: -/* 04CE64 8004C264 3C01800E */ lui $at, %hi(D_800E6554) # $at, 0x800e +/* 04CE64 8004C264 3C01800E */ lui $at, %hi(D_800E6550 + 4) # $at, 0x800e /* 04CE68 8004C268 C4216550 */ lwc1 $f1, %lo(D_800E6550)($at) -/* 04CE6C 8004C26C C4206554 */ lwc1 $f0, %lo(D_800E6554)($at) +/* 04CE6C 8004C26C C4206554 */ lwc1 $f0, %lo(D_800E6550 + 4)($at) /* 04CE70 8004C270 A60D0204 */ sh $t5, 0x204($s0) /* 04CE74 8004C274 C484001C */ lwc1 $f4, 0x1c($a0) /* 04CE78 8004C278 C4900024 */ lwc1 $f16, 0x24($a0) diff --git a/asm/non_matchings/unknown_043920/func_8004C2B0.s b/asm/non_matchings/unknown_043920/func_8004C2B0.s index 51c01f57..8b7490a0 100644 --- a/asm/non_matchings/unknown_043920/func_8004C2B0.s +++ b/asm/non_matchings/unknown_043920/func_8004C2B0.s @@ -102,19 +102,19 @@ glabel func_8004C2B0 /* 04CFF0 8004C3F0 3401FFFF */ li $at, 65535 /* 04CFF4 8004C3F4 00812021 */ addu $a0, $a0, $at .L8004C3F8: -/* 04CFF8 8004C3F8 3C01800E */ lui $at, %hi(D_800E655C) # $at, 0x800e +/* 04CFF8 8004C3F8 3C01800E */ lui $at, %hi(D_800E6558 + 4) # $at, 0x800e /* 04CFFC 8004C3FC C4E80094 */ lwc1 $f8, 0x94($a3) /* 04D000 8004C400 C42B6558 */ lwc1 $f11, %lo(D_800E6558)($at) -/* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E655C)($at) +/* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E6558 + 4)($at) /* 04D008 8004C408 46004021 */ cvt.d.s $f0, $f8 /* 04D00C 8004C40C 462A003C */ c.lt.d $f0, $f10 /* 04D010 8004C410 3C01800E */ lui $at, %hi(D_800E6568) # $at, 0x800e /* 04D014 8004C414 45000009 */ bc1f .L8004C43C /* 04D018 8004C418 00000000 */ nop -# Used to access D_800E6560 and D_800E6564. +# Used to access D_800E6560 and D_800E6560 + 4. /* 04D01C 8004C41C 3C01800E */ lui $at, %hi(D_800E6560) # $at, 0x800e /* 04D020 8004C420 C4256560 */ lwc1 $f5, %lo(D_800E6560)($at) -/* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6564)($at) +/* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6560 + 4)($at) /* 04D028 8004C428 00000000 */ nop /* 04D02C 8004C42C 46240180 */ add.d $f6, $f0, $f4 /* 04D030 8004C430 46203220 */ cvt.s.d $f8, $f6 @@ -332,11 +332,11 @@ glabel func_8004C2B0 /* 04D324 8004C724 46020182 */ mul.s $f6, $f0, $f2 /* 04D328 8004C728 3C0140C0 */ li $at, 0x40C00000 # 6.000000 /* 04D32C 8004C72C 44815000 */ mtc1 $at, $f10 -/* 04D330 8004C730 3C01800E */ lui $at, %hi(D_800E6574) # $at, 0x800e +/* 04D330 8004C730 3C01800E */ lui $at, %hi(D_800E6570 + 4) # $at, 0x800e /* 04D334 8004C734 46003207 */ neg.s $f8, $f6 /* 04D338 8004C738 460A4402 */ mul.s $f16, $f8, $f10 /* 04D33C 8004C73C C4256570 */ lwc1 $f5, %lo(D_800E6570)($at) -/* 04D340 8004C740 C4246574 */ lwc1 $f4, %lo(D_800E6574)($at) +/* 04D340 8004C740 C4246574 */ lwc1 $f4, %lo(D_800E6570 + 4)($at) /* 04D344 8004C744 3C014282 */ li $at, 0x42820000 # 65.000000 /* 04D348 8004C748 460081A1 */ cvt.d.s $f6, $f16 /* 04D34C 8004C74C 4626203C */ c.lt.d $f4, $f6 @@ -521,10 +521,10 @@ glabel func_8004C2B0 /* 04D5F4 8004C9F4 3C014000 */ lui $at, 0x4000 /* 04D5F8 8004C9F8 45000009 */ bc1f .L8004CA20 /* 04D5FC 8004C9FC 00000000 */ nop -# Used to access D_800E6578 and D_800E657C. +# Used to access D_800E6578 and D_800E6578 + 4. /* 04D600 8004CA00 3C01800E */ lui $at, %hi(D_800E6578) # $at, 0x800e /* 04D604 8004CA04 C4296578 */ lwc1 $f9, %lo(D_800E6578)($at) -/* 04D608 8004CA08 C428657C */ lwc1 $f8, %lo(D_800E657C)($at) +/* 04D608 8004CA08 C428657C */ lwc1 $f8, %lo(D_800E6578 + 4)($at) /* 04D60C 8004CA0C 00000000 */ nop /* 04D610 8004CA10 46280181 */ sub.d $f6, $f0, $f8 /* 04D614 8004CA14 46203120 */ cvt.s.d $f4, $f6 diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index 2326d11c..f77b566a 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -174,11 +174,11 @@ glabel func_8004DE38 /* 04EC4C 8004E04C A20001F1 */ sb $zero, 0x1f1($s0) .L8004E050: /* 04EC50 8004E050 8F180300 */ lw $t8, %lo(osTvType)($t8) -/* 04EC54 8004E054 3C01800E */ lui $at, %hi(D_800E6594) # $at, 0x800e +/* 04EC54 8004E054 3C01800E */ lui $at, %hi(D_800E6590 + 4) # $at, 0x800e /* 04EC58 8004E058 17000006 */ bnez $t8, .L8004E074 /* 04EC5C 8004E05C 00000000 */ nop /* 04EC60 8004E060 C4256590 */ lwc1 $f5, %lo(D_800E6590)($at) -/* 04EC64 8004E064 C4246594 */ lwc1 $f4, %lo(D_800E6594)($at) +/* 04EC64 8004E064 C4246594 */ lwc1 $f4, %lo(D_800E6590 + 4)($at) /* 04EC68 8004E068 460082A1 */ cvt.d.s $f10, $f16 /* 04EC6C 8004E06C 46245182 */ mul.d $f6, $f10, $f4 /* 04EC70 8004E070 462034A0 */ cvt.s.d $f18, $f6 @@ -308,12 +308,12 @@ glabel func_8004DE38 /* 04EE2C 8004E22C 24A5D564 */ addiu $a1, %lo(D_8011D564) # addiu $a1, $a1, -0x2a9c /* 04EE30 8004E230 ACA20000 */ sw $v0, ($a1) /* 04EE34 8004E234 82080003 */ lb $t0, 3($s0) -/* 04EE38 8004E238 3C01800E */ lui $at, %hi(D_800E659C) # $at, 0x800e +/* 04EE38 8004E238 3C01800E */ lui $at, %hi(D_800E6598 + 4) # $at, 0x800e /* 04EE3C 8004E23C 00084880 */ sll $t1, $t0, 2 /* 04EE40 8004E240 00495021 */ addu $t2, $v0, $t1 /* 04EE44 8004E244 C5480000 */ lwc1 $f8, ($t2) /* 04EE48 8004E248 C4256598 */ lwc1 $f5, %lo(D_800E6598)($at) -/* 04EE4C 8004E24C C424659C */ lwc1 $f4, %lo(D_800E659C)($at) +/* 04EE4C 8004E24C C424659C */ lwc1 $f4, %lo(D_800E6598 + 4)($at) /* 04EE50 8004E250 460042A1 */ cvt.d.s $f10, $f8 /* 04EE54 8004E254 46245182 */ mul.d $f6, $f10, $f4 /* 04EE58 8004E258 3C038012 */ lui $v1, %hi(D_8011D56C) # $v1, 0x8012 @@ -1675,7 +1675,7 @@ glabel L8004ED88 /* 0501F4 8004F5F4 3C01800E */ lui $at, %hi(D_800E65F8) # $at, 0x800e /* 0501F8 8004F5F8 E7240008 */ swc1 $f4, 8($t9) /* 0501FC 8004F5FC C62A0030 */ lwc1 $f10, 0x30($s1) -/* 050200 8004F600 C42665FC */ lwc1 $f6, %lo(D_800E65FC)($at) +/* 050200 8004F600 C42665FC */ lwc1 $f6, %lo(D_800E65F8 + 4)($at) /* 050204 8004F604 C42765F8 */ lwc1 $f7, %lo(D_800E65F8)($at) /* 050208 8004F608 46005221 */ cvt.d.s $f8, $f10 /* 05020C 8004F60C 4626403C */ c.lt.d $f8, $f6 diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 611b821d..2526df9f 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -318,10 +318,10 @@ glabel func_8004F7F4 /* 05083C 8004FC3C 44809000 */ mtc1 $zero, $f18 /* 050840 8004FC40 46000121 */ cvt.d.s $f4, $f0 /* 050844 8004FC44 46322181 */ sub.d $f6, $f4, $f18 -/* 050848 8004FC48 3C01800E */ lui $at, %hi(D_800E6604) # $at, 0x800e +/* 050848 8004FC48 3C01800E */ lui $at, %hi(D_800E6600 + 4) # $at, 0x800e /* 05084C 8004FC4C 46203220 */ cvt.s.d $f8, $f6 /* 050850 8004FC50 C4316600 */ lwc1 $f17, %lo(D_800E6600)($at) -/* 050854 8004FC54 C4306604 */ lwc1 $f16, %lo(D_800E6604)($at) +/* 050854 8004FC54 C4306604 */ lwc1 $f16, %lo(D_800E6600 + 4)($at) /* 050858 8004FC58 460042A1 */ cvt.d.s $f10, $f8 /* 05085C 8004FC5C 46305102 */ mul.d $f4, $f10, $f16 /* 050860 8004FC60 C7B200C4 */ lwc1 $f18, 0xc4($sp) @@ -358,20 +358,20 @@ glabel func_8004F7F4 /* 0508D0 8004FCD0 02202025 */ move $a0, $s1 /* 0508D4 8004FCD4 1140000A */ beqz $t2, .L8004FD00 /* 0508D8 8004FCD8 02002825 */ move $a1, $s0 -/* 0508DC 8004FCDC 3C01800E */ lui $at, %hi(D_800E660C) # $at, 0x800e +/* 0508DC 8004FCDC 3C01800E */ lui $at, %hi(D_800E6608 + 4) # $at, 0x800e /* 0508E0 8004FCE0 C60800A8 */ lwc1 $f8, 0xa8($s0) /* 0508E4 8004FCE4 C4256608 */ lwc1 $f5, %lo(D_800E6608)($at) -/* 0508E8 8004FCE8 C424660C */ lwc1 $f4, %lo(D_800E660C)($at) +/* 0508E8 8004FCE8 C424660C */ lwc1 $f4, %lo(D_800E6608 + 4)($at) /* 0508EC 8004FCEC 460044A1 */ cvt.d.s $f18, $f8 /* 0508F0 8004FCF0 46249281 */ sub.d $f10, $f18, $f4 /* 0508F4 8004FCF4 462051A0 */ cvt.s.d $f6, $f10 /* 0508F8 8004FCF8 10000009 */ b .L8004FD20 /* 0508FC 8004FCFC E60600A8 */ swc1 $f6, 0xa8($s0) .L8004FD00: -/* 050900 8004FD00 3C01800E */ lui $at, %hi(D_800E6614) # $at, 0x800e +/* 050900 8004FD00 3C01800E */ lui $at, %hi(D_800E6610 + 4) # $at, 0x800e /* 050904 8004FD04 C61000A8 */ lwc1 $f16, 0xa8($s0) /* 050908 8004FD08 C4336610 */ lwc1 $f19, %lo(D_800E6610)($at) -/* 05090C 8004FD0C C4326614 */ lwc1 $f18, %lo(D_800E6614)($at) +/* 05090C 8004FD0C C4326614 */ lwc1 $f18, %lo(D_800E6610 + 4)($at) /* 050910 8004FD10 46008221 */ cvt.d.s $f8, $f16 /* 050914 8004FD14 46324101 */ sub.d $f4, $f8, $f18 /* 050918 8004FD18 462022A0 */ cvt.s.d $f10, $f4 @@ -383,15 +383,15 @@ glabel func_8004F7F4 /* 05092C 8004FD2C 0C016420 */ jal func_80059080 /* 050930 8004FD30 27A700B0 */ addiu $a3, $sp, 0xb0 /* 050934 8004FD34 920C01F0 */ lbu $t4, 0x1f0($s0) -# Used to access D_800E6620 and D_800E6624. +# Used to access D_800E6620 and D_800E6620 + 4. /* 050938 8004FD38 3C01800E */ lui $at, %hi(D_800E6620) # $at, 0x800e /* 05093C 8004FD3C 1180000A */ beqz $t4, .L8004FD68 /* 050940 8004FD40 00000000 */ nop -# Used to access D_800E6618 and D_800E661C. +# Used to access D_800E6618 and D_800E6618 + 4. /* 050944 8004FD44 3C01800E */ lui $at, %hi(D_800E6618) # $at, 0x800e /* 050948 8004FD48 C60600A8 */ lwc1 $f6, 0xa8($s0) /* 05094C 8004FD4C C4296618 */ lwc1 $f9, %lo(D_800E6618)($at) -/* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E661C)($at) +/* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E6618 + 4)($at) /* 050954 8004FD54 46003421 */ cvt.d.s $f16, $f6 /* 050958 8004FD58 46288480 */ add.d $f18, $f16, $f8 /* 05095C 8004FD5C 46209120 */ cvt.s.d $f4, $f18 @@ -400,7 +400,7 @@ glabel func_8004F7F4 .L8004FD68: /* 050968 8004FD68 C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 05096C 8004FD6C C4316620 */ lwc1 $f17, %lo(D_800E6620)($at) -/* 050970 8004FD70 C4306624 */ lwc1 $f16, %lo(D_800E6624)($at) +/* 050970 8004FD70 C4306624 */ lwc1 $f16, %lo(D_800E6620 + 4)($at) /* 050974 8004FD74 460051A1 */ cvt.d.s $f6, $f10 /* 050978 8004FD78 46303200 */ add.d $f8, $f6, $f16 /* 05097C 8004FD7C 462044A0 */ cvt.s.d $f18, $f8 @@ -534,12 +534,12 @@ glabel func_8004F7F4 .L8004FF5C: /* 050B5C 8004FF5C 3C188012 */ lui $t8, %hi(D_8011D552) # $t8, 0x8012 /* 050B60 8004FF60 9718D552 */ lhu $t8, %lo(D_8011D552)($t8) -/* 050B64 8004FF64 3C01800E */ lui $at, %hi(D_800E662C) # $at, 0x800e +/* 050B64 8004FF64 3C01800E */ lui $at, %hi(D_800E6628 + 4) # $at, 0x800e /* 050B68 8004FF68 2719FFD8 */ addiu $t9, $t8, -0x28 /* 050B6C 8004FF6C 44999000 */ mtc1 $t9, $f18 /* 050B70 8004FF70 C42B6628 */ lwc1 $f11, %lo(D_800E6628)($at) /* 050B74 8004FF74 46809220 */ cvt.s.w $f8, $f18 -/* 050B78 8004FF78 C42A662C */ lwc1 $f10, %lo(D_800E662C)($at) +/* 050B78 8004FF78 C42A662C */ lwc1 $f10, %lo(D_800E6628 + 4)($at) /* 050B7C 8004FF7C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 050B80 8004FF80 46004121 */ cvt.d.s $f4, $f8 /* 050B84 8004FF84 462A2402 */ mul.d $f16, $f4, $f10 @@ -605,7 +605,7 @@ glabel func_8004F7F4 /* 050C68 80050068 C7A800B8 */ lwc1 $f8, 0xb8($sp) /* 050C6C 8005006C E7B200B4 */ swc1 $f18, 0xb4($sp) /* 050C70 80050070 821901D2 */ lb $t9, 0x1d2($s0) -/* 050C74 80050074 3C01800E */ lui $at, %hi(D_800E6634) # $at, 0x800e +/* 050C74 80050074 3C01800E */ lui $at, %hi(D_800E6630 + 4) # $at, 0x800e /* 050C78 80050078 13200009 */ beqz $t9, .L800500A0 /* 050C7C 8005007C 00000000 */ nop /* 050C80 80050080 C604011C */ lwc1 $f4, 0x11c($s0) @@ -623,7 +623,7 @@ glabel func_8004F7F4 /* 050CAC 800500AC 00000000 */ nop /* 050CB0 800500B0 C7A800B8 */ lwc1 $f8, 0xb8($sp) /* 050CB4 800500B4 C4236630 */ lwc1 $f3, %lo(D_800E6630)($at) -/* 050CB8 800500B8 C4226634 */ lwc1 $f2, %lo(D_800E6634)($at) +/* 050CB8 800500B8 C4226634 */ lwc1 $f2, %lo(D_800E6630 + 4)($at) /* 050CBC 800500BC 46004121 */ cvt.d.s $f4, $f8 /* 050CC0 800500C0 46222282 */ mul.d $f10, $f4, $f2 /* 050CC4 800500C4 C7B000B4 */ lwc1 $f16, 0xb4($sp) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index 1938d2c6..91c53c2a 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -74,11 +74,11 @@ glabel func_80050A28 /* 051698 80050A98 31F8001F */ andi $t8, $t7, 0x1f /* 05169C 80050A9C 0338C821 */ addu $t9, $t9, $t8 /* 0516A0 80050AA0 8339CDB0 */ lb $t9, %lo(D_800DCDB0)($t9) -/* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E663C) # $at, 0x800e +/* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E6638 + 4) # $at, 0x800e /* 0516A8 80050AA8 44995000 */ mtc1 $t9, $f10 /* 0516AC 80050AAC C4276638 */ lwc1 $f7, %lo(D_800E6638)($at) /* 0516B0 80050AB0 468054A0 */ cvt.s.w $f18, $f10 -/* 0516B4 80050AB4 C426663C */ lwc1 $f6, %lo(D_800E663C)($at) +/* 0516B4 80050AB4 C426663C */ lwc1 $f6, %lo(D_800E6638 + 4)($at) /* 0516B8 80050AB8 C60A00A0 */ lwc1 $f10, 0xa0($s0) /* 0516BC 80050ABC 46009121 */ cvt.d.s $f4, $f18 /* 0516C0 80050AC0 46262202 */ mul.d $f8, $f4, $f6 @@ -181,10 +181,10 @@ glabel func_80050A28 /* 051824 80050C24 A20001FB */ sb $zero, 0x1fb($s0) .L80050C28: /* 051828 80050C28 AFA00060 */ sw $zero, 0x60($sp) -/* 05182C 80050C2C 3C01800E */ lui $at, %hi(D_800E6644) # $at, 0x800e +/* 05182C 80050C2C 3C01800E */ lui $at, %hi(D_800E6640 + 4) # $at, 0x800e /* 051830 80050C30 C60600B8 */ lwc1 $f6, 0xb8($s0) /* 051834 80050C34 C4256640 */ lwc1 $f5, %lo(D_800E6640)($at) -/* 051838 80050C38 C4246644 */ lwc1 $f4, %lo(D_800E6644)($at) +/* 051838 80050C38 C4246644 */ lwc1 $f4, %lo(D_800E6640 + 4)($at) /* 05183C 80050C3C 460032A1 */ cvt.d.s $f10, $f6 /* 051840 80050C40 462A203C */ c.lt.d $f4, $f10 /* 051844 80050C44 00000000 */ nop @@ -463,11 +463,11 @@ glabel func_80050A28 /* 051C2C 8005102C 13000019 */ beqz $t8, .L80051094 /* 051C30 80051030 00000000 */ nop /* 051C34 80051034 820401E6 */ lb $a0, 0x1e6($s0) -/* 051C38 80051038 3C01800E */ lui $at, %hi(D_800E664C) # $at, 0x800e +/* 051C38 80051038 3C01800E */ lui $at, %hi(D_800E6648 + 4) # $at, 0x800e /* 051C3C 8005103C 10800015 */ beqz $a0, .L80051094 /* 051C40 80051040 3C198012 */ lui $t9, %hi(D_8011D534) # $t9, 0x8012 /* 051C44 80051044 C4296648 */ lwc1 $f9, %lo(D_800E6648)($at) -/* 051C48 80051048 C428664C */ lwc1 $f8, %lo(D_800E664C)($at) +/* 051C48 80051048 C428664C */ lwc1 $f8, %lo(D_800E6648 + 4)($at) /* 051C4C 8005104C 46000121 */ cvt.d.s $f4, $f0 /* 051C50 80051050 46282182 */ mul.d $f6, $f4, $f8 /* 051C54 80051054 8F39D534 */ lw $t9, %lo(D_8011D534)($t9) @@ -627,7 +627,7 @@ glabel func_80050A28 /* 051E78 80051278 2406000C */ li $a2, 12 .L8005127C: /* 051E7C 8005127C 10400006 */ beqz $v0, .L80051298 -/* 051E80 80051280 3C01800E */ lui $at, %hi(D_800E6654) # $at, 0x800e +/* 051E80 80051280 3C01800E */ lui $at, %hi(D_800E6650 + 4) # $at, 0x800e /* 051E84 80051284 820A01E6 */ lb $t2, 0x1e6($s0) /* 051E88 80051288 00000000 */ nop /* 051E8C 8005128C 11400002 */ beqz $t2, .L80051298 @@ -636,19 +636,19 @@ glabel func_80050A28 .L80051298: /* 051E98 80051298 C60A002C */ lwc1 $f10, 0x2c($s0) /* 051E9C 8005129C C4256650 */ lwc1 $f5, %lo(D_800E6650)($at) -/* 051EA0 800512A0 C4246654 */ lwc1 $f4, %lo(D_800E6654)($at) +/* 051EA0 800512A0 C4246654 */ lwc1 $f4, %lo(D_800E6650 + 4)($at) /* 051EA4 800512A4 460050A1 */ cvt.d.s $f2, $f10 /* 051EA8 800512A8 4624103C */ c.lt.d $f2, $f4 /* 051EAC 800512AC 00001025 */ move $v0, $zero /* 051EB0 800512B0 45000005 */ bc1f .L800512C8 -/* 051EB4 800512B4 3C01800E */ lui $at, %hi(D_800E665C) # $at, 0x800e +/* 051EB4 800512B4 3C01800E */ lui $at, %hi(D_800E6658 + 4) # $at, 0x800e /* 051EB8 800512B8 00660019 */ multu $v1, $a2 /* 051EBC 800512BC 00001012 */ mflo $v0 /* 051EC0 800512C0 00000000 */ nop /* 051EC4 800512C4 00000000 */ nop .L800512C8: /* 051EC8 800512C8 C4296658 */ lwc1 $f9, %lo(D_800E6658)($at) -/* 051ECC 800512CC C428665C */ lwc1 $f8, %lo(D_800E665C)($at) +/* 051ECC 800512CC C428665C */ lwc1 $f8, %lo(D_800E6658 + 4)($at) /* 051ED0 800512D0 8FB90080 */ lw $t9, 0x80($sp) /* 051ED4 800512D4 4622403C */ c.lt.d $f8, $f2 /* 051ED8 800512D8 00000000 */ nop @@ -930,14 +930,14 @@ glabel func_80050A28 /* 0522E4 800516E4 460A6202 */ mul.s $f8, $f12, $f10 /* 0522E8 800516E8 C6120030 */ lwc1 $f18, 0x30($s0) /* 0522EC 800516EC 860E0000 */ lh $t6, ($s0) -/* 0522F0 800516F0 3C01800E */ lui $at, %hi(D_800E666C) # $at, 0x800e +/* 0522F0 800516F0 3C01800E */ lui $at, %hi(D_800E6668 + 4) # $at, 0x800e /* 0522F4 800516F4 46044183 */ div.s $f6, $f8, $f4 /* 0522F8 800516F8 46069280 */ add.s $f10, $f18, $f6 /* 0522FC 800516FC 146E0008 */ bne $v1, $t6, .L80051720 /* 052300 80051700 E60A0030 */ swc1 $f10, 0x30($s0) /* 052304 80051704 C6080030 */ lwc1 $f8, 0x30($s0) /* 052308 80051708 C4336668 */ lwc1 $f19, %lo(D_800E6668)($at) -/* 05230C 8005170C C432666C */ lwc1 $f18, %lo(D_800E666C)($at) +/* 05230C 8005170C C432666C */ lwc1 $f18, %lo(D_800E6668 + 4)($at) /* 052310 80051710 46004121 */ cvt.d.s $f4, $f8 /* 052314 80051714 46322182 */ mul.d $f6, $f4, $f18 /* 052318 80051718 462032A0 */ cvt.s.d $f10, $f6 @@ -987,9 +987,9 @@ glabel func_80050A28 /* 0523C0 800517C0 AC2AD554 */ sw $t2, %lo(D_8011D554)($at) /* 0523C4 800517C4 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 0523C8 800517C8 44814800 */ mtc1 $at, $f9 -/* 0523CC 800517CC 3C01800E */ lui $at, %hi(D_800E6674) # $at, 0x800e +/* 0523CC 800517CC 3C01800E */ lui $at, %hi(D_800E6670 + 4) # $at, 0x800e /* 0523D0 800517D0 C4336670 */ lwc1 $f19, %lo(D_800E6670)($at) -/* 0523D4 800517D4 C4326674 */ lwc1 $f18, %lo(D_800E6674)($at) +/* 0523D4 800517D4 C4326674 */ lwc1 $f18, %lo(D_800E6670 + 4)($at) /* 0523D8 800517D8 462C4101 */ sub.d $f4, $f8, $f12 /* 0523DC 800517DC 46322182 */ mul.d $f6, $f4, $f18 /* 0523E0 800517E0 00000000 */ nop @@ -1338,13 +1338,13 @@ glabel func_80050A28 /* 0528E4 80051CE4 C46A0004 */ lwc1 $f10, 4($v1) /* 0528E8 80051CE8 460091A1 */ cvt.d.s $f6, $f18 /* 0528EC 80051CEC 46283102 */ mul.d $f4, $f6, $f8 -/* 0528F0 80051CF0 3C01800E */ lui $at, %hi(D_800E667C) # $at, 0x800e +/* 0528F0 80051CF0 3C01800E */ lui $at, %hi(D_800E6678 + 4) # $at, 0x800e /* 0528F4 80051CF4 820B01D3 */ lb $t3, 0x1d3($s0) /* 0528F8 80051CF8 46005482 */ mul.s $f18, $f10, $f0 /* 0528FC 80051CFC C4336678 */ lwc1 $f19, %lo(D_800E6678)($at) /* 052900 80051D00 460091A1 */ cvt.d.s $f6, $f18 /* 052904 80051D04 46262200 */ add.d $f8, $f4, $f6 -/* 052908 80051D08 C432667C */ lwc1 $f18, %lo(D_800E667C)($at) +/* 052908 80051D08 C432667C */ lwc1 $f18, %lo(D_800E6678 + 4)($at) /* 05290C 80051D0C 462043A0 */ cvt.s.d $f14, $f8 /* 052910 80051D10 C7A60034 */ lwc1 $f6, 0x34($sp) /* 052914 80051D14 460072A1 */ cvt.d.s $f10, $f14 @@ -1404,9 +1404,9 @@ glabel func_80050A28 /* 0529DC 80051DDC 00000000 */ nop /* 0529E0 80051DE0 11C0002A */ beqz $t6, .L80051E8C .L80051DE4: -/* 0529E4 80051DE4 3C01800E */ lui $at, %hi(D_800E6684) # $at, 0x800e +/* 0529E4 80051DE4 3C01800E */ lui $at, %hi(D_800E6680 + 4) # $at, 0x800e /* 0529E8 80051DE8 C4296680 */ lwc1 $f9, %lo(D_800E6680)($at) -/* 0529EC 80051DEC C4286684 */ lwc1 $f8, %lo(D_800E6684)($at) +/* 0529EC 80051DEC C4286684 */ lwc1 $f8, %lo(D_800E6680 + 4)($at) /* 0529F0 80051DF0 46228181 */ sub.d $f6, $f16, $f2 /* 0529F4 80051DF4 24010004 */ li $at, 4 /* 0529F8 80051DF8 46283282 */ mul.d $f10, $f6, $f8 @@ -1436,9 +1436,9 @@ glabel func_80050A28 /* 052A54 80051E54 00000000 */ nop /* 052A58 80051E58 2B210005 */ slti $at, $t9, 5 /* 052A5C 80051E5C 14200006 */ bnez $at, .L80051E78 -/* 052A60 80051E60 3C01800E */ lui $at, %hi(D_800E668C) # $at, 0x800e +/* 052A60 80051E60 3C01800E */ lui $at, %hi(D_800E6688 + 4) # $at, 0x800e /* 052A64 80051E64 C42B6688 */ lwc1 $f11, %lo(D_800E6688)($at) -/* 052A68 80051E68 C42A668C */ lwc1 $f10, %lo(D_800E668C)($at) +/* 052A68 80051E68 C42A668C */ lwc1 $f10, %lo(D_800E6688 + 4)($at) /* 052A6C 80051E6C 46000221 */ cvt.d.s $f8, $f0 /* 052A70 80051E70 462A4482 */ mul.d $f18, $f8, $f10 /* 052A74 80051E74 46209020 */ cvt.s.d $f0, $f18 @@ -1450,10 +1450,10 @@ glabel func_80050A28 /* 052A88 80051E88 E60600B8 */ swc1 $f6, 0xb8($s0) .L80051E8C: /* 052A8C 80051E8C C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 052A90 80051E90 3C01800E */ lui $at, %hi(D_800E6694) # $at, 0x800e +/* 052A90 80051E90 3C01800E */ lui $at, %hi(D_800E6690 + 4) # $at, 0x800e /* 052A94 80051E94 460E4282 */ mul.s $f10, $f8, $f14 /* 052A98 80051E98 C4256690 */ lwc1 $f5, %lo(D_800E6690)($at) -/* 052A9C 80051E9C C4246694 */ lwc1 $f4, %lo(D_800E6694)($at) +/* 052A9C 80051E9C C4246694 */ lwc1 $f4, %lo(D_800E6690 + 4)($at) /* 052AA0 80051EA0 C60800B4 */ lwc1 $f8, 0xb4($s0) /* 052AA4 80051EA4 460054A1 */ cvt.d.s $f18, $f10 /* 052AA8 80051EA8 46249182 */ mul.d $f6, $f18, $f4 @@ -1464,15 +1464,15 @@ glabel func_80050A28 /* 052ABC 80051EBC 44805000 */ mtc1 $zero, $f10 /* 052AC0 80051EC0 E612002C */ swc1 $f18, 0x2c($s0) /* 052AC4 80051EC4 C60C002C */ lwc1 $f12, 0x2c($s0) -/* 052AC8 80051EC8 C424669C */ lwc1 $f4, %lo(D_800E669C)($at) +/* 052AC8 80051EC8 C424669C */ lwc1 $f4, %lo(D_800E6698 + 4)($at) /* 052ACC 80051ECC C4256698 */ lwc1 $f5, %lo(D_800E6698)($at) /* 052AD0 80051ED0 460060A1 */ cvt.d.s $f2, $f12 /* 052AD4 80051ED4 4622203C */ c.lt.d $f4, $f2 /* 052AD8 80051ED8 00000000 */ nop /* 052ADC 80051EDC 4500000D */ bc1f .L80051F14 -/* 052AE0 80051EE0 3C01800E */ lui $at, %hi(D_800E66A4) # $at, 0x800e +/* 052AE0 80051EE0 3C01800E */ lui $at, %hi(D_800E66A0 + 4) # $at, 0x800e /* 052AE4 80051EE4 C42766A0 */ lwc1 $f7, %lo(D_800E66A0)($at) -/* 052AE8 80051EE8 C42666A4 */ lwc1 $f6, %lo(D_800E66A4)($at) +/* 052AE8 80051EE8 C42666A4 */ lwc1 $f6, %lo(D_800E66A0 + 4)($at) /* 052AEC 80051EEC 00000000 */ nop /* 052AF0 80051EF0 4626103C */ c.lt.d $f2, $f6 /* 052AF4 80051EF4 00000000 */ nop @@ -1519,7 +1519,7 @@ glabel func_80050A28 /* 052B8C 80051F8C C4C80020 */ lwc1 $f8, 0x20($a2) /* 052B90 80051F90 460A7482 */ mul.s $f18, $f14, $f10 /* 052B94 80051F94 3C0D8012 */ lui $t5, %hi(D_8011D586) # $t5, 0x8012 -/* 052B98 80051F98 3C01800E */ lui $at, %hi(D_800E66AC) # $at, 0x800e +/* 052B98 80051F98 3C01800E */ lui $at, %hi(D_800E66A8 + 4) # $at, 0x800e /* 052B9C 80051F9C 46124101 */ sub.s $f4, $f8, $f18 /* 052BA0 80051FA0 E4C40020 */ swc1 $f4, 0x20($a2) /* 052BA4 80051FA4 85ADD586 */ lh $t5, %lo(D_8011D586)($t5) @@ -1531,7 +1531,7 @@ glabel func_80050A28 .L80051FBC: /* 052BBC 80051FBC C60600B8 */ lwc1 $f6, 0xb8($s0) /* 052BC0 80051FC0 C42966A8 */ lwc1 $f9, %lo(D_800E66A8)($at) -/* 052BC4 80051FC4 C42866AC */ lwc1 $f8, %lo(D_800E66AC)($at) +/* 052BC4 80051FC4 C42866AC */ lwc1 $f8, %lo(D_800E66A8 + 4)($at) /* 052BC8 80051FC8 460032A1 */ cvt.d.s $f10, $f6 /* 052BCC 80051FCC 4628503C */ c.lt.d $f10, $f8 /* 052BD0 80051FD0 00000000 */ nop @@ -1551,11 +1551,11 @@ glabel func_80050A28 /* 052C08 80052008 44802000 */ mtc1 $zero, $f4 /* 052C0C 8005200C 460064A1 */ cvt.d.s $f18, $f12 /* 052C10 80052010 4624903C */ c.lt.d $f18, $f4 -/* 052C14 80052014 3C01800E */ lui $at, %hi(D_800E66B4) # $at, 0x800e +/* 052C14 80052014 3C01800E */ lui $at, %hi(D_800E66B0 + 4) # $at, 0x800e /* 052C18 80052018 45000020 */ bc1f .L8005209C /* 052C1C 8005201C 46006086 */ mov.s $f2, $f12 /* 052C20 80052020 C42B66B0 */ lwc1 $f11, %lo(D_800E66B0)($at) -/* 052C24 80052024 C42A66B4 */ lwc1 $f10, %lo(D_800E66B4)($at) +/* 052C24 80052024 C42A66B4 */ lwc1 $f10, %lo(D_800E66B0 + 4)($at) /* 052C28 80052028 46001087 */ neg.s $f2, $f2 /* 052C2C 8005202C 460011A1 */ cvt.d.s $f6, $f2 /* 052C30 80052030 462A3201 */ sub.d $f8, $f6, $f10 @@ -1564,7 +1564,7 @@ glabel func_80050A28 /* 052C3C 8005203C 44809000 */ mtc1 $zero, $f18 /* 052C40 80052040 46001021 */ cvt.d.s $f0, $f2 /* 052C44 80052044 4632003C */ c.lt.d $f0, $f18 -/* 052C48 80052048 3C01800E */ lui $at, %hi(D_800E66BC) # $at, 0x800e +/* 052C48 80052048 3C01800E */ lui $at, %hi(D_800E66B8 + 4) # $at, 0x800e /* 052C4C 8005204C 45000004 */ bc1f .L80052060 /* 052C50 80052050 00000000 */ nop /* 052C54 80052054 44801000 */ mtc1 $zero, $f2 @@ -1572,7 +1572,7 @@ glabel func_80050A28 /* 052C5C 8005205C 46001021 */ cvt.d.s $f0, $f2 .L80052060: /* 052C60 80052060 C42566B8 */ lwc1 $f5, %lo(D_800E66B8)($at) -/* 052C64 80052064 C42466BC */ lwc1 $f4, %lo(D_800E66BC)($at) +/* 052C64 80052064 C42466BC */ lwc1 $f4, %lo(D_800E66B8 + 4)($at) /* 052C68 80052068 3C01800E */ lui $at, %hi(D_800E66C0) # $at, 0x800e /* 052C6C 8005206C 4620203C */ c.lt.d $f4, $f0 /* 052C70 80052070 00000000 */ nop @@ -1604,10 +1604,10 @@ glabel func_80050A28 /* 052CCC 800520CC 460A4480 */ add.s $f18, $f8, $f10 /* 052CD0 800520D0 E612002C */ swc1 $f18, 0x2c($s0) .L800520D4: -/* 052CD4 800520D4 3C01800E */ lui $at, %hi(D_800E66CC) # $at, 0x800e +/* 052CD4 800520D4 3C01800E */ lui $at, %hi(D_800E66C8 + 4) # $at, 0x800e /* 052CD8 800520D8 C606002C */ lwc1 $f6, 0x2c($s0) /* 052CDC 800520DC C42B66C8 */ lwc1 $f11, %lo(D_800E66C8)($at) -/* 052CE0 800520E0 C42A66CC */ lwc1 $f10, %lo(D_800E66CC)($at) +/* 052CE0 800520E0 C42A66CC */ lwc1 $f10, %lo(D_800E66C8 + 4)($at) /* 052CE4 800520E4 46003221 */ cvt.d.s $f8, $f6 /* 052CE8 800520E8 462A4482 */ mul.d $f18, $f8, $f10 /* 052CEC 800520EC C6040008 */ lwc1 $f4, 8($s0) diff --git a/asm/non_matchings/unknown_043920/func_80052B64.s b/asm/non_matchings/unknown_043920/func_80052B64.s index c4a3ea52..6b3cf658 100644 --- a/asm/non_matchings/unknown_043920/func_80052B64.s +++ b/asm/non_matchings/unknown_043920/func_80052B64.s @@ -9,10 +9,10 @@ glabel func_80052B64 /* 05376C 80052B6C AFB00018 */ sw $s0, 0x18($sp) /* 053770 80052B70 AFA50024 */ sw $a1, 0x24($sp) /* 053774 80052B74 AFA7002C */ sw $a3, 0x2c($sp) -/* 053778 80052B78 3C01800E */ lui $at, %hi(D_800E66F4) # $at, 0x800e +/* 053778 80052B78 3C01800E */ lui $at, %hi(D_800E66F0 + 4) # $at, 0x800e /* 05377C 80052B7C C4A4002C */ lwc1 $f4, 0x2c($a1) /* 053780 80052B80 C42966F0 */ lwc1 $f9, %lo(D_800E66F0)($at) -/* 053784 80052B84 C42866F4 */ lwc1 $f8, %lo(D_800E66F4)($at) +/* 053784 80052B84 C42866F4 */ lwc1 $f8, %lo(D_800E66F0 + 4)($at) /* 053788 80052B88 460021A1 */ cvt.d.s $f6, $f4 /* 05378C 80052B8C 46283282 */ mul.d $f10, $f6, $f8 /* 053790 80052B90 44809000 */ mtc1 $zero, $f18 diff --git a/asm/non_matchings/unknown_043920/func_80052D7C.s b/asm/non_matchings/unknown_043920/func_80052D7C.s index b8f90151..647a5877 100644 --- a/asm/non_matchings/unknown_043920/func_80052D7C.s +++ b/asm/non_matchings/unknown_043920/func_80052D7C.s @@ -195,11 +195,11 @@ glabel func_80052D7C /* 053BE0 80052FE0 462084A0 */ cvt.s.d $f18, $f16 /* 053BE4 80052FE4 E4B2002C */ swc1 $f18, 0x2c($a1) .L80052FE8: -/* 053BE8 80052FE8 3C01800E */ lui $at, %hi(D_800E66FC) # $at, 0x800e +/* 053BE8 80052FE8 3C01800E */ lui $at, %hi(D_800E66F8 + 4) # $at, 0x800e /* 053BEC 80052FEC A3AF0033 */ sb $t7, 0x33($sp) /* 053BF0 80052FF0 C4A60030 */ lwc1 $f6, 0x30($a1) /* 053BF4 80052FF4 C42166F8 */ lwc1 $f1, %lo(D_800E66F8)($at) -/* 053BF8 80052FF8 C42066FC */ lwc1 $f0, %lo(D_800E66FC)($at) +/* 053BF8 80052FF8 C42066FC */ lwc1 $f0, %lo(D_800E66F8 + 4)($at) /* 053BFC 80052FFC 46003121 */ cvt.d.s $f4, $f6 /* 053C00 80053000 46202202 */ mul.d $f8, $f4, $f0 /* 053C04 80053004 C4B0002C */ lwc1 $f16, 0x2c($a1) @@ -215,7 +215,7 @@ glabel func_80052D7C /* 053C2C 8005302C 24C6D4F8 */ addiu $a2, %lo(D_8011D4F8) # addiu $a2, $a2, -0x2b08 /* 053C30 80053030 E4A4002C */ swc1 $f4, 0x2c($a1) /* 053C34 80053034 8FA40040 */ lw $a0, 0x40($sp) -/* 053C38 80053038 C4306704 */ lwc1 $f16, %lo(D_800E6704)($at) +/* 053C38 80053038 C4306704 */ lwc1 $f16, %lo(D_800E6700 + 4)($at) /* 053C3C 8005303C C4880020 */ lwc1 $f8, 0x20($a0) /* 053C40 80053040 C4316700 */ lwc1 $f17, %lo(D_800E6700)($at) /* 053C44 80053044 460042A1 */ cvt.d.s $f10, $f8 @@ -244,7 +244,7 @@ glabel func_80052D7C /* 053C9C 8005309C A0AA01E8 */ sb $t2, 0x1e8($a1) .L800530A0: /* 053CA0 800530A0 80A201D3 */ lb $v0, 0x1d3($a1) -/* 053CA4 800530A4 3C01800E */ lui $at, %hi(D_800E670C) # $at, 0x800e +/* 053CA4 800530A4 3C01800E */ lui $at, %hi(D_800E6708 + 4) # $at, 0x800e /* 053CA8 800530A8 18400006 */ blez $v0, .L800530C4 /* 053CAC 800530AC 24C6D554 */ addiu $a2, %lo(D_8011D554) # addiu $a2, $a2, -0x2aac /* 053CB0 800530B0 8FAB0048 */ lw $t3, 0x48($sp) @@ -258,7 +258,7 @@ glabel func_80052D7C /* 053CC8 800530C8 C4AA002C */ lwc1 $f10, 0x2c($a1) /* 053CCC 800530CC 80A201E8 */ lb $v0, 0x1e8($a1) /* 053CD0 800530D0 C4296708 */ lwc1 $f9, %lo(D_800E6708)($at) -/* 053CD4 800530D4 C428670C */ lwc1 $f8, %lo(D_800E670C)($at) +/* 053CD4 800530D4 C428670C */ lwc1 $f8, %lo(D_800E6708 + 4)($at) /* 053CD8 800530D8 46005421 */ cvt.d.s $f16, $f10 /* 053CDC 800530DC 4630403C */ c.lt.d $f8, $f16 /* 053CE0 800530E0 00027080 */ sll $t6, $v0, 2 @@ -286,11 +286,11 @@ glabel func_80052D7C /* 053D34 80053134 44803000 */ mtc1 $zero, $f6 /* 053D38 80053138 46009021 */ cvt.d.s $f0, $f18 /* 053D3C 8005313C 4620303C */ c.lt.d $f6, $f0 -/* 053D40 80053140 3C01800E */ lui $at, %hi(D_800E6714) # $at, 0x800e +/* 053D40 80053140 3C01800E */ lui $at, %hi(D_800E6710 + 4) # $at, 0x800e /* 053D44 80053144 45000007 */ bc1f .L80053164 /* 053D48 80053148 00000000 */ nop /* 053D4C 8005314C C4256710 */ lwc1 $f5, %lo(D_800E6710)($at) -/* 053D50 80053150 C4246714 */ lwc1 $f4, %lo(D_800E6714)($at) +/* 053D50 80053150 C4246714 */ lwc1 $f4, %lo(D_800E6710 + 4)($at) /* 053D54 80053154 00000000 */ nop /* 053D58 80053158 46240281 */ sub.d $f10, $f0, $f4 /* 053D5C 8005315C 46205220 */ cvt.s.d $f8, $f10 @@ -305,10 +305,10 @@ glabel func_80052D7C /* 053D7C 8005317C 00000000 */ nop /* 053D80 80053180 00001825 */ move $v1, $zero .L80053184: -/* 053D84 80053184 3C01800E */ lui $at, %hi(D_800E671C) # $at, 0x800e +/* 053D84 80053184 3C01800E */ lui $at, %hi(D_800E6718 + 4) # $at, 0x800e /* 053D88 80053188 C5500020 */ lwc1 $f16, 0x20($t2) /* 053D8C 8005318C C4336718 */ lwc1 $f19, %lo(D_800E6718)($at) -/* 053D90 80053190 C432671C */ lwc1 $f18, %lo(D_800E671C)($at) +/* 053D90 80053190 C432671C */ lwc1 $f18, %lo(D_800E6718 + 4)($at) /* 053D94 80053194 46008021 */ cvt.d.s $f0, $f16 /* 053D98 80053198 46320182 */ mul.d $f6, $f0, $f18 /* 053D9C 8005319C C7A4004C */ lwc1 $f4, 0x4c($sp) @@ -349,10 +349,10 @@ glabel func_80052D7C /* 053E20 80053220 24010003 */ li $at, 3 /* 053E24 80053224 14410023 */ bne $v0, $at, .L800532B4 .L80053228: -/* 053E28 80053228 3C01800E */ lui $at, %hi(D_800E672C) # $at, 0x800e +/* 053E28 80053228 3C01800E */ lui $at, %hi(D_800E6728 + 4) # $at, 0x800e /* 053E2C 8005322C C4A40030 */ lwc1 $f4, 0x30($a1) /* 053E30 80053230 C4216728 */ lwc1 $f1, %lo(D_800E6728)($at) -/* 053E34 80053234 C420672C */ lwc1 $f0, %lo(D_800E672C)($at) +/* 053E34 80053234 C420672C */ lwc1 $f0, %lo(D_800E6728 + 4)($at) /* 053E38 80053238 460021A1 */ cvt.d.s $f6, $f4 /* 053E3C 8005323C 46203282 */ mul.d $f10, $f6, $f0 /* 053E40 80053240 C4B0002C */ lwc1 $f16, 0x2c($a1) @@ -366,10 +366,10 @@ glabel func_80052D7C /* 053E60 80053260 E4A6002C */ swc1 $f6, 0x2c($a1) /* 053E64 80053264 14200009 */ bnez $at, .L8005328C /* 053E68 80053268 A3AB0033 */ sb $t3, 0x33($sp) -/* 053E6C 8005326C 3C01800E */ lui $at, %hi(D_800E6734) # $at, 0x800e +/* 053E6C 8005326C 3C01800E */ lui $at, %hi(D_800E6730 + 4) # $at, 0x800e /* 053E70 80053270 C4AA002C */ lwc1 $f10, 0x2c($a1) /* 053E74 80053274 C4316730 */ lwc1 $f17, %lo(D_800E6730)($at) -/* 053E78 80053278 C4306734 */ lwc1 $f16, %lo(D_800E6734)($at) +/* 053E78 80053278 C4306734 */ lwc1 $f16, %lo(D_800E6730 + 4)($at) /* 053E7C 8005327C 46005221 */ cvt.d.s $f8, $f10 /* 053E80 80053280 46304481 */ sub.d $f18, $f8, $f16 /* 053E84 80053284 46209120 */ cvt.s.d $f4, $f18 @@ -377,10 +377,10 @@ glabel func_80052D7C .L8005328C: /* 053E8C 8005328C 2861FFCE */ slti $at, $v1, -0x32 /* 053E90 80053290 10200008 */ beqz $at, .L800532B4 -/* 053E94 80053294 3C01800E */ lui $at, %hi(D_800E673C) # $at, 0x800e +/* 053E94 80053294 3C01800E */ lui $at, %hi(D_800E6738 + 4) # $at, 0x800e /* 053E98 80053298 C4A6002C */ lwc1 $f6, 0x2c($a1) /* 053E9C 8005329C C4296738 */ lwc1 $f9, %lo(D_800E6738)($at) -/* 053EA0 800532A0 C428673C */ lwc1 $f8, %lo(D_800E673C)($at) +/* 053EA0 800532A0 C428673C */ lwc1 $f8, %lo(D_800E6738 + 4)($at) /* 053EA4 800532A4 460032A1 */ cvt.d.s $f10, $f6 /* 053EA8 800532A8 46285400 */ add.d $f16, $f10, $f8 /* 053EAC 800532AC 462084A0 */ cvt.s.d $f18, $f16 @@ -412,18 +412,18 @@ glabel func_80052D7C /* 053F10 80053310 80B901D3 */ lb $t9, 0x1d3($a1) .L80053314: /* 053F14 80053314 14200006 */ bnez $at, .L80053330 -/* 053F18 80053318 3C01800E */ lui $at, %hi(D_800E6744) # $at, 0x800e +/* 053F18 80053318 3C01800E */ lui $at, %hi(D_800E6740 + 4) # $at, 0x800e /* 053F1C 8005331C C4276740 */ lwc1 $f7, %lo(D_800E6740)($at) -/* 053F20 80053320 C4266744 */ lwc1 $f6, %lo(D_800E6744)($at) +/* 053F20 80053320 C4266744 */ lwc1 $f6, %lo(D_800E6740 + 4)($at) /* 053F24 80053324 46001121 */ cvt.d.s $f4, $f2 /* 053F28 80053328 46262282 */ mul.d $f10, $f4, $f6 /* 053F2C 8005332C 462050A0 */ cvt.s.d $f2, $f10 .L80053330: /* 053F30 80053330 2861FFCE */ slti $at, $v1, -0x32 /* 053F34 80053334 10200006 */ beqz $at, .L80053350 -/* 053F38 80053338 3C01800E */ lui $at, %hi(D_800E674C) # $at, 0x800e +/* 053F38 80053338 3C01800E */ lui $at, %hi(D_800E6748 + 4) # $at, 0x800e /* 053F3C 8005333C C4316748 */ lwc1 $f17, %lo(D_800E6748)($at) -/* 053F40 80053340 C430674C */ lwc1 $f16, %lo(D_800E674C)($at) +/* 053F40 80053340 C430674C */ lwc1 $f16, %lo(D_800E6748 + 4)($at) /* 053F44 80053344 46001221 */ cvt.d.s $f8, $f2 /* 053F48 80053348 46304482 */ mul.d $f18, $f8, $f16 /* 053F4C 8005334C 462090A0 */ cvt.s.d $f2, $f18 diff --git a/asm/non_matchings/unknown_043920/func_80053478.s b/asm/non_matchings/unknown_043920/func_80053478.s index 17e71be2..4acb685e 100644 --- a/asm/non_matchings/unknown_043920/func_80053478.s +++ b/asm/non_matchings/unknown_043920/func_80053478.s @@ -14,14 +14,14 @@ glabel func_80053478 /* 054080 80053480 44806000 */ mtc1 $zero, $f12 /* 054084 80053484 460000A1 */ cvt.d.s $f2, $f0 /* 054088 80053488 462C103C */ c.lt.d $f2, $f12 -/* 05408C 8005348C 3C01800E */ lui $at, %hi(D_800E6754) # $at, 0x800e +/* 05408C 8005348C 3C01800E */ lui $at, %hi(D_800E6750 + 4) # $at, 0x800e /* 054090 80053490 45000003 */ bc1f .L800534A0 /* 054094 80053494 00000000 */ nop /* 054098 80053498 46000007 */ neg.s $f0, $f0 /* 05409C 8005349C 460000A1 */ cvt.d.s $f2, $f0 .L800534A0: /* 0540A0 800534A0 C4256750 */ lwc1 $f5, %lo(D_800E6750)($at) -/* 0540A4 800534A4 C4246754 */ lwc1 $f4, %lo(D_800E6754)($at) +/* 0540A4 800534A4 C4246754 */ lwc1 $f4, %lo(D_800E6750 + 4)($at) /* 0540A8 800534A8 3C01800E */ lui $at, %hi(D_800E6758) # $at, 0x800e /* 0540AC 800534AC 4622203C */ c.lt.d $f4, $f2 /* 0540B0 800534B0 00000000 */ nop @@ -31,9 +31,9 @@ glabel func_80053478 /* 0540C0 800534C0 00000000 */ nop /* 0540C4 800534C4 460000A1 */ cvt.d.s $f2, $f0 .L800534C8: -/* 0540C8 800534C8 3C01800E */ lui $at, %hi(D_800E6764) # $at, 0x800e +/* 0540C8 800534C8 3C01800E */ lui $at, %hi(D_800E6760 + 4) # $at, 0x800e /* 0540CC 800534CC C4276760 */ lwc1 $f7, %lo(D_800E6760)($at) -/* 0540D0 800534D0 C4266764 */ lwc1 $f6, %lo(D_800E6764)($at) +/* 0540D0 800534D0 C4266764 */ lwc1 $f6, %lo(D_800E6760 + 4)($at) /* 0540D4 800534D4 3C014268 */ li $at, 0x42680000 # 58.000000 /* 0540D8 800534D8 46261201 */ sub.d $f8, $f2, $f6 /* 0540DC 800534DC 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_043920/func_80053750.s b/asm/non_matchings/unknown_043920/func_80053750.s index 5d594aa1..42662baa 100644 --- a/asm/non_matchings/unknown_043920/func_80053750.s +++ b/asm/non_matchings/unknown_043920/func_80053750.s @@ -52,10 +52,10 @@ glabel func_80053750 /* 0543EC 800537EC 44810000 */ mtc1 $at, $f0 /* 0543F0 800537F0 00000000 */ nop .L800537F4: -/* 0543F4 800537F4 3C01800E */ lui $at, %hi(D_800E678C) # $at, 0x800e +/* 0543F4 800537F4 3C01800E */ lui $at, %hi(D_800E6788 + 4) # $at, 0x800e /* 0543F8 800537F8 C4C600B8 */ lwc1 $f6, 0xb8($a2) /* 0543FC 800537FC C4236788 */ lwc1 $f3, %lo(D_800E6788)($at) -/* 054400 80053800 C422678C */ lwc1 $f2, %lo(D_800E678C)($at) +/* 054400 80053800 C422678C */ lwc1 $f2, %lo(D_800E6788 + 4)($at) /* 054404 80053804 46003221 */ cvt.d.s $f8, $f6 /* 054408 80053808 4628103C */ c.lt.d $f2, $f8 /* 05440C 8005380C 24020001 */ li $v0, 1 @@ -328,7 +328,7 @@ glabel func_80053750 /* 0547CC 80053BCC 80CB01FB */ lb $t3, 0x1fb($a2) /* 0547D0 80053BD0 24070001 */ li $a3, 1 /* 0547D4 80053BD4 1160002B */ beqz $t3, .L80053C84 -/* 0547D8 80053BD8 3C01800E */ lui $at, %hi(D_800E6794) # $at, 0x800e +/* 0547D8 80053BD8 3C01800E */ lui $at, %hi(D_800E6790 + 4) # $at, 0x800e /* 0547DC 80053BDC 00001025 */ move $v0, $zero /* 0547E0 80053BE0 24030008 */ li $v1, 8 .L80053BE4: @@ -376,10 +376,10 @@ glabel func_80053750 /* 054880 80053C80 AC8B0074 */ sw $t3, 0x74($a0) .L80053C84: /* 054884 80053C84 C4336790 */ lwc1 $f19, %lo(D_800E6790)($at) -/* 054888 80053C88 C4326794 */ lwc1 $f18, %lo(D_800E6794)($at) -/* 05488C 80053C8C 3C01800E */ lui $at, %hi(D_800E679C) # $at, 0x800e +/* 054888 80053C88 C4326794 */ lwc1 $f18, %lo(D_800E6790 + 4)($at) +/* 05488C 80053C8C 3C01800E */ lui $at, %hi(D_800E6798 + 4) # $at, 0x800e /* 054890 80053C90 C4316798 */ lwc1 $f17, %lo(D_800E6798)($at) -/* 054894 80053C94 C430679C */ lwc1 $f16, %lo(D_800E679C)($at) +/* 054894 80053C94 C430679C */ lwc1 $f16, %lo(D_800E6798 + 4)($at) /* 054898 80053C98 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 05489C 80053C9C 44817800 */ mtc1 $at, $f15 /* 0548A0 80053CA0 3C01C120 */ li $at, 0xC1200000 # -10.000000 diff --git a/asm/non_matchings/unknown_043920/func_80053E9C.s b/asm/non_matchings/unknown_043920/func_80053E9C.s index f3468f6a..fb5d6c41 100644 --- a/asm/non_matchings/unknown_043920/func_80053E9C.s +++ b/asm/non_matchings/unknown_043920/func_80053E9C.s @@ -167,10 +167,10 @@ glabel L800540C4 /* 054CC8 800540C8 240C0001 */ li $t4, 1 /* 054CCC 800540CC A20C01F1 */ sb $t4, 0x1f1($s0) /* 054CD0 800540D0 E60A002C */ swc1 $f10, 0x2c($s0) -/* 054CD4 800540D4 3C01800E */ lui $at, %hi(D_800E67C4) # $at, 0x800e +/* 054CD4 800540D4 3C01800E */ lui $at, %hi(D_800E67C0 + 4) # $at, 0x800e /* 054CD8 800540D8 C4900020 */ lwc1 $f16, 0x20($a0) /* 054CDC 800540DC C42567C0 */ lwc1 $f5, %lo(D_800E67C0)($at) -/* 054CE0 800540E0 C42467C4 */ lwc1 $f4, %lo(D_800E67C4)($at) +/* 054CE0 800540E0 C42467C4 */ lwc1 $f4, %lo(D_800E67C0 + 4)($at) /* 054CE4 800540E4 460084A1 */ cvt.d.s $f18, $f16 /* 054CE8 800540E8 46249180 */ add.d $f6, $f18, $f4 /* 054CEC 800540EC 24050139 */ li $a1, 313 diff --git a/asm/non_matchings/unknown_043920/func_80054110.s b/asm/non_matchings/unknown_043920/func_80054110.s index 00671236..75a0d35f 100644 --- a/asm/non_matchings/unknown_043920/func_80054110.s +++ b/asm/non_matchings/unknown_043920/func_80054110.s @@ -103,20 +103,20 @@ glabel func_80054110 /* 054E64 80054264 02202025 */ move $a0, $s1 /* 054E68 80054268 1100000A */ beqz $t0, .L80054294 /* 054E6C 8005426C 02002825 */ move $a1, $s0 -/* 054E70 80054270 3C01800E */ lui $at, %hi(D_800E67CC) # $at, 0x800e +/* 054E70 80054270 3C01800E */ lui $at, %hi(D_800E67C8 + 4) # $at, 0x800e /* 054E74 80054274 C60400A8 */ lwc1 $f4, 0xa8($s0) /* 054E78 80054278 C42967C8 */ lwc1 $f9, %lo(D_800E67C8)($at) -/* 054E7C 8005427C C42867CC */ lwc1 $f8, %lo(D_800E67CC)($at) +/* 054E7C 8005427C C42867CC */ lwc1 $f8, %lo(D_800E67C8 + 4)($at) /* 054E80 80054280 460021A1 */ cvt.d.s $f6, $f4 /* 054E84 80054284 46283401 */ sub.d $f16, $f6, $f8 /* 054E88 80054288 462082A0 */ cvt.s.d $f10, $f16 /* 054E8C 8005428C 10000009 */ b .L800542B4 /* 054E90 80054290 E60A00A8 */ swc1 $f10, 0xa8($s0) .L80054294: -/* 054E94 80054294 3C01800E */ lui $at, %hi(D_800E67D4) # $at, 0x800e +/* 054E94 80054294 3C01800E */ lui $at, %hi(D_800E67D0 + 4) # $at, 0x800e /* 054E98 80054298 C61200A8 */ lwc1 $f18, 0xa8($s0) /* 054E9C 8005429C C42767D0 */ lwc1 $f7, %lo(D_800E67D0)($at) -/* 054EA0 800542A0 C42667D4 */ lwc1 $f6, %lo(D_800E67D4)($at) +/* 054EA0 800542A0 C42667D4 */ lwc1 $f6, %lo(D_800E67D0 + 4)($at) /* 054EA4 800542A4 46009121 */ cvt.d.s $f4, $f18 /* 054EA8 800542A8 46262201 */ sub.d $f8, $f4, $f6 /* 054EAC 800542AC 46204420 */ cvt.s.d $f16, $f8 @@ -128,15 +128,15 @@ glabel func_80054110 /* 054EC0 800542C0 0C016420 */ jal func_80059080 /* 054EC4 800542C4 27A700A0 */ addiu $a3, $sp, 0xa0 /* 054EC8 800542C8 920A01F0 */ lbu $t2, 0x1f0($s0) -# Used to access D_800E67E0 and D_800E67E4. +# Used to access D_800E67E0 and D_800E67E0 + 4. /* 054ECC 800542CC 3C01800E */ lui $at, %hi(D_800E67E0) # $at, 0x800e /* 054ED0 800542D0 1140000A */ beqz $t2, .L800542FC /* 054ED4 800542D4 00000000 */ nop -# Used to access D_800E67D8 and D_800E67DC. +# Used to access D_800E67D8 and D_800E67D8 + 4. /* 054ED8 800542D8 3C01800E */ lui $at, %hi(D_800E67D8) # $at, 0x800e /* 054EDC 800542DC C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 054EE0 800542E0 C42567D8 */ lwc1 $f5, %lo(D_800E67D8)($at) -/* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67DC)($at) +/* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67D8 + 4)($at) /* 054EE8 800542E8 460054A1 */ cvt.d.s $f18, $f10 /* 054EEC 800542EC 46249180 */ add.d $f6, $f18, $f4 /* 054EF0 800542F0 46203220 */ cvt.s.d $f8, $f6 @@ -145,7 +145,7 @@ glabel func_80054110 .L800542FC: /* 054EFC 800542FC C61000A8 */ lwc1 $f16, 0xa8($s0) /* 054F00 80054300 C43367E0 */ lwc1 $f19, %lo(D_800E67E0)($at) -/* 054F04 80054304 C43267E4 */ lwc1 $f18, %lo(D_800E67E4)($at) +/* 054F04 80054304 C43267E4 */ lwc1 $f18, %lo(D_800E67E0 + 4)($at) /* 054F08 80054308 460082A1 */ cvt.d.s $f10, $f16 /* 054F0C 8005430C 46325100 */ add.d $f4, $f10, $f18 /* 054F10 80054310 462021A0 */ cvt.s.d $f6, $f4 diff --git a/asm/non_matchings/unknown_043920/func_8005492C.s b/asm/non_matchings/unknown_043920/func_8005492C.s index f2e9087d..bcaf035a 100644 --- a/asm/non_matchings/unknown_043920/func_8005492C.s +++ b/asm/non_matchings/unknown_043920/func_8005492C.s @@ -68,7 +68,7 @@ glabel func_8005492C /* 0555C8 800549C8 2403000C */ li $v1, 12 .L800549CC: /* 0555CC 800549CC 10400006 */ beqz $v0, .L800549E8 -/* 0555D0 800549D0 3C01800E */ lui $at, %hi(D_800E67EC) # $at, 0x800e +/* 0555D0 800549D0 3C01800E */ lui $at, %hi(D_800E67E8 + 4) # $at, 0x800e /* 0555D4 800549D4 80B801E6 */ lb $t8, 0x1e6($a1) /* 0555D8 800549D8 00000000 */ nop /* 0555DC 800549DC 13000002 */ beqz $t8, .L800549E8 @@ -77,19 +77,19 @@ glabel func_8005492C .L800549E8: /* 0555E8 800549E8 C4A4002C */ lwc1 $f4, 0x2c($a1) /* 0555EC 800549EC C42767E8 */ lwc1 $f7, %lo(D_800E67E8)($at) -/* 0555F0 800549F0 C42667EC */ lwc1 $f6, %lo(D_800E67EC)($at) +/* 0555F0 800549F0 C42667EC */ lwc1 $f6, %lo(D_800E67E8 + 4)($at) /* 0555F4 800549F4 46002021 */ cvt.d.s $f0, $f4 /* 0555F8 800549F8 4626003C */ c.lt.d $f0, $f6 /* 0555FC 800549FC 00001025 */ move $v0, $zero /* 055600 80054A00 45000005 */ bc1f .L80054A18 -/* 055604 80054A04 3C01800E */ lui $at, %hi(D_800E67F4) # $at, 0x800e +/* 055604 80054A04 3C01800E */ lui $at, %hi(D_800E67F0 + 4) # $at, 0x800e /* 055608 80054A08 00830019 */ multu $a0, $v1 /* 05560C 80054A0C 00001012 */ mflo $v0 /* 055610 80054A10 00000000 */ nop /* 055614 80054A14 00000000 */ nop .L80054A18: /* 055618 80054A18 C42967F0 */ lwc1 $f9, %lo(D_800E67F0)($at) -/* 05561C 80054A1C C42867F4 */ lwc1 $f8, %lo(D_800E67F4)($at) +/* 05561C 80054A1C C42867F4 */ lwc1 $f8, %lo(D_800E67F0 + 4)($at) /* 055620 80054A20 8FA80050 */ lw $t0, 0x50($sp) /* 055624 80054A24 4620403C */ c.lt.d $f8, $f0 /* 055628 80054A28 00000000 */ nop @@ -127,10 +127,10 @@ glabel func_8005492C /* 0556A4 80054AA4 0C014D1E */ jal func_80053478 /* 0556A8 80054AA8 AFA5004C */ sw $a1, 0x4c($sp) /* 0556AC 80054AAC 8FA5004C */ lw $a1, 0x4c($sp) -/* 0556B0 80054AB0 3C01800E */ lui $at, %hi(D_800E67FC) # $at, 0x800e +/* 0556B0 80054AB0 3C01800E */ lui $at, %hi(D_800E67F8 + 4) # $at, 0x800e /* 0556B4 80054AB4 C4A40030 */ lwc1 $f4, 0x30($a1) /* 0556B8 80054AB8 C42967F8 */ lwc1 $f9, %lo(D_800E67F8)($at) -/* 0556BC 80054ABC C42867FC */ lwc1 $f8, %lo(D_800E67FC)($at) +/* 0556BC 80054ABC C42867FC */ lwc1 $f8, %lo(D_800E67F8 + 4)($at) /* 0556C0 80054AC0 460021A1 */ cvt.d.s $f6, $f4 /* 0556C4 80054AC4 46283282 */ mul.d $f10, $f6, $f8 /* 0556C8 80054AC8 44809000 */ mtc1 $zero, $f18 @@ -294,7 +294,7 @@ glabel func_8005492C /* 055918 80054D18 46005202 */ mul.s $f8, $f10, $f0 /* 05591C 80054D1C 460041A1 */ cvt.d.s $f6, $f8 /* 055920 80054D20 46262280 */ add.d $f10, $f4, $f6 -/* 055924 80054D24 C424680C */ lwc1 $f4, %lo(D_800E680C)($at) +/* 055924 80054D24 C424680C */ lwc1 $f4, %lo(D_800E6808 + 4)($at) /* 055928 80054D28 462050A0 */ cvt.s.d $f2, $f10 /* 05592C 80054D2C C4256808 */ lwc1 $f5, %lo(D_800E6808)($at) /* 055930 80054D30 46001221 */ cvt.d.s $f8, $f2 @@ -342,14 +342,14 @@ glabel func_8005492C /* 0559C8 80054DC8 00000000 */ nop /* 0559CC 80054DCC 44818800 */ mtc1 $at, $f17 /* 0559D0 80054DD0 44808000 */ mtc1 $zero, $f16 -/* 0559D4 80054DD4 3C01800E */ lui $at, %hi(D_800E6814) # $at, 0x800e +/* 0559D4 80054DD4 3C01800E */ lui $at, %hi(D_800E6810 + 4) # $at, 0x800e /* 0559D8 80054DD8 4630003C */ c.lt.d $f0, $f16 /* 0559DC 80054DDC 00000000 */ nop /* 0559E0 80054DE0 45000017 */ bc1f .L80054E40 /* 0559E4 80054DE4 00000000 */ nop /* 0559E8 80054DE8 46208201 */ sub.d $f8, $f16, $f0 /* 0559EC 80054DEC C4256810 */ lwc1 $f5, %lo(D_800E6810)($at) -/* 0559F0 80054DF0 C4246814 */ lwc1 $f4, %lo(D_800E6814)($at) +/* 0559F0 80054DF0 C4246814 */ lwc1 $f4, %lo(D_800E6810 + 4)($at) /* 0559F4 80054DF4 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 /* 0559F8 80054DF8 46244182 */ mul.d $f6, $f8, $f4 /* 0559FC 80054DFC 8D08D538 */ lw $t0, %lo(D_8011D538)($t0) @@ -371,10 +371,10 @@ glabel func_8005492C /* 055A3C 80054E3C 00000000 */ nop .L80054E40: /* 055A40 80054E40 C4A800B8 */ lwc1 $f8, 0xb8($a1) -/* 055A44 80054E44 3C01800E */ lui $at, %hi(D_800E681C) # $at, 0x800e +/* 055A44 80054E44 3C01800E */ lui $at, %hi(D_800E6818 + 4) # $at, 0x800e /* 055A48 80054E48 46024102 */ mul.s $f4, $f8, $f2 /* 055A4C 80054E4C C42B6818 */ lwc1 $f11, %lo(D_800E6818)($at) -/* 055A50 80054E50 C42A681C */ lwc1 $f10, %lo(D_800E681C)($at) +/* 055A50 80054E50 C42A681C */ lwc1 $f10, %lo(D_800E6818 + 4)($at) /* 055A54 80054E54 3C01800E */ lui $at, %hi(D_800E6820) # $at, 0x800e /* 055A58 80054E58 460021A1 */ cvt.d.s $f6, $f4 /* 055A5C 80054E5C 462A3202 */ mul.d $f8, $f6, $f10 @@ -385,15 +385,15 @@ glabel func_8005492C /* 055A70 80054E70 46066281 */ sub.s $f10, $f12, $f6 /* 055A74 80054E74 E4AA002C */ swc1 $f10, 0x2c($a1) /* 055A78 80054E78 C4AC002C */ lwc1 $f12, 0x2c($a1) -/* 055A7C 80054E7C C4286824 */ lwc1 $f8, %lo(D_800E6824)($at) +/* 055A7C 80054E7C C4286824 */ lwc1 $f8, %lo(D_800E6820 + 4)($at) /* 055A80 80054E80 C4296820 */ lwc1 $f9, %lo(D_800E6820)($at) /* 055A84 80054E84 46006021 */ cvt.d.s $f0, $f12 /* 055A88 80054E88 4620403C */ c.lt.d $f8, $f0 -/* 055A8C 80054E8C 3C01800E */ lui $at, %hi(D_800E682C) # $at, 0x800e +/* 055A8C 80054E8C 3C01800E */ lui $at, %hi(D_800E6828 + 4) # $at, 0x800e /* 055A90 80054E90 4500000B */ bc1f .L80054EC0 /* 055A94 80054E94 00000000 */ nop /* 055A98 80054E98 C4256828 */ lwc1 $f5, %lo(D_800E6828)($at) -/* 055A9C 80054E9C C424682C */ lwc1 $f4, %lo(D_800E682C)($at) +/* 055A9C 80054E9C C424682C */ lwc1 $f4, %lo(D_800E6828 + 4)($at) /* 055AA0 80054EA0 00000000 */ nop /* 055AA4 80054EA4 4624003C */ c.lt.d $f0, $f4 /* 055AA8 80054EA8 00000000 */ nop @@ -442,10 +442,10 @@ glabel func_8005492C /* 055B48 80054F48 462A2182 */ mul.d $f6, $f4, $f10 /* 055B4C 80054F4C 46203020 */ cvt.s.d $f0, $f6 .L80054F50: -/* 055B50 80054F50 3C01800E */ lui $at, %hi(D_800E6834) # $at, 0x800e +/* 055B50 80054F50 3C01800E */ lui $at, %hi(D_800E6830 + 4) # $at, 0x800e /* 055B54 80054F54 C4A800B8 */ lwc1 $f8, 0xb8($a1) /* 055B58 80054F58 C42B6830 */ lwc1 $f11, %lo(D_800E6830)($at) -/* 055B5C 80054F5C C42A6834 */ lwc1 $f10, %lo(D_800E6834)($at) +/* 055B5C 80054F5C C42A6834 */ lwc1 $f10, %lo(D_800E6830 + 4)($at) /* 055B60 80054F60 46004121 */ cvt.d.s $f4, $f8 /* 055B64 80054F64 462A203C */ c.lt.d $f4, $f10 /* 055B68 80054F68 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80054FD0.s b/asm/non_matchings/unknown_043920/func_80054FD0.s index 6f457e33..22c40dfa 100644 --- a/asm/non_matchings/unknown_043920/func_80054FD0.s +++ b/asm/non_matchings/unknown_043920/func_80054FD0.s @@ -274,10 +274,10 @@ glabel func_80054FD0 /* 055FD8 800553D8 24010001 */ li $at, 1 /* 055FDC 800553DC 15E10069 */ bne $t7, $at, .L80055584 .L800553E0: -/* 055FE0 800553E0 3C01800E */ lui $at, %hi(D_800E683C) # $at, 0x800e +/* 055FE0 800553E0 3C01800E */ lui $at, %hi(D_800E6838 + 4) # $at, 0x800e /* 055FE4 800553E4 C60A002C */ lwc1 $f10, 0x2c($s0) /* 055FE8 800553E8 C4276838 */ lwc1 $f7, %lo(D_800E6838)($at) -/* 055FEC 800553EC C426683C */ lwc1 $f6, %lo(D_800E683C)($at) +/* 055FEC 800553EC C426683C */ lwc1 $f6, %lo(D_800E6838 + 4)($at) /* 055FF0 800553F0 46005121 */ cvt.d.s $f4, $f10 /* 055FF4 800553F4 46262202 */ mul.d $f8, $f4, $f6 /* 055FF8 800553F8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -378,7 +378,7 @@ glabel func_80054FD0 /* 056160 80055560 46062202 */ mul.s $f8, $f4, $f6 /* 056164 80055564 46005121 */ cvt.d.s $f4, $f10 /* 056168 80055568 E6080120 */ swc1 $f8, 0x120($s0) -/* 05616C 8005556C C4266844 */ lwc1 $f6, %lo(D_800E6844)($at) +/* 05616C 8005556C C4266844 */ lwc1 $f6, %lo(D_800E6840 + 4)($at) /* 056170 80055570 C4276840 */ lwc1 $f7, %lo(D_800E6840)($at) /* 056174 80055574 E6100030 */ swc1 $f16, 0x30($s0) /* 056178 80055578 46262202 */ mul.d $f8, $f4, $f6 diff --git a/asm/non_matchings/unknown_043920/func_80055EC0.s b/asm/non_matchings/unknown_043920/func_80055EC0.s index f6c00f7d..eac677bb 100644 --- a/asm/non_matchings/unknown_043920/func_80055EC0.s +++ b/asm/non_matchings/unknown_043920/func_80055EC0.s @@ -110,7 +110,7 @@ glabel func_80055EC0 /* 056C3C 8005603C 00000000 */ nop /* 056C40 80056040 A479002E */ sh $t9, 0x2e($v1) /* 056C44 80056044 C4E8001C */ lwc1 $f8, 0x1c($a3) -/* 056C48 80056048 C420684C */ lwc1 $f0, %lo(D_800E684C)($at) +/* 056C48 80056048 C420684C */ lwc1 $f0, %lo(D_800E6848 + 4)($at) /* 056C4C 8005604C C4216848 */ lwc1 $f1, %lo(D_800E6848)($at) /* 056C50 80056050 460041A1 */ cvt.d.s $f6, $f8 /* 056C54 80056054 46203282 */ mul.d $f10, $f6, $f0 diff --git a/asm/non_matchings/unknown_043920/func_80057A40.s b/asm/non_matchings/unknown_043920/func_80057A40.s index d7f55626..fb195734 100644 --- a/asm/non_matchings/unknown_043920/func_80057A40.s +++ b/asm/non_matchings/unknown_043920/func_80057A40.s @@ -195,15 +195,15 @@ glabel L80057CAC .L80057CD0: glabel L80057CD0 /* 0588D0 80057CD0 3C038012 */ lui $v1, %hi(D_8011D586) # $v1, 0x8012 -/* 0588D4 80057CD4 3C01800E */ lui $at, %hi(D_800E68F4) # $at, 0x800e +/* 0588D4 80057CD4 3C01800E */ lui $at, %hi(D_800E68F0 + 4) # $at, 0x800e /* 0588D8 80057CD8 2463D586 */ addiu $v1, %lo(D_8011D586) # addiu $v1, $v1, -0x2a7a /* 0588DC 80057CDC C42168F0 */ lwc1 $f1, %lo(D_800E68F0)($at) -/* 0588E0 80057CE0 C42068F4 */ lwc1 $f0, %lo(D_800E68F4)($at) +/* 0588E0 80057CE0 C42068F4 */ lwc1 $f0, %lo(D_800E68F0 + 4)($at) /* 0588E4 80057CE4 84790000 */ lh $t9, ($v1) -/* 0588E8 80057CE8 3C01800E */ lui $at, %hi(D_800E68FC) # $at, 0x800e +/* 0588E8 80057CE8 3C01800E */ lui $at, %hi(D_800E68F8 + 4) # $at, 0x800e /* 0588EC 80057CEC 44992000 */ mtc1 $t9, $f4 /* 0588F0 80057CF0 C42D68F8 */ lwc1 $f13, %lo(D_800E68F8)($at) -/* 0588F4 80057CF4 C42C68FC */ lwc1 $f12, %lo(D_800E68FC)($at) +/* 0588F4 80057CF4 C42C68FC */ lwc1 $f12, %lo(D_800E68F8 + 4)($at) /* 0588F8 80057CF8 468021A0 */ cvt.s.w $f6, $f4 /* 0588FC 80057CFC 8FA80038 */ lw $t0, 0x38($sp) /* 058900 80057D00 3C014620 */ li $at, 0x46200000 # 10240.000000 @@ -251,10 +251,10 @@ glabel L80057CD0 /* 0589A8 80057DA8 E7A30018 */ swc1 $f3, 0x18($sp) /* 0589AC 80057DAC 3C078012 */ lui $a3, %hi(D_8011D508) # $a3, 0x8012 /* 0589B0 80057DB0 24E7D508 */ addiu $a3, %lo(D_8011D508) # addiu $a3, $a3, -0x2af8 -/* 0589B4 80057DB4 3C01800E */ lui $at, %hi(D_800E6904) # $at, 0x800e +/* 0589B4 80057DB4 3C01800E */ lui $at, %hi(D_800E6900 + 4) # $at, 0x800e /* 0589B8 80057DB8 8CE20000 */ lw $v0, ($a3) /* 0589BC 80057DBC C4316900 */ lwc1 $f17, %lo(D_800E6900)($at) -/* 0589C0 80057DC0 C4306904 */ lwc1 $f16, %lo(D_800E6904)($at) +/* 0589C0 80057DC0 C4306904 */ lwc1 $f16, %lo(D_800E6900 + 4)($at) /* 0589C4 80057DC4 C44A0010 */ lwc1 $f10, 0x10($v0) /* 0589C8 80057DC8 46000221 */ cvt.d.s $f8, $f0 /* 0589CC 80057DCC 46304180 */ add.d $f6, $f8, $f16 @@ -317,13 +317,13 @@ glabel L80057CD0 /* 058AB0 80057EB0 15C0001D */ bnez $t6, .L80057F28 /* 058AB4 80057EB4 00000000 */ nop /* 058AB8 80057EB8 846F0000 */ lh $t7, ($v1) -/* 058ABC 80057EBC 3C01800E */ lui $at, %hi(D_800E690C) # $at, 0x800e +/* 058ABC 80057EBC 3C01800E */ lui $at, %hi(D_800E6908 + 4) # $at, 0x800e /* 058AC0 80057EC0 15E00019 */ bnez $t7, .L80057F28 /* 058AC4 80057EC4 00000000 */ nop /* 058AC8 80057EC8 8CE20000 */ lw $v0, ($a3) /* 058ACC 80057ECC C4216908 */ lwc1 $f1, %lo(D_800E6908)($at) /* 058AD0 80057ED0 C4480024 */ lwc1 $f8, 0x24($v0) -/* 058AD4 80057ED4 C420690C */ lwc1 $f0, %lo(D_800E690C)($at) +/* 058AD4 80057ED4 C420690C */ lwc1 $f0, %lo(D_800E6908 + 4)($at) /* 058AD8 80057ED8 460044A1 */ cvt.d.s $f18, $f8 /* 058ADC 80057EDC 46209402 */ mul.d $f16, $f18, $f0 /* 058AE0 80057EE0 462082A0 */ cvt.s.d $f10, $f16 diff --git a/asm/non_matchings/unknown_043920/func_800581E8.s b/asm/non_matchings/unknown_043920/func_800581E8.s index 286d056a..6971b13d 100644 --- a/asm/non_matchings/unknown_043920/func_800581E8.s +++ b/asm/non_matchings/unknown_043920/func_800581E8.s @@ -225,9 +225,9 @@ glabel func_800581E8 /* 0590F4 800584F4 00000000 */ nop .L800584F8: /* 0590F8 800584F8 460C2302 */ mul.s $f12, $f4, $f12 -/* 0590FC 800584FC 3C01800E */ lui $at, %hi(D_800E6914) # $at, 0x800e +/* 0590FC 800584FC 3C01800E */ lui $at, %hi(D_800E6910 + 4) # $at, 0x800e /* 059100 80058500 C4276910 */ lwc1 $f7, %lo(D_800E6910)($at) -/* 059104 80058504 C4266914 */ lwc1 $f6, %lo(D_800E6914)($at) +/* 059104 80058504 C4266914 */ lwc1 $f6, %lo(D_800E6910 + 4)($at) /* 059108 80058508 46006221 */ cvt.d.s $f8, $f12 /* 05910C 8005850C 4628303C */ c.lt.d $f6, $f8 /* 059110 80058510 3C014282 */ li $at, 0x42820000 # 65.000000 @@ -376,10 +376,10 @@ glabel func_800581E8 /* 059330 80058730 E7A80044 */ swc1 $f8, 0x44($sp) /* 059334 80058734 11E00023 */ beqz $t7, .L800587C4 /* 059338 80058738 46007086 */ mov.s $f2, $f14 -/* 05933C 8005873C 3C01800E */ lui $at, %hi(D_800E691C) # $at, 0x800e +/* 05933C 8005873C 3C01800E */ lui $at, %hi(D_800E6918 + 4) # $at, 0x800e /* 059340 80058740 C4E40030 */ lwc1 $f4, 0x30($a3) /* 059344 80058744 C4276918 */ lwc1 $f7, %lo(D_800E6918)($at) -/* 059348 80058748 C426691C */ lwc1 $f6, %lo(D_800E691C)($at) +/* 059348 80058748 C426691C */ lwc1 $f6, %lo(D_800E6918 + 4)($at) /* 05934C 8005874C 460022A1 */ cvt.d.s $f10, $f4 /* 059350 80058750 46265202 */ mul.d $f8, $f10, $f6 /* 059354 80058754 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 diff --git a/asm/non_matchings/unknown_043920/func_80059208.s b/asm/non_matchings/unknown_043920/func_80059208.s index 184399a2..d462935a 100644 --- a/asm/non_matchings/unknown_043920/func_80059208.s +++ b/asm/non_matchings/unknown_043920/func_80059208.s @@ -34,10 +34,10 @@ glabel func_80059208 /* 059E70 80059270 44802000 */ mtc1 $zero, $f4 /* 059E74 80059274 46003221 */ cvt.d.s $f8, $f6 /* 059E78 80059278 46282281 */ sub.d $f10, $f4, $f8 -/* 059E7C 8005927C 3C01800E */ lui $at, %hi(D_800E6924) # $at, 0x800e +/* 059E7C 8005927C 3C01800E */ lui $at, %hi(D_800E6920 + 4) # $at, 0x800e /* 059E80 80059280 46205020 */ cvt.s.d $f0, $f10 /* 059E84 80059284 C4316920 */ lwc1 $f17, %lo(D_800E6920)($at) -/* 059E88 80059288 C4306924 */ lwc1 $f16, %lo(D_800E6924)($at) +/* 059E88 80059288 C4306924 */ lwc1 $f16, %lo(D_800E6920 + 4)($at) /* 059E8C 8005928C 460000A1 */ cvt.d.s $f2, $f0 /* 059E90 80059290 4630103C */ c.lt.d $f2, $f16 /* 059E94 80059294 82240192 */ lb $a0, 0x192($s1) diff --git a/asm/non_matchings/unknown_043920/func_80059790.s b/asm/non_matchings/unknown_043920/func_80059790.s index f24b3bc5..9cc85e8a 100644 --- a/asm/non_matchings/unknown_043920/func_80059790.s +++ b/asm/non_matchings/unknown_043920/func_80059790.s @@ -10,10 +10,10 @@ glabel func_80059790 /* 05A39C 8005979C 15C10012 */ bne $t6, $at, .L800597E8 /* 05A3A0 800597A0 24080E10 */ li $t0, 3600 /* 05A3A4 800597A4 44842000 */ mtc1 $a0, $f4 -/* 05A3A8 800597A8 3C01800E */ lui $at, %hi(D_800E692C) # $at, 0x800e +/* 05A3A8 800597A8 3C01800E */ lui $at, %hi(D_800E6928 + 4) # $at, 0x800e /* 05A3AC 800597AC 468021A0 */ cvt.s.w $f6, $f4 /* 05A3B0 800597B0 C42B6928 */ lwc1 $f11, %lo(D_800E6928)($at) -/* 05A3B4 800597B4 C42A692C */ lwc1 $f10, %lo(D_800E692C)($at) +/* 05A3B4 800597B4 C42A692C */ lwc1 $f10, %lo(D_800E6928 + 4)($at) /* 05A3B8 800597B8 46003221 */ cvt.d.s $f8, $f6 /* 05A3BC 800597BC 462A4402 */ mul.d $f16, $f8, $f10 /* 05A3C0 800597C0 444FF800 */ cfc1 $t7, $31 diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index 708dbc1f..e9cbcfb6 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -32,9 +32,9 @@ glabel func_80059E40 /* 05AA98 80059E98 46060083 */ div.s $f2, $f0, $f6 /* 05AA9C 80059E9C 24010002 */ li $at, 2 /* 05AAA0 80059EA0 14A1000B */ bne $a1, $at, .L80059ED0 -/* 05AAA4 80059EA4 3C01800E */ lui $at, %hi(D_800E6934) # $at, 0x800e +/* 05AAA4 80059EA4 3C01800E */ lui $at, %hi(D_800E6930 + 4) # $at, 0x800e /* 05AAA8 80059EA8 C42B6930 */ lwc1 $f11, %lo(D_800E6930)($at) -/* 05AAAC 80059EAC C42A6934 */ lwc1 $f10, %lo(D_800E6934)($at) +/* 05AAAC 80059EAC C42A6934 */ lwc1 $f10, %lo(D_800E6930 + 4)($at) /* 05AAB0 80059EB0 46000221 */ cvt.d.s $f8, $f0 /* 05AAB4 80059EB4 462A4402 */ mul.d $f16, $f8, $f10 /* 05AAB8 80059EB8 3C01403E */ li $at, 0x403E0000 # 2.968750 @@ -310,12 +310,12 @@ glabel func_80059E40 /* 05AEBC 8005A2BC C7A20094 */ lwc1 $f2, 0x94($sp) /* 05AEC0 8005A2C0 A602002E */ sh $v0, 0x2e($s0) /* 05AEC4 8005A2C4 8FAF0060 */ lw $t7, 0x60($sp) -/* 05AEC8 8005A2C8 3C01800E */ lui $at, %hi(D_800E693C) # $at, 0x800e +/* 05AEC8 8005A2C8 3C01800E */ lui $at, %hi(D_800E6938 + 4) # $at, 0x800e /* 05AECC 8005A2CC 25F90003 */ addiu $t9, $t7, 3 /* 05AED0 8005A2D0 15B90033 */ bne $t5, $t9, .L8005A3A0 /* 05AED4 8005A2D4 24020001 */ li $v0, 1 /* 05AED8 8005A2D8 C42D6938 */ lwc1 $f13, %lo(D_800E6938)($at) -/* 05AEDC 8005A2DC C42C693C */ lwc1 $f12, %lo(D_800E693C)($at) +/* 05AEDC 8005A2DC C42C693C */ lwc1 $f12, %lo(D_800E6938 + 4)($at) /* 05AEE0 8005A2E0 46001021 */ cvt.d.s $f0, $f2 /* 05AEE4 8005A2E4 4620603E */ c.le.d $f12, $f0 /* 05AEE8 8005A2E8 8E020064 */ lw $v0, 0x64($s0) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index af6c2bc8..6ad63a63 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -81,12 +81,12 @@ glabel func_8005A6F0 /* 05B3A4 8005A7A4 2463D564 */ addiu $v1, %lo(D_8011D564) # addiu $v1, $v1, -0x2a9c /* 05B3A8 8005A7A8 AC620000 */ sw $v0, ($v1) /* 05B3AC 8005A7AC 82190003 */ lb $t9, 3($s0) -/* 05B3B0 8005A7B0 3C01800E */ lui $at, %hi(D_800E6944) # $at, 0x800e +/* 05B3B0 8005A7B0 3C01800E */ lui $at, %hi(D_800E6940 + 4) # $at, 0x800e /* 05B3B4 8005A7B4 00196880 */ sll $t5, $t9, 2 /* 05B3B8 8005A7B8 004D7021 */ addu $t6, $v0, $t5 /* 05B3BC 8005A7BC C5C40000 */ lwc1 $f4, ($t6) /* 05B3C0 8005A7C0 C4296940 */ lwc1 $f9, %lo(D_800E6940)($at) -/* 05B3C4 8005A7C4 C4286944 */ lwc1 $f8, %lo(D_800E6944)($at) +/* 05B3C4 8005A7C4 C4286944 */ lwc1 $f8, %lo(D_800E6940 + 4)($at) /* 05B3C8 8005A7C8 460021A1 */ cvt.d.s $f6, $f4 /* 05B3CC 8005A7CC 46283282 */ mul.d $f10, $f6, $f8 /* 05B3D0 8005A7D0 3C0C8012 */ lui $t4, %hi(D_8011D56C) # $t4, 0x8012 @@ -295,7 +295,7 @@ glabel func_8005A6F0 /* 05B6B4 8005AAB4 00000000 */ nop .L8005AAB8: /* 05B6B8 8005AAB8 10E0000B */ beqz $a3, .L8005AAE8 -/* 05B6BC 8005AABC 3C01800E */ lui $at, %hi(D_800E6954) # $at, 0x800e +/* 05B6BC 8005AABC 3C01800E */ lui $at, %hi(D_800E6950 + 4) # $at, 0x800e /* 05B6C0 8005AAC0 8FA400A0 */ lw $a0, 0xa0($sp) /* 05B6C4 8005AAC4 C4EA000C */ lwc1 $f10, 0xc($a3) /* 05B6C8 8005AAC8 C492000C */ lwc1 $f18, 0xc($a0) @@ -311,7 +311,7 @@ glabel func_8005A6F0 /* 05B6EC 8005AAEC 11000011 */ beqz $t0, .L8005AB34 /* 05B6F0 8005AAF0 00000000 */ nop /* 05B6F4 8005AAF4 C4256950 */ lwc1 $f5, %lo(D_800E6950)($at) -/* 05B6F8 8005AAF8 C4246954 */ lwc1 $f4, %lo(D_800E6954)($at) +/* 05B6F8 8005AAF8 C4246954 */ lwc1 $f4, %lo(D_800E6950 + 4)($at) /* 05B6FC 8005AAFC 460014A1 */ cvt.d.s $f18, $f2 /* 05B700 8005AB00 4632203E */ c.le.d $f4, $f18 /* 05B704 8005AB04 00000000 */ nop @@ -351,9 +351,9 @@ glabel func_8005A6F0 /* 05B780 8005AB80 82020201 */ lb $v0, 0x201($s0) /* 05B784 8005AB84 00000000 */ nop /* 05B788 8005AB88 1440000B */ bnez $v0, .L8005ABB8 -/* 05B78C 8005AB8C 3C01800E */ lui $at, %hi(D_800E6964) # $at, 0x800e +/* 05B78C 8005AB8C 3C01800E */ lui $at, %hi(D_800E6960 + 4) # $at, 0x800e /* 05B790 8005AB90 C4276960 */ lwc1 $f7, %lo(D_800E6960)($at) -/* 05B794 8005AB94 C4266964 */ lwc1 $f6, %lo(D_800E6964)($at) +/* 05B794 8005AB94 C4266964 */ lwc1 $f6, %lo(D_800E6960 + 4)($at) /* 05B798 8005AB98 46001121 */ cvt.d.s $f4, $f2 /* 05B79C 8005AB9C 4626203C */ c.lt.d $f4, $f6 /* 05B7A0 8005ABA0 240D001E */ li $t5, 30 @@ -849,11 +849,11 @@ glabel L8005B1B0 /* 05BEC4 8005B2C4 44802000 */ mtc1 $zero, $f4 /* 05BEC8 8005B2C8 46005021 */ cvt.d.s $f0, $f10 /* 05BECC 8005B2CC 4624003C */ c.lt.d $f0, $f4 -/* 05BED0 8005B2D0 3C01800E */ lui $at, %hi(D_800E69A4) # $at, 0x800e +/* 05BED0 8005B2D0 3C01800E */ lui $at, %hi(D_800E69A0 + 4) # $at, 0x800e /* 05BED4 8005B2D4 45000007 */ bc1f .L8005B2F4 /* 05BED8 8005B2D8 00000000 */ nop /* 05BEDC 8005B2DC C42769A0 */ lwc1 $f7, %lo(D_800E69A0)($at) -/* 05BEE0 8005B2E0 C42669A4 */ lwc1 $f6, %lo(D_800E69A4)($at) +/* 05BEE0 8005B2E0 C42669A4 */ lwc1 $f6, %lo(D_800E69A0 + 4)($at) /* 05BEE4 8005B2E4 00000000 */ nop /* 05BEE8 8005B2E8 46260482 */ mul.d $f18, $f0, $f6 /* 05BEEC 8005B2EC 46209220 */ cvt.s.d $f8, $f18 @@ -1181,7 +1181,7 @@ glabel L8005B1B0 /* 05C384 8005B784 3C01800E */ lui $at, %hi(D_800E69B8) # $at, 0x800e /* 05C388 8005B788 E5C60008 */ swc1 $f6, 8($t6) /* 05C38C 8005B78C C4640030 */ lwc1 $f4, 0x30($v1) -/* 05C390 8005B790 C42869BC */ lwc1 $f8, %lo(D_800E69BC)($at) +/* 05C390 8005B790 C42869BC */ lwc1 $f8, %lo(D_800E69B8 + 4)($at) /* 05C394 8005B794 C42969B8 */ lwc1 $f9, %lo(D_800E69B8)($at) /* 05C398 8005B798 460024A1 */ cvt.d.s $f18, $f4 /* 05C39C 8005B79C 4628903C */ c.lt.d $f18, $f8 diff --git a/asm/non_matchings/unknown_043920/func_8005B818.s b/asm/non_matchings/unknown_043920/func_8005B818.s index 12682972..186548ab 100644 --- a/asm/non_matchings/unknown_043920/func_8005B818.s +++ b/asm/non_matchings/unknown_043920/func_8005B818.s @@ -61,7 +61,7 @@ glabel func_8005B818 /* 05C4B4 8005B8B4 E7A20094 */ swc1 $f2, 0x94($sp) /* 05C4B8 8005B8B8 C6200124 */ lwc1 $f0, 0x124($s1) /* 05C4BC 8005B8BC 44813000 */ mtc1 $at, $f6 -/* 05C4C0 8005B8C0 3C01800E */ lui $at, %hi(D_800E69C4) # $at, 0x800e +/* 05C4C0 8005B8C0 3C01800E */ lui $at, %hi(D_800E69C0 + 4) # $at, 0x800e /* 05C4C4 8005B8C4 4606003C */ c.lt.s $f0, $f6 /* 05C4C8 8005B8C8 00000000 */ nop /* 05C4CC 8005B8CC 45000005 */ bc1f .L8005B8E4 @@ -82,15 +82,15 @@ glabel func_8005B818 /* 05C504 8005B904 00000000 */ nop .L8005B908: /* 05C508 8005B908 C42569C0 */ lwc1 $f5, %lo(D_800E69C0)($at) -/* 05C50C 8005B90C C42469C4 */ lwc1 $f4, %lo(D_800E69C4)($at) +/* 05C50C 8005B90C C42469C4 */ lwc1 $f4, %lo(D_800E69C0 + 4)($at) /* 05C510 8005B910 460004A1 */ cvt.d.s $f18, $f0 /* 05C514 8005B914 46249182 */ mul.d $f6, $f18, $f4 -/* 05C518 8005B918 3C01800E */ lui $at, %hi(D_800E69CC) # $at, 0x800e +/* 05C518 8005B918 3C01800E */ lui $at, %hi(D_800E69C8 + 4) # $at, 0x800e /* 05C51C 8005B91C C42969C8 */ lwc1 $f9, %lo(D_800E69C8)($at) -/* 05C520 8005B920 C42869CC */ lwc1 $f8, %lo(D_800E69CC)($at) -/* 05C524 8005B924 3C01800E */ lui $at, %hi(D_800E69D4) # $at, 0x800e +/* 05C520 8005B920 C42869CC */ lwc1 $f8, %lo(D_800E69C8 + 4)($at) +/* 05C524 8005B924 3C01800E */ lui $at, %hi(D_800E69D0 + 4) # $at, 0x800e /* 05C528 8005B928 C43369D0 */ lwc1 $f19, %lo(D_800E69D0)($at) -/* 05C52C 8005B92C C43269D4 */ lwc1 $f18, %lo(D_800E69D4)($at) +/* 05C52C 8005B92C C43269D4 */ lwc1 $f18, %lo(D_800E69D0 + 4)($at) /* 05C530 8005B930 46283280 */ add.d $f10, $f6, $f8 /* 05C534 8005B934 00000000 */ nop /* 05C538 8005B938 46325103 */ div.d $f4, $f10, $f18 @@ -100,9 +100,9 @@ glabel func_8005B818 /* 05C548 8005B948 46000306 */ mov.s $f12, $f0 /* 05C54C 8005B94C 11C00007 */ beqz $t6, .L8005B96C /* 05C550 8005B950 27A30100 */ addiu $v1, $sp, 0x100 -/* 05C554 8005B954 3C01800E */ lui $at, %hi(D_800E69DC) # $at, 0x800e +/* 05C554 8005B954 3C01800E */ lui $at, %hi(D_800E69D8 + 4) # $at, 0x800e /* 05C558 8005B958 C42969D8 */ lwc1 $f9, %lo(D_800E69D8)($at) -/* 05C55C 8005B95C C42869DC */ lwc1 $f8, %lo(D_800E69DC)($at) +/* 05C55C 8005B95C C42869DC */ lwc1 $f8, %lo(D_800E69D8 + 4)($at) /* 05C560 8005B960 460001A1 */ cvt.d.s $f6, $f0 /* 05C564 8005B964 46283282 */ mul.d $f10, $f6, $f8 /* 05C568 8005B968 46205320 */ cvt.s.d $f12, $f10 @@ -138,10 +138,10 @@ glabel func_8005B818 /* 05C5D0 8005B9D0 00001025 */ move $v0, $zero .L8005B9D4: /* 05C5D4 8005B9D4 44829000 */ mtc1 $v0, $f18 -/* 05C5D8 8005B9D8 3C01800E */ lui $at, %hi(D_800E69E4) # $at, 0x800e +/* 05C5D8 8005B9D8 3C01800E */ lui $at, %hi(D_800E69E0 + 4) # $at, 0x800e /* 05C5DC 8005B9DC 46809120 */ cvt.s.w $f4, $f18 /* 05C5E0 8005B9E0 C42969E0 */ lwc1 $f9, %lo(D_800E69E0)($at) -/* 05C5E4 8005B9E4 C42869E4 */ lwc1 $f8, %lo(D_800E69E4)($at) +/* 05C5E4 8005B9E4 C42869E4 */ lwc1 $f8, %lo(D_800E69E0 + 4)($at) /* 05C5E8 8005B9E8 460021A1 */ cvt.d.s $f6, $f4 /* 05C5EC 8005B9EC 00000000 */ nop /* 05C5F0 8005B9F0 46283283 */ div.d $f10, $f6, $f8 @@ -373,7 +373,7 @@ glabel func_8005B818 /* 05C94C 8005BD4C 461E0303 */ div.s $f12, $f0, $f30 /* 05C950 8005BD50 44809000 */ mtc1 $zero, $f18 /* 05C954 8005BD54 C7A6008C */ lwc1 $f6, 0x8c($sp) -/* 05C958 8005BD58 3C01800E */ lui $at, %hi(D_800E69F4) # $at, 0x800e +/* 05C958 8005BD58 3C01800E */ lui $at, %hi(D_800E69F0 + 4) # $at, 0x800e /* 05C95C 8005BD5C 460C9032 */ c.eq.s $f18, $f12 /* 05C960 8005BD60 00000000 */ nop /* 05C964 8005BD64 45010007 */ bc1t .L8005BD84 @@ -387,7 +387,7 @@ glabel func_8005B818 .L8005BD84: /* 05C984 8005BD84 C63200AC */ lwc1 $f18, 0xac($s1) /* 05C988 8005BD88 C42969F0 */ lwc1 $f9, %lo(D_800E69F0)($at) -/* 05C98C 8005BD8C C42869F4 */ lwc1 $f8, %lo(D_800E69F4)($at) +/* 05C98C 8005BD8C C42869F4 */ lwc1 $f8, %lo(D_800E69F0 + 4)($at) /* 05C990 8005BD90 460091A1 */ cvt.d.s $f6, $f18 /* 05C994 8005BD94 46283100 */ add.d $f4, $f6, $f8 /* 05C998 8005BD98 2410FFFF */ li $s0, -1 @@ -425,9 +425,9 @@ glabel func_8005B818 /* 05CA14 8005BE14 46044300 */ add.s $f12, $f8, $f4 /* 05CA18 8005BE18 00000000 */ nop /* 05CA1C 8005BE1C 461E0303 */ div.s $f12, $f0, $f30 -/* 05CA20 8005BE20 3C01800E */ lui $at, %hi(D_800E69FC) # $at, 0x800e +/* 05CA20 8005BE20 3C01800E */ lui $at, %hi(D_800E69F8 + 4) # $at, 0x800e /* 05CA24 8005BE24 C43169F8 */ lwc1 $f17, %lo(D_800E69F8)($at) -/* 05CA28 8005BE28 C43069FC */ lwc1 $f16, %lo(D_800E69FC)($at) +/* 05CA28 8005BE28 C43069FC */ lwc1 $f16, %lo(D_800E69F8 + 4)($at) /* 05CA2C 8005BE2C C7A30060 */ lwc1 $f3, 0x60($sp) /* 05CA30 8005BE30 C7A20064 */ lwc1 $f2, 0x64($sp) /* 05CA34 8005BE34 00000000 */ nop diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index 7d3bd883..c05bce2c 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -136,10 +136,10 @@ glabel func_8005C364 /* 05D140 8005C540 44816000 */ mtc1 $at, $f12 /* 05D144 8005C544 0C01A7CA */ jal func_80069F28 /* 05D148 8005C548 00000000 */ nop -/* 05D14C 8005C54C 3C01800E */ lui $at, %hi(D_800E6A14) # $at, 0x800e +/* 05D14C 8005C54C 3C01800E */ lui $at, %hi(D_800E6A10 + 4) # $at, 0x800e /* 05D150 8005C550 C604002C */ lwc1 $f4, 0x2c($s0) /* 05D154 8005C554 C4296A10 */ lwc1 $f9, %lo(D_800E6A10)($at) -/* 05D158 8005C558 C4286A14 */ lwc1 $f8, %lo(D_800E6A14)($at) +/* 05D158 8005C558 C4286A14 */ lwc1 $f8, %lo(D_800E6A10 + 4)($at) /* 05D15C 8005C55C 460021A1 */ cvt.d.s $f6, $f4 /* 05D160 8005C560 46283282 */ mul.d $f10, $f6, $f8 /* 05D164 8005C564 44808000 */ mtc1 $zero, $f16 @@ -193,7 +193,7 @@ glabel func_8005C364 /* 05D21C 8005C61C 4624003C */ c.lt.d $f0, $f4 /* 05D220 8005C620 240C0001 */ li $t4, 1 /* 05D224 8005C624 45000010 */ bc1f .L8005C668 -/* 05D228 8005C628 3C01800E */ lui $at, %hi(D_800E6A1C) # $at, 0x800e +/* 05D228 8005C628 3C01800E */ lui $at, %hi(D_800E6A18 + 4) # $at, 0x800e /* 05D22C 8005C62C A22C003B */ sb $t4, 0x3b($s1) /* 05D230 8005C630 C7A8005C */ lwc1 $f8, 0x5c($sp) /* 05D234 8005C634 C606002C */ lwc1 $f6, 0x2c($s0) @@ -211,14 +211,14 @@ glabel func_8005C364 /* 05D264 8005C664 E604000C */ swc1 $f4, 0xc($s0) .L8005C668: /* 05D268 8005C668 C4296A18 */ lwc1 $f9, %lo(D_800E6A18)($at) -/* 05D26C 8005C66C C4286A1C */ lwc1 $f8, %lo(D_800E6A1C)($at) -/* 05D270 8005C670 3C01800E */ lui $at, %hi(D_800E6A24) # $at, 0x800e +/* 05D26C 8005C66C C4286A1C */ lwc1 $f8, %lo(D_800E6A18 + 4)($at) +/* 05D270 8005C670 3C01800E */ lui $at, %hi(D_800E6A20 + 4) # $at, 0x800e /* 05D274 8005C674 4628003C */ c.lt.d $f0, $f8 /* 05D278 8005C678 240D0002 */ li $t5, 2 /* 05D27C 8005C67C 45010008 */ bc1t .L8005C6A0 /* 05D280 8005C680 00000000 */ nop /* 05D284 8005C684 C42B6A20 */ lwc1 $f11, %lo(D_800E6A20)($at) -/* 05D288 8005C688 C42A6A24 */ lwc1 $f10, %lo(D_800E6A24)($at) +/* 05D288 8005C688 C42A6A24 */ lwc1 $f10, %lo(D_800E6A20 + 4)($at) /* 05D28C 8005C68C 00000000 */ nop /* 05D290 8005C690 4620503C */ c.lt.d $f10, $f0 /* 05D294 8005C694 00000000 */ nop @@ -362,9 +362,9 @@ glabel func_8005C364 /* 05D48C 8005C88C 460E7102 */ mul.s $f4, $f14, $f14 /* 05D490 8005C890 0C0326B4 */ jal sqrtf /* 05D494 8005C894 46049300 */ add.s $f12, $f18, $f4 -/* 05D498 8005C898 3C01800E */ lui $at, %hi(D_800E6A2C) # $at, 0x800e +/* 05D498 8005C898 3C01800E */ lui $at, %hi(D_800E6A28 + 4) # $at, 0x800e /* 05D49C 8005C89C C4296A28 */ lwc1 $f9, %lo(D_800E6A28)($at) -/* 05D4A0 8005C8A0 C4286A2C */ lwc1 $f8, %lo(D_800E6A2C)($at) +/* 05D4A0 8005C8A0 C4286A2C */ lwc1 $f8, %lo(D_800E6A28 + 4)($at) /* 05D4A4 8005C8A4 460001A1 */ cvt.d.s $f6, $f0 /* 05D4A8 8005C8A8 4628303C */ c.lt.d $f6, $f8 /* 05D4AC 8005C8AC 8FA50038 */ lw $a1, 0x38($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s index e4eaaede..8836a3c2 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s @@ -143,10 +143,10 @@ glabel func_8005D0D0 /* 05DEC4 8005D2C4 0C01A7CA */ jal func_80069F28 /* 05DEC8 8005D2C8 00000000 */ nop /* 05DECC 8005D2CC A2000187 */ sb $zero, 0x187($s0) -/* 05DED0 8005D2D0 3C01800E */ lui $at, %hi(D_800E6A34) # $at, 0x800e +/* 05DED0 8005D2D0 3C01800E */ lui $at, %hi(D_800E6A30 + 4) # $at, 0x800e /* 05DED4 8005D2D4 C604002C */ lwc1 $f4, 0x2c($s0) /* 05DED8 8005D2D8 C4296A30 */ lwc1 $f9, %lo(D_800E6A30)($at) -/* 05DEDC 8005D2DC C4286A34 */ lwc1 $f8, %lo(D_800E6A34)($at) +/* 05DEDC 8005D2DC C4286A34 */ lwc1 $f8, %lo(D_800E6A30 + 4)($at) /* 05DEE0 8005D2E0 460021A1 */ cvt.d.s $f6, $f4 /* 05DEE4 8005D2E4 46283282 */ mul.d $f10, $f6, $f8 /* 05DEE8 8005D2E8 3C01401E */ li $at, 0x401E0000 # 2.468750 @@ -203,7 +203,7 @@ glabel func_8005D0D0 /* 05DFA8 8005D3A8 44809000 */ mtc1 $zero, $f18 /* 05DFAC 8005D3AC 46005021 */ cvt.d.s $f0, $f10 /* 05DFB0 8005D3B0 4632003C */ c.lt.d $f0, $f18 -/* 05DFB4 8005D3B4 3C01800E */ lui $at, %hi(D_800E6A3C) # $at, 0x800e +/* 05DFB4 8005D3B4 3C01800E */ lui $at, %hi(D_800E6A38 + 4) # $at, 0x800e /* 05DFB8 8005D3B8 45000036 */ bc1f .L8005D494 /* 05DFBC 8005D3BC 00000000 */ nop /* 05DFC0 8005D3C0 10600024 */ beqz $v1, .L8005D454 @@ -265,14 +265,14 @@ glabel func_8005D0D0 /* 05E090 8005D490 E612000C */ swc1 $f18, 0xc($s0) .L8005D494: /* 05E094 8005D494 C4296A38 */ lwc1 $f9, %lo(D_800E6A38)($at) -/* 05E098 8005D498 C4286A3C */ lwc1 $f8, %lo(D_800E6A3C)($at) -/* 05E09C 8005D49C 3C01800E */ lui $at, %hi(D_800E6A44) # $at, 0x800e +/* 05E098 8005D498 C4286A3C */ lwc1 $f8, %lo(D_800E6A38 + 4)($at) +/* 05E09C 8005D49C 3C01800E */ lui $at, %hi(D_800E6A40 + 4) # $at, 0x800e /* 05E0A0 8005D4A0 4628003C */ c.lt.d $f0, $f8 /* 05E0A4 8005D4A4 240F0001 */ li $t7, 1 /* 05E0A8 8005D4A8 45010008 */ bc1t .L8005D4CC /* 05E0AC 8005D4AC 24180001 */ li $t8, 1 /* 05E0B0 8005D4B0 C4276A40 */ lwc1 $f7, %lo(D_800E6A40)($at) -/* 05E0B4 8005D4B4 C4266A44 */ lwc1 $f6, %lo(D_800E6A44)($at) +/* 05E0B4 8005D4B4 C4266A44 */ lwc1 $f6, %lo(D_800E6A40 + 4)($at) /* 05E0B8 8005D4B8 24190002 */ li $t9, 2 /* 05E0BC 8005D4BC 4620303C */ c.lt.d $f6, $f0 /* 05E0C0 8005D4C0 240A0002 */ li $t2, 2 @@ -411,9 +411,9 @@ glabel func_8005D0D0 /* 05E2AC 8005D6AC 460E7102 */ mul.s $f4, $f14, $f14 /* 05E2B0 8005D6B0 0C0326B4 */ jal sqrtf /* 05E2B4 8005D6B4 46049300 */ add.s $f12, $f18, $f4 -/* 05E2B8 8005D6B8 3C01800E */ lui $at, %hi(D_800E6A4C) # $at, 0x800e +/* 05E2B8 8005D6B8 3C01800E */ lui $at, %hi(D_800E6A48 + 4) # $at, 0x800e /* 05E2BC 8005D6BC C4296A48 */ lwc1 $f9, %lo(D_800E6A48)($at) -/* 05E2C0 8005D6C0 C4286A4C */ lwc1 $f8, %lo(D_800E6A4C)($at) +/* 05E2C0 8005D6C0 C4286A4C */ lwc1 $f8, %lo(D_800E6A48 + 4)($at) /* 05E2C4 8005D6C4 460001A1 */ cvt.d.s $f6, $f0 /* 05E2C8 8005D6C8 4628303C */ c.lt.d $f6, $f8 /* 05E2CC 8005D6CC C7AE0050 */ lwc1 $f14, 0x50($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index f523bf35..86307223 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -32,21 +32,21 @@ glabel func_8005D820 /* 05E44C 8005D84C 0C01729E */ jal func_8005CA78 /* 05E450 8005D850 2484CE20 */ addiu $a0, %lo(D_800DCE20) # addiu $a0, $a0, -0x31e0 /* 05E454 8005D854 822E003B */ lb $t6, 0x3b($s1) -/* 05E458 8005D858 3C01800E */ lui $at, %hi(D_800E6A54) # $at, 0x800e +/* 05E458 8005D858 3C01800E */ lui $at, %hi(D_800E6A50 + 4) # $at, 0x800e /* 05E45C 8005D85C A7AE005E */ sh $t6, 0x5e($sp) /* 05E460 8005D860 860F016A */ lh $t7, 0x16a($s0) /* 05E464 8005D864 862A0018 */ lh $t2, 0x18($s1) /* 05E468 8005D868 A7AF005A */ sh $t7, 0x5a($sp) /* 05E46C 8005D86C C604002C */ lwc1 $f4, 0x2c($s0) /* 05E470 8005D870 C4276A50 */ lwc1 $f7, %lo(D_800E6A50)($at) -/* 05E474 8005D874 C4266A54 */ lwc1 $f6, %lo(D_800E6A54)($at) +/* 05E474 8005D874 C4266A54 */ lwc1 $f6, %lo(D_800E6A50 + 4)($at) /* 05E478 8005D878 46002021 */ cvt.d.s $f0, $f4 /* 05E47C 8005D87C 4626003C */ c.lt.d $f0, $f6 /* 05E480 8005D880 00000000 */ nop /* 05E484 8005D884 45000009 */ bc1f .L8005D8AC -/* 05E488 8005D888 3C01800E */ lui $at, %hi(D_800E6A5C) # $at, 0x800e +/* 05E488 8005D888 3C01800E */ lui $at, %hi(D_800E6A58 + 4) # $at, 0x800e /* 05E48C 8005D88C C4296A58 */ lwc1 $f9, %lo(D_800E6A58)($at) -/* 05E490 8005D890 C4286A5C */ lwc1 $f8, %lo(D_800E6A5C)($at) +/* 05E490 8005D890 C4286A5C */ lwc1 $f8, %lo(D_800E6A58 + 4)($at) /* 05E494 8005D894 8FB80074 */ lw $t8, 0x74($sp) /* 05E498 8005D898 4620403C */ c.lt.d $f8, $f0 /* 05E49C 8005D89C 00000000 */ nop @@ -157,10 +157,10 @@ glabel func_8005D820 /* 05E620 8005DA20 44816000 */ mtc1 $at, $f12 /* 05E624 8005DA24 0C01A7CA */ jal func_80069F28 /* 05E628 8005DA28 00000000 */ nop -/* 05E62C 8005DA2C 3C01800E */ lui $at, %hi(D_800E6A64) # $at, 0x800e +/* 05E62C 8005DA2C 3C01800E */ lui $at, %hi(D_800E6A60 + 4) # $at, 0x800e /* 05E630 8005DA30 C62A001C */ lwc1 $f10, 0x1c($s1) /* 05E634 8005DA34 C4216A60 */ lwc1 $f1, %lo(D_800E6A60)($at) -/* 05E638 8005DA38 C4206A64 */ lwc1 $f0, %lo(D_800E6A64)($at) +/* 05E638 8005DA38 C4206A64 */ lwc1 $f0, %lo(D_800E6A60 + 4)($at) /* 05E63C 8005DA3C 460054A1 */ cvt.d.s $f18, $f10 /* 05E640 8005DA40 46209102 */ mul.d $f4, $f18, $f0 /* 05E644 8005DA44 C6280024 */ lwc1 $f8, 0x24($s1) @@ -227,10 +227,10 @@ glabel func_8005D820 /* 05E730 8005DB30 460C3202 */ mul.s $f8, $f6, $f12 /* 05E734 8005DB34 000C6900 */ sll $t5, $t4, 4 /* 05E738 8005DB38 25AEFFEF */ addiu $t6, $t5, -0x11 -/* 05E73C 8005DB3C 3C01800E */ lui $at, %hi(D_800E6A6C) # $at, 0x800e +/* 05E73C 8005DB3C 3C01800E */ lui $at, %hi(D_800E6A68 + 4) # $at, 0x800e /* 05E740 8005DB40 448E2000 */ mtc1 $t6, $f4 /* 05E744 8005DB44 C4336A68 */ lwc1 $f19, %lo(D_800E6A68)($at) -/* 05E748 8005DB48 C4326A6C */ lwc1 $f18, %lo(D_800E6A6C)($at) +/* 05E748 8005DB48 C4326A6C */ lwc1 $f18, %lo(D_800E6A68 + 4)($at) /* 05E74C 8005DB4C 460042A1 */ cvt.d.s $f10, $f8 /* 05E750 8005DB50 46802520 */ cvt.s.w $f20, $f4 /* 05E754 8005DB54 44803000 */ mtc1 $zero, $f6 @@ -444,7 +444,7 @@ glabel L8005DCE8 /* 05EA3C 8005DE3C 4458F800 */ cfc1 $t8, $31 .L8005DE40: /* 05EA40 8005DE40 14C3000B */ bne $a2, $v1, .L8005DE70 -/* 05EA44 8005DE44 3C01800E */ lui $at, %hi(D_800E6A8C) # $at, 0x800e +/* 05EA44 8005DE44 3C01800E */ lui $at, %hi(D_800E6A88 + 4) # $at, 0x800e /* 05EA48 8005DE48 921901CD */ lbu $t9, 0x1cd($s0) /* 05EA4C 8005DE4C 24010004 */ li $at, 4 /* 05EA50 8005DE50 17210003 */ bne $t9, $at, .L8005DE60 @@ -460,14 +460,14 @@ glabel L8005DCE8 .L8005DE70: /* 05EA70 8005DE70 C604002C */ lwc1 $f4, 0x2c($s0) /* 05EA74 8005DE74 C4276A88 */ lwc1 $f7, %lo(D_800E6A88)($at) -/* 05EA78 8005DE78 C4266A8C */ lwc1 $f6, %lo(D_800E6A8C)($at) +/* 05EA78 8005DE78 C4266A8C */ lwc1 $f6, %lo(D_800E6A88 + 4)($at) /* 05EA7C 8005DE7C 46002021 */ cvt.d.s $f0, $f4 /* 05EA80 8005DE80 4620303C */ c.lt.d $f6, $f0 -/* 05EA84 8005DE84 3C01800E */ lui $at, %hi(D_800E6A94) # $at, 0x800e +/* 05EA84 8005DE84 3C01800E */ lui $at, %hi(D_800E6A90 + 4) # $at, 0x800e /* 05EA88 8005DE88 4500001C */ bc1f .L8005DEFC /* 05EA8C 8005DE8C 00000000 */ nop /* 05EA90 8005DE90 C4296A90 */ lwc1 $f9, %lo(D_800E6A90)($at) -/* 05EA94 8005DE94 C4286A94 */ lwc1 $f8, %lo(D_800E6A94)($at) +/* 05EA94 8005DE94 C4286A94 */ lwc1 $f8, %lo(D_800E6A90 + 4)($at) /* 05EA98 8005DE98 00000000 */ nop /* 05EA9C 8005DE9C 4628003C */ c.lt.d $f0, $f8 /* 05EAA0 8005DEA0 00000000 */ nop @@ -613,9 +613,9 @@ glabel L8005DCE8 /* 05ECA8 8005E0A8 460E7202 */ mul.s $f8, $f14, $f14 /* 05ECAC 8005E0AC 0C0326B4 */ jal sqrtf /* 05ECB0 8005E0B0 46082300 */ add.s $f12, $f4, $f8 -/* 05ECB4 8005E0B4 3C01800E */ lui $at, %hi(D_800E6A9C) # $at, 0x800e +/* 05ECB4 8005E0B4 3C01800E */ lui $at, %hi(D_800E6A98 + 4) # $at, 0x800e /* 05ECB8 8005E0B8 C4336A98 */ lwc1 $f19, %lo(D_800E6A98)($at) -/* 05ECBC 8005E0BC C4326A9C */ lwc1 $f18, %lo(D_800E6A9C)($at) +/* 05ECBC 8005E0BC C4326A9C */ lwc1 $f18, %lo(D_800E6A98 + 4)($at) /* 05ECC0 8005E0C0 460002A1 */ cvt.d.s $f10, $f0 /* 05ECC4 8005E0C4 4632503C */ c.lt.d $f10, $f18 /* 05ECC8 8005E0C8 C7AE0050 */ lwc1 $f14, 0x50($sp) diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index 19701edb..8ff41016 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -140,10 +140,10 @@ glabel func_8005E4C0 /* 05F2B8 8005E6B8 44816000 */ mtc1 $at, $f12 /* 05F2BC 8005E6BC 0C01A7CA */ jal func_80069F28 /* 05F2C0 8005E6C0 00000000 */ nop -/* 05F2C4 8005E6C4 3C01800E */ lui $at, %hi(D_800E6AA4) # $at, 0x800e +/* 05F2C4 8005E6C4 3C01800E */ lui $at, %hi(D_800E6AA0 + 4) # $at, 0x800e /* 05F2C8 8005E6C8 C604002C */ lwc1 $f4, 0x2c($s0) /* 05F2CC 8005E6CC C4296AA0 */ lwc1 $f9, %lo(D_800E6AA0)($at) -/* 05F2D0 8005E6D0 C4286AA4 */ lwc1 $f8, %lo(D_800E6AA4)($at) +/* 05F2D0 8005E6D0 C4286AA4 */ lwc1 $f8, %lo(D_800E6AA0 + 4)($at) /* 05F2D4 8005E6D4 460021A1 */ cvt.d.s $f6, $f4 /* 05F2D8 8005E6D8 46283282 */ mul.d $f10, $f6, $f8 /* 05F2DC 8005E6DC 44808000 */ mtc1 $zero, $f16 @@ -305,9 +305,9 @@ glabel func_8005E4C0 /* 05F520 8005E920 460E7282 */ mul.s $f10, $f14, $f14 /* 05F524 8005E924 0C0326B4 */ jal sqrtf /* 05F528 8005E928 460A4300 */ add.s $f12, $f8, $f10 -/* 05F52C 8005E92C 3C01800E */ lui $at, %hi(D_800E6AAC) # $at, 0x800e +/* 05F52C 8005E92C 3C01800E */ lui $at, %hi(D_800E6AA8 + 4) # $at, 0x800e /* 05F530 8005E930 C4256AA8 */ lwc1 $f5, %lo(D_800E6AA8)($at) -/* 05F534 8005E934 C4246AAC */ lwc1 $f4, %lo(D_800E6AAC)($at) +/* 05F534 8005E934 C4246AAC */ lwc1 $f4, %lo(D_800E6AA8 + 4)($at) /* 05F538 8005E938 460004A1 */ cvt.d.s $f18, $f0 /* 05F53C 8005E93C 4624903C */ c.lt.d $f18, $f4 /* 05F540 8005E940 8FA50038 */ lw $a1, 0x38($sp) diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index 11c123e4..1e7f1d55 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -29,13 +29,13 @@ glabel func_8005EA90 /* 05F6B8 8005EAB8 2484CE60 */ addiu $a0, %lo(D_800DCE60) # addiu $a0, $a0, -0x31a0 /* 05F6BC 8005EABC A20001EC */ sb $zero, 0x1ec($s0) /* 05F6C0 8005EAC0 822E003B */ lb $t6, 0x3b($s1) -/* 05F6C4 8005EAC4 3C01800E */ lui $at, %hi(D_800E6AB4) # $at, 0x800e +/* 05F6C4 8005EAC4 3C01800E */ lui $at, %hi(D_800E6AB0 + 4) # $at, 0x800e /* 05F6C8 8005EAC8 A7AE003E */ sh $t6, 0x3e($sp) /* 05F6CC 8005EACC 862F0018 */ lh $t7, 0x18($s1) /* 05F6D0 8005EAD0 C4276AB0 */ lwc1 $f7, %lo(D_800E6AB0)($at) /* 05F6D4 8005EAD4 A7AF003C */ sh $t7, 0x3c($sp) /* 05F6D8 8005EAD8 8618016A */ lh $t8, 0x16a($s0) -/* 05F6DC 8005EADC C4266AB4 */ lwc1 $f6, %lo(D_800E6AB4)($at) +/* 05F6DC 8005EADC C4266AB4 */ lwc1 $f6, %lo(D_800E6AB0 + 4)($at) /* 05F6E0 8005EAE0 A7B8003A */ sh $t8, 0x3a($sp) /* 05F6E4 8005EAE4 C604002C */ lwc1 $f4, 0x2c($s0) /* 05F6E8 8005EAE8 00000000 */ nop @@ -43,9 +43,9 @@ glabel func_8005EA90 /* 05F6F0 8005EAF0 4626003C */ c.lt.d $f0, $f6 /* 05F6F4 8005EAF4 00000000 */ nop /* 05F6F8 8005EAF8 45000009 */ bc1f .L8005EB20 -/* 05F6FC 8005EAFC 3C01800E */ lui $at, %hi(D_800E6ABC) # $at, 0x800e +/* 05F6FC 8005EAFC 3C01800E */ lui $at, %hi(D_800E6AB8 + 4) # $at, 0x800e /* 05F700 8005EB00 C4296AB8 */ lwc1 $f9, %lo(D_800E6AB8)($at) -/* 05F704 8005EB04 C4286ABC */ lwc1 $f8, %lo(D_800E6ABC)($at) +/* 05F704 8005EB04 C4286ABC */ lwc1 $f8, %lo(D_800E6AB8 + 4)($at) /* 05F708 8005EB08 8FB90054 */ lw $t9, 0x54($sp) /* 05F70C 8005EB0C 4620403C */ c.lt.d $f8, $f0 /* 05F710 8005EB10 00000000 */ nop @@ -153,10 +153,10 @@ glabel func_8005EA90 /* 05F890 8005EC90 44816000 */ mtc1 $at, $f12 /* 05F894 8005EC94 0C01A7CA */ jal func_80069F28 /* 05F898 8005EC98 00000000 */ nop -/* 05F89C 8005EC9C 3C01800E */ lui $at, %hi(D_800E6AC4) # $at, 0x800e +/* 05F89C 8005EC9C 3C01800E */ lui $at, %hi(D_800E6AC0 + 4) # $at, 0x800e /* 05F8A0 8005ECA0 C62A001C */ lwc1 $f10, 0x1c($s1) /* 05F8A4 8005ECA4 C4216AC0 */ lwc1 $f1, %lo(D_800E6AC0)($at) -/* 05F8A8 8005ECA8 C4206AC4 */ lwc1 $f0, %lo(D_800E6AC4)($at) +/* 05F8A8 8005ECA8 C4206AC4 */ lwc1 $f0, %lo(D_800E6AC0 + 4)($at) /* 05F8AC 8005ECAC 46005121 */ cvt.d.s $f4, $f10 /* 05F8B0 8005ECB0 46202182 */ mul.d $f6, $f4, $f0 /* 05F8B4 8005ECB4 C62A0024 */ lwc1 $f10, 0x24($s1) @@ -238,13 +238,13 @@ glabel func_8005EA90 /* 05F9D8 8005EDD8 460E3202 */ mul.s $f8, $f6, $f14 /* 05F9DC 8005EDDC 01AE7821 */ addu $t7, $t5, $t6 /* 05F9E0 8005EDE0 8DF80004 */ lw $t8, 4($t7) -/* 05F9E4 8005EDE4 3C01800E */ lui $at, %hi(D_800E6ACC) # $at, 0x800e +/* 05F9E4 8005EDE4 3C01800E */ lui $at, %hi(D_800E6AC8 + 4) # $at, 0x800e /* 05F9E8 8005EDE8 0018C900 */ sll $t9, $t8, 4 /* 05F9EC 8005EDEC 272AFFEF */ addiu $t2, $t9, -0x11 /* 05F9F0 8005EDF0 448A2000 */ mtc1 $t2, $f4 /* 05F9F4 8005EDF4 C4256AC8 */ lwc1 $f5, %lo(D_800E6AC8)($at) /* 05F9F8 8005EDF8 468020A0 */ cvt.s.w $f2, $f4 -/* 05F9FC 8005EDFC C4246ACC */ lwc1 $f4, %lo(D_800E6ACC)($at) +/* 05F9FC 8005EDFC C4246ACC */ lwc1 $f4, %lo(D_800E6AC8 + 4)($at) /* 05FA00 8005EE00 44804800 */ mtc1 $zero, $f9 /* 05FA04 8005EE04 460042A1 */ cvt.d.s $f10, $f8 /* 05FA08 8005EE08 46245182 */ mul.d $f6, $f10, $f4 @@ -446,7 +446,7 @@ glabel L8005EF98 /* 05FCC0 8005F0C0 444EF800 */ cfc1 $t6, $31 .L8005F0C4: /* 05FCC4 8005F0C4 14E3000B */ bne $a3, $v1, .L8005F0F4 -/* 05FCC8 8005F0C8 3C01800E */ lui $at, %hi(D_800E6AEC) # $at, 0x800e +/* 05FCC8 8005F0C8 3C01800E */ lui $at, %hi(D_800E6AE8 + 4) # $at, 0x800e /* 05FCCC 8005F0CC 920B01CD */ lbu $t3, 0x1cd($s0) /* 05FCD0 8005F0D0 24010004 */ li $at, 4 /* 05FCD4 8005F0D4 15610003 */ bne $t3, $at, .L8005F0E4 @@ -462,14 +462,14 @@ glabel L8005EF98 .L8005F0F4: /* 05FCF4 8005F0F4 C608002C */ lwc1 $f8, 0x2c($s0) /* 05FCF8 8005F0F8 C42B6AE8 */ lwc1 $f11, %lo(D_800E6AE8)($at) -/* 05FCFC 8005F0FC C42A6AEC */ lwc1 $f10, %lo(D_800E6AEC)($at) +/* 05FCFC 8005F0FC C42A6AEC */ lwc1 $f10, %lo(D_800E6AE8 + 4)($at) /* 05FD00 8005F100 46004021 */ cvt.d.s $f0, $f8 /* 05FD04 8005F104 4620503C */ c.lt.d $f10, $f0 -/* 05FD08 8005F108 3C01800E */ lui $at, %hi(D_800E6AF4) # $at, 0x800e +/* 05FD08 8005F108 3C01800E */ lui $at, %hi(D_800E6AF0 + 4) # $at, 0x800e /* 05FD0C 8005F10C 4500001C */ bc1f .L8005F180 /* 05FD10 8005F110 00000000 */ nop /* 05FD14 8005F114 C4256AF0 */ lwc1 $f5, %lo(D_800E6AF0)($at) -/* 05FD18 8005F118 C4246AF4 */ lwc1 $f4, %lo(D_800E6AF4)($at) +/* 05FD18 8005F118 C4246AF4 */ lwc1 $f4, %lo(D_800E6AF0 + 4)($at) /* 05FD1C 8005F11C 00000000 */ nop /* 05FD20 8005F120 4624003C */ c.lt.d $f0, $f4 /* 05FD24 8005F124 00000000 */ nop diff --git a/asm/non_matchings/unknown_05F690/func_8005F310.s b/asm/non_matchings/unknown_05F690/func_8005F310.s index 5cf32d49..bc831341 100644 --- a/asm/non_matchings/unknown_05F690/func_8005F310.s +++ b/asm/non_matchings/unknown_05F690/func_8005F310.s @@ -22,7 +22,7 @@ glabel func_8005F310 /* 05FF3C 8005F33C 3C01800E */ lui $at, %hi(D_800E6B00) # $at, 0x800e /* 05FF40 8005F340 A0E001EC */ sb $zero, 0x1ec($a3) /* 05FF44 8005F344 820E003B */ lb $t6, 0x3b($s0) -/* 05FF48 8005F348 C4266B04 */ lwc1 $f6, %lo(D_800E6B04)($at) +/* 05FF48 8005F348 C4266B04 */ lwc1 $f6, %lo(D_800E6B00 + 4)($at) /* 05FF4C 8005F34C A7AE003E */ sh $t6, 0x3e($sp) /* 05FF50 8005F350 860F0018 */ lh $t7, 0x18($s0) /* 05FF54 8005F354 C4276B00 */ lwc1 $f7, %lo(D_800E6B00)($at) @@ -36,9 +36,9 @@ glabel func_8005F310 /* 05FF74 8005F374 4626003C */ c.lt.d $f0, $f6 /* 05FF78 8005F378 00000000 */ nop /* 05FF7C 8005F37C 45000009 */ bc1f .L8005F3A4 -/* 05FF80 8005F380 3C01800E */ lui $at, %hi(D_800E6B0C) # $at, 0x800e +/* 05FF80 8005F380 3C01800E */ lui $at, %hi(D_800E6B08 + 4) # $at, 0x800e /* 05FF84 8005F384 C4296B08 */ lwc1 $f9, %lo(D_800E6B08)($at) -/* 05FF88 8005F388 C4286B0C */ lwc1 $f8, %lo(D_800E6B0C)($at) +/* 05FF88 8005F388 C4286B0C */ lwc1 $f8, %lo(D_800E6B08 + 4)($at) /* 05FF8C 8005F38C 8FB90054 */ lw $t9, 0x54($sp) /* 05FF90 8005F390 4620403C */ c.lt.d $f8, $f0 /* 05FF94 8005F394 00000000 */ nop @@ -153,10 +153,10 @@ glabel func_8005F310 /* 06012C 8005F52C 44816000 */ mtc1 $at, $f12 /* 060130 8005F530 0C01A7CA */ jal func_80069F28 /* 060134 8005F534 00000000 */ nop -/* 060138 8005F538 3C01800E */ lui $at, %hi(D_800E6B14) # $at, 0x800e +/* 060138 8005F538 3C01800E */ lui $at, %hi(D_800E6B10 + 4) # $at, 0x800e /* 06013C 8005F53C C60A001C */ lwc1 $f10, 0x1c($s0) /* 060140 8005F540 C4216B10 */ lwc1 $f1, %lo(D_800E6B10)($at) -/* 060144 8005F544 C4206B14 */ lwc1 $f0, %lo(D_800E6B14)($at) +/* 060144 8005F544 C4206B14 */ lwc1 $f0, %lo(D_800E6B10 + 4)($at) /* 060148 8005F548 46005121 */ cvt.d.s $f4, $f10 /* 06014C 8005F54C 46202182 */ mul.d $f6, $f4, $f0 /* 060150 8005F550 C60A0024 */ lwc1 $f10, 0x24($s0) diff --git a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s index c59c988d..6a10fe67 100644 --- a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s +++ b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s @@ -8,10 +8,10 @@ glabel __timeToSamplesNoRound /* 066358 80065758 44852000 */ mtc1 $a1, $f4 /* 06635C 8006575C 448E4000 */ mtc1 $t6, $f8 /* 066360 80065760 468021A0 */ cvt.s.w $f6, $f4 -/* 066364 80065764 3C01800E */ lui $at, %hi(D_800E6EC4) # $at, 0x800e +/* 066364 80065764 3C01800E */ lui $at, %hi(D_800E6EC0 + 4) # $at, 0x800e /* 066368 80065768 C4256EC0 */ lwc1 $f5, %lo(D_800E6EC0)($at) /* 06636C 8006576C 468042A0 */ cvt.s.w $f10, $f8 -/* 066370 80065770 C4246EC4 */ lwc1 $f4, %lo(D_800E6EC4)($at) +/* 066370 80065770 C4246EC4 */ lwc1 $f4, %lo(D_800E6EC0 + 4)($at) /* 066374 80065774 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 066378 80065778 460A3402 */ mul.s $f16, $f6, $f10 /* 06637C 8006577C 44803000 */ mtc1 $zero, $f6 diff --git a/asm/non_matchings/unknown_072E50/func_80072578.s b/asm/non_matchings/unknown_072E50/func_80072578.s index 2e2f24f5..00a6d20e 100644 --- a/asm/non_matchings/unknown_072E50/func_80072578.s +++ b/asm/non_matchings/unknown_072E50/func_80072578.s @@ -42,10 +42,10 @@ glabel func_80072578 /* 073204 80072604 01F8C824 */ and $t9, $t7, $t8 /* 073208 80072608 A10E0000 */ sb $t6, ($t0) /* 07320C 8007260C A1390000 */ sb $t9, ($t1) -/* 073210 80072610 3C01800E */ lui $at, %hi(D_800E77E4) # $at, 0x800e +/* 073210 80072610 3C01800E */ lui $at, %hi(D_800E77E0 + 4) # $at, 0x800e /* 073214 80072614 468021A1 */ cvt.d.w $f6, $f4 /* 073218 80072618 C42977E0 */ lwc1 $f9, %lo(D_800E77E0)($at) -/* 07321C 8007261C C42877E4 */ lwc1 $f8, %lo(D_800E77E4)($at) +/* 07321C 8007261C C42877E4 */ lwc1 $f8, %lo(D_800E77E0 + 4)($at) /* 073220 80072620 01402025 */ move $a0, $t2 /* 073224 80072624 46283282 */ mul.d $f10, $f6, $f8 /* 073228 80072628 000A5080 */ sll $t2, $t2, 2 diff --git a/asm/non_matchings/unknown_072E50/func_80072718.s b/asm/non_matchings/unknown_072E50/func_80072718.s index 3a54a123..9c920bc7 100644 --- a/asm/non_matchings/unknown_072E50/func_80072718.s +++ b/asm/non_matchings/unknown_072E50/func_80072718.s @@ -125,13 +125,13 @@ glabel func_80072718 /* 0734D0 800728D0 8C84E48C */ lw $a0, %lo(D_800DE48C)($a0) /* 0734D4 800728D4 00000000 */ nop .L800728D8: -/* 0734D8 800728D8 3C01800E */ lui $at, %hi(D_800E77EC) # $at, 0x800e +/* 0734D8 800728D8 3C01800E */ lui $at, %hi(D_800E77E8 + 4) # $at, 0x800e /* 0734DC 800728DC C43777E8 */ lwc1 $f23, %lo(D_800E77E8)($at) -/* 0734E0 800728E0 C43677EC */ lwc1 $f22, %lo(D_800E77EC)($at) -/* 0734E4 800728E4 3C01800E */ lui $at, %hi(D_800E77F4) # $at, 0x800e +/* 0734E0 800728E0 C43677EC */ lwc1 $f22, %lo(D_800E77E8 + 4)($at) +/* 0734E4 800728E4 3C01800E */ lui $at, %hi(D_800E77F0 + 4) # $at, 0x800e /* 0734E8 800728E8 3C108012 */ lui $s0, %hi(D_801241B8) # $s0, 0x8012 /* 0734EC 800728EC C43577F0 */ lwc1 $f21, %lo(D_800E77F0)($at) -/* 0734F0 800728F0 C43477F4 */ lwc1 $f20, %lo(D_800E77F4)($at) +/* 0734F0 800728F0 C43477F4 */ lwc1 $f20, %lo(D_800E77F0 + 4)($at) /* 0734F4 800728F4 261041B8 */ addiu $s0, %lo(D_801241B8) # addiu $s0, $s0, 0x41b8 /* 0734F8 800728F8 00009825 */ move $s3, $zero /* 0734FC 800728FC 24030001 */ li $v1, 1 diff --git a/asm/non_matchings/unknown_072E50/func_80074EB8.s b/asm/non_matchings/unknown_072E50/func_80074EB8.s index a6e39c7c..642c0b0d 100644 --- a/asm/non_matchings/unknown_072E50/func_80074EB8.s +++ b/asm/non_matchings/unknown_072E50/func_80074EB8.s @@ -1,7 +1,8 @@ .rdata glabel D_800E7768 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E7778 +.word 0 .text glabel func_80074EB8 diff --git a/asm/non_matchings/unknown_072E50/func_80075000.s b/asm/non_matchings/unknown_072E50/func_80075000.s index d1da6c0b..f42f161d 100644 --- a/asm/non_matchings/unknown_072E50/func_80075000.s +++ b/asm/non_matchings/unknown_072E50/func_80075000.s @@ -1,10 +1,12 @@ .rdata glabel D_800E777C -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E778C +.word 0 glabel D_800E7790 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77A0 +.word 0 .text glabel func_80075000 diff --git a/asm/non_matchings/unknown_072E50/func_800753D8.s b/asm/non_matchings/unknown_072E50/func_800753D8.s index d6639ec9..60f637b7 100644 --- a/asm/non_matchings/unknown_072E50/func_800753D8.s +++ b/asm/non_matchings/unknown_072E50/func_800753D8.s @@ -1,10 +1,12 @@ .rdata glabel D_800E77A4 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77B4 +.word 0 glabel D_800E77B8 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77C8 +.word 0 .text glabel func_800753D8 diff --git a/asm/non_matchings/unknown_072E50/func_800756D4.s b/asm/non_matchings/unknown_072E50/func_800756D4.s index 48ce3b2f..160caded 100644 --- a/asm/non_matchings/unknown_072E50/func_800756D4.s +++ b/asm/non_matchings/unknown_072E50/func_800756D4.s @@ -1,7 +1,8 @@ .rdata glabel D_800E77CC -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77DC +.word 0 .text glabel func_800756D4 diff --git a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s index 5ac43352..a8cfffc2 100644 --- a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s @@ -137,14 +137,14 @@ glabel MenuLogoScreenLoop /* 083950 80082D50 240400FF */ li $a0, 255 /* 083954 80082D54 44818800 */ mtc1 $at, $f17 /* 083958 80082D58 44808000 */ mtc1 $zero, $f16 -/* 08395C 80082D5C 3C01800F */ lui $at, %hi(D_800E839C) # $at, 0x800f +/* 08395C 80082D5C 3C01800F */ lui $at, %hi(D_800E8398 + 4) # $at, 0x800f /* 083960 80082D60 4620803E */ c.le.d $f16, $f0 /* 083964 80082D64 00000000 */ nop /* 083968 80082D68 45000011 */ bc1f .L80082DB0 /* 08396C 80082D6C 00000000 */ nop /* 083970 80082D70 46206481 */ sub.d $f18, $f12, $f0 /* 083974 80082D74 C4258398 */ lwc1 $f5, %lo(D_800E8398)($at) -/* 083978 80082D78 C424839C */ lwc1 $f4, %lo(D_800E839C)($at) +/* 083978 80082D78 C424839C */ lwc1 $f4, %lo(D_800E8398 + 4)($at) /* 08397C 80082D7C 00000000 */ nop /* 083980 80082D80 46249182 */ mul.d $f6, $f18, $f4 /* 083984 80082D84 444DF800 */ cfc1 $t5, $31 @@ -169,14 +169,14 @@ glabel MenuLogoScreenLoop /* 0839CC 80082DCC 00000000 */ nop /* 0839D0 80082DD0 44811800 */ mtc1 $at, $f3 /* 0839D4 80082DD4 44801000 */ mtc1 $zero, $f2 -/* 0839D8 80082DD8 3C01800F */ lui $at, %hi(D_800E83A4) # $at, 0x800f +/* 0839D8 80082DD8 3C01800F */ lui $at, %hi(D_800E83A0 + 4) # $at, 0x800f /* 0839DC 80082DDC 4620103E */ c.le.d $f2, $f0 /* 0839E0 80082DE0 00000000 */ nop /* 0839E4 80082DE4 45000011 */ bc1f .L80082E2C /* 0839E8 80082DE8 00000000 */ nop /* 0839EC 80082DEC 46220401 */ sub.d $f16, $f0, $f2 /* 0839F0 80082DF0 C43383A0 */ lwc1 $f19, %lo(D_800E83A0)($at) -/* 0839F4 80082DF4 C43283A4 */ lwc1 $f18, %lo(D_800E83A4)($at) +/* 0839F4 80082DF4 C43283A4 */ lwc1 $f18, %lo(D_800E83A0 + 4)($at) /* 0839F8 80082DF8 00000000 */ nop /* 0839FC 80082DFC 46328102 */ mul.d $f4, $f16, $f18 /* 083A00 80082E00 444EF800 */ cfc1 $t6, $31 @@ -252,9 +252,9 @@ glabel MenuLogoScreenLoop /* 083B10 80082F10 3C014021 */ li $at, 0x40210000 # 2.515625 /* 083B14 80082F14 44815800 */ mtc1 $at, $f11 /* 083B18 80082F18 44805000 */ mtc1 $zero, $f10 -/* 083B1C 80082F1C 3C01800F */ lui $at, %hi(D_800E83AC) # $at, 0x800f +/* 083B1C 80082F1C 3C01800F */ lui $at, %hi(D_800E83A8 + 4) # $at, 0x800f /* 083B20 80082F20 C43383A8 */ lwc1 $f19, %lo(D_800E83A8)($at) -/* 083B24 80082F24 C43283AC */ lwc1 $f18, %lo(D_800E83AC)($at) +/* 083B24 80082F24 C43283AC */ lwc1 $f18, %lo(D_800E83A8 + 4)($at) /* 083B28 80082F28 46205401 */ sub.d $f16, $f10, $f0 /* 083B2C 80082F2C 46328102 */ mul.d $f4, $f16, $f18 /* 083B30 80082F30 444BF800 */ cfc1 $t3, $31 diff --git a/asm/non_matchings/unknown_080500/func_8008FA54.s b/asm/non_matchings/unknown_080500/func_8008FA54.s index 4420b1d1..17603d31 100644 --- a/asm/non_matchings/unknown_080500/func_8008FA54.s +++ b/asm/non_matchings/unknown_080500/func_8008FA54.s @@ -138,9 +138,9 @@ glabel func_8008FA54 /* 090844 8008FC44 46006086 */ mov.s $f2, $f12 /* 090848 8008FC48 17200007 */ bnez $t9, .L8008FC68 /* 09084C 8008FC4C 46006006 */ mov.s $f0, $f12 -/* 090850 8008FC50 3C01800F */ lui $at, %hi(D_800E84D4) # $at, 0x800f +/* 090850 8008FC50 3C01800F */ lui $at, %hi(D_800E84D0 + 4) # $at, 0x800f /* 090854 8008FC54 C42784D0 */ lwc1 $f7, %lo(D_800E84D0)($at) -/* 090858 8008FC58 C42684D4 */ lwc1 $f6, %lo(D_800E84D4)($at) +/* 090858 8008FC58 C42684D4 */ lwc1 $f6, %lo(D_800E84D0 + 4)($at) /* 09085C 8008FC5C 46006121 */ cvt.d.s $f4, $f12 /* 090860 8008FC60 46262202 */ mul.d $f8, $f4, $f6 /* 090864 8008FC64 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_080500/func_800904E8.s b/asm/non_matchings/unknown_080500/func_800904E8.s index ebe5599c..276faded 100644 --- a/asm/non_matchings/unknown_080500/func_800904E8.s +++ b/asm/non_matchings/unknown_080500/func_800904E8.s @@ -20,11 +20,11 @@ glabel func_800904E8 /* 091114 80090514 C42E69E8 */ lwc1 $f14, %lo(D_801269E8)($at) /* 091118 80090518 3C018012 */ lui $at, %hi(D_801269EC) # $at, 0x8012 /* 09111C 8009051C C43069EC */ lwc1 $f16, %lo(D_801269EC)($at) -/* 091120 80090520 3C01800F */ lui $at, %hi(D_800E84E4) # $at, 0x800f +/* 091120 80090520 3C01800F */ lui $at, %hi(D_800E84E0 + 4) # $at, 0x800f /* 091124 80090524 3C088012 */ lui $t0, %hi(D_801269E4) # $t0, 0x8012 /* 091128 80090528 3C038012 */ lui $v1, %hi(D_801269DC) # $v1, 0x8012 /* 09112C 8009052C C42184E0 */ lwc1 $f1, %lo(D_800E84E0)($at) -/* 091130 80090530 C42084E4 */ lwc1 $f0, %lo(D_800E84E4)($at) +/* 091130 80090530 C42084E4 */ lwc1 $f0, %lo(D_800E84E0 + 4)($at) /* 091134 80090534 246369DC */ addiu $v1, %lo(D_801269DC) # addiu $v1, $v1, 0x69dc /* 091138 80090538 250869E4 */ addiu $t0, %lo(D_801269E4) # addiu $t0, $t0, 0x69e4 /* 09113C 8009053C C4660000 */ lwc1 $f6, ($v1) @@ -67,9 +67,9 @@ glabel func_800904E8 /* 0911C8 800905C8 E5080000 */ swc1 $f8, ($t0) /* 0911CC 800905CC 1045004D */ beq $v0, $a1, .L80090704 .L800905D0: -/* 0911D0 800905D0 3C01800F */ lui $at, %hi(D_800E84EC) # $at, 0x800f +/* 0911D0 800905D0 3C01800F */ lui $at, %hi(D_800E84E8 + 4) # $at, 0x800f /* 0911D4 800905D4 C42184E8 */ lwc1 $f1, %lo(D_800E84E8)($at) -/* 0911D8 800905D8 C42084EC */ lwc1 $f0, %lo(D_800E84EC)($at) +/* 0911D8 800905D8 C42084EC */ lwc1 $f0, %lo(D_800E84E8 + 4)($at) /* 0911DC 800905DC 3C018012 */ lui $at, %hi(D_801269E8) # $at, 0x8012 /* 0911E0 800905E0 C42E69E8 */ lwc1 $f14, %lo(D_801269E8)($at) /* 0911E4 800905E4 3C018012 */ lui $at, %hi(D_801269EC) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/unknown_09F8F0/func_8009F034.s index 81f7bf5f..7a0cb2dd 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009F034.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009F034.s @@ -181,13 +181,13 @@ glabel func_8009F034 /* 09FE68 8009F268 4481A000 */ mtc1 $at, $f20 /* 09FE6C 8009F26C 3C013FE8 */ li $at, 0x3FE80000 # 1.812500 /* 09FE70 8009F270 44818800 */ mtc1 $at, $f17 -/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86AC) # $at, 0x800f +/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86A8 + 4) # $at, 0x800f /* 09FE78 8009F278 27186CE0 */ addiu $t8, %lo(D_80126CE0) # addiu $t8, $t8, 0x6ce0 /* 09FE7C 8009F27C 3C10800E */ lui $s0, %hi(D_800E25C4) # $s0, 0x800e /* 09FE80 8009F280 3C098012 */ lui $t1, %hi(D_80126CF0) # $t1, 0x8012 /* 09FE84 8009F284 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012 /* 09FE88 8009F288 C42F86A8 */ lwc1 $f15, %lo(D_800E86A8)($at) -/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86AC)($at) +/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86A8 + 4)($at) /* 09FE90 8009F290 44808000 */ mtc1 $zero, $f16 /* 09FE94 8009F294 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc /* 09FE98 8009F298 25296CF0 */ addiu $t1, %lo(D_80126CF0) # addiu $t1, $t1, 0x6cf0 @@ -912,12 +912,12 @@ glabel func_8009F034 /* 0A0924 8009FD24 AFA70090 */ sw $a3, 0x90($sp) /* 0A0928 8009FD28 3C014120 */ li $at, 0x41200000 # 10.000000 /* 0A092C 8009FD2C 44811000 */ mtc1 $at, $f2 -/* 0A0930 8009FD30 3C01800F */ lui $at, %hi(D_800E86EC) # $at, 0x800f +/* 0A0930 8009FD30 3C01800F */ lui $at, %hi(D_800E86E8 + 4) # $at, 0x800f /* 0A0934 8009FD34 C42D86E8 */ lwc1 $f13, %lo(D_800E86E8)($at) -/* 0A0938 8009FD38 C42C86EC */ lwc1 $f12, %lo(D_800E86EC)($at) -/* 0A093C 8009FD3C 3C01800F */ lui $at, %hi(D_800E86F4) # $at, 0x800f +/* 0A0938 8009FD38 C42C86EC */ lwc1 $f12, %lo(D_800E86E8 + 4)($at) +/* 0A093C 8009FD3C 3C01800F */ lui $at, %hi(D_800E86F0 + 4) # $at, 0x800f /* 0A0940 8009FD40 C42F86F0 */ lwc1 $f15, %lo(D_800E86F0)($at) -/* 0A0944 8009FD44 C42E86F4 */ lwc1 $f14, %lo(D_800E86F4)($at) +/* 0A0944 8009FD44 C42E86F4 */ lwc1 $f14, %lo(D_800E86F0 + 4)($at) /* 0A0948 8009FD48 3C013FE8 */ li $at, 0x3FE80000 # 1.812500 /* 0A094C 8009FD4C 44818800 */ mtc1 $at, $f17 /* 0A0950 8009FD50 3C014080 */ li $at, 0x40800000 # 4.000000 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s index 76e44600..3ab4de32 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s @@ -188,11 +188,11 @@ glabel func_800A14F0 /* 0A238C 800A178C 3C01425C */ li $at, 0x425C0000 # 55.000000 /* 0A2390 800A1790 46009124 */ cvt.w.s $f4, $f18 /* 0A2394 800A1794 44811000 */ mtc1 $at, $f2 -/* 0A2398 800A1798 3C01800F */ lui $at, %hi(D_800E8724) # $at, 0x800f +/* 0A2398 800A1798 3C01800F */ lui $at, %hi(D_800E8720 + 4) # $at, 0x800f /* 0A239C 800A179C 44192000 */ mfc1 $t9, $f4 /* 0A23A0 800A17A0 44D8F800 */ ctc1 $t8, $31 /* 0A23A4 800A17A4 C4218720 */ lwc1 $f1, %lo(D_800E8720)($at) -/* 0A23A8 800A17A8 C4208724 */ lwc1 $f0, %lo(D_800E8724)($at) +/* 0A23A8 800A17A8 C4208724 */ lwc1 $f0, %lo(D_800E8720 + 4)($at) /* 0A23AC 800A17AC AFB90038 */ sw $t9, 0x38($sp) /* 0A23B0 800A17B0 46803320 */ cvt.s.w $f12, $f6 .L800A17B4: @@ -216,9 +216,9 @@ glabel func_800A14F0 /* 0A23F4 800A17F4 E7AC0018 */ swc1 $f12, 0x18($sp) /* 0A23F8 800A17F8 0C028669 */ jal func_800A19A4 /* 0A23FC 800A17FC E7AE0020 */ swc1 $f14, 0x20($sp) -/* 0A2400 800A1800 3C01800F */ lui $at, %hi(D_800E872C) # $at, 0x800f +/* 0A2400 800A1800 3C01800F */ lui $at, %hi(D_800E8728 + 4) # $at, 0x800f /* 0A2404 800A1804 C4218728 */ lwc1 $f1, %lo(D_800E8728)($at) -/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E872C)($at) +/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E8728 + 4)($at) /* 0A240C 800A180C 3C01425C */ li $at, 0x425C0000 # 55.000000 /* 0A2410 800A1810 3C038012 */ lui $v1, %hi(D_80126D37) # $v1, 0x8012 /* 0A2414 800A1814 3C068012 */ lui $a2, %hi(D_80126CDC) # $a2, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s index 3d690a9b..25869f4a 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s @@ -58,12 +58,12 @@ glabel func_800A1E48 /* 0A2B0C 800A1F0C 37210003 */ ori $at, $t9, 3 /* 0A2B10 800A1F10 38210002 */ xori $at, $at, 2 /* 0A2B14 800A1F14 44C1F800 */ ctc1 $at, $31 -/* 0A2B18 800A1F18 3C01800F */ lui $at, %hi(D_800E8734) # $at, 0x800f +/* 0A2B18 800A1F18 3C01800F */ lui $at, %hi(D_800E8730 + 4) # $at, 0x800f /* 0A2B1C 800A1F1C 460042A4 */ cvt.w.s $f10, $f8 /* 0A2B20 800A1F20 C4358730 */ lwc1 $f21, %lo(D_800E8730)($at) /* 0A2B24 800A1F24 44D9F800 */ ctc1 $t9, $31 /* 0A2B28 800A1F28 44085000 */ mfc1 $t0, $f10 -/* 0A2B2C 800A1F2C C4348734 */ lwc1 $f20, %lo(D_800E8734)($at) +/* 0A2B2C 800A1F2C C4348734 */ lwc1 $f20, %lo(D_800E8730 + 4)($at) /* 0A2B30 800A1F30 26B56D37 */ addiu $s5, %lo(D_80126D37) # addiu $s5, $s5, 0x6d37 /* 0A2B34 800A1F34 00009025 */ move $s2, $zero /* 0A2B38 800A1F38 241E0002 */ li $fp, 2 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index b0a9a997..f59a9926 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -327,10 +327,10 @@ glabel func_800A277C /* 0A37E0 800A2BE0 17000012 */ bnez $t8, .L800A2C2C /* 0A37E4 800A2BE4 00000000 */ nop /* 0A37E8 800A2BE8 44892000 */ mtc1 $t1, $f4 -/* 0A37EC 800A2BEC 3C01800F */ lui $at, %hi(D_800E873C) # $at, 0x800f +/* 0A37EC 800A2BEC 3C01800F */ lui $at, %hi(D_800E8738 + 4) # $at, 0x800f /* 0A37F0 800A2BF0 468021A0 */ cvt.s.w $f6, $f4 /* 0A37F4 800A2BF4 C42B8738 */ lwc1 $f11, %lo(D_800E8738)($at) -/* 0A37F8 800A2BF8 C42A873C */ lwc1 $f10, %lo(D_800E873C)($at) +/* 0A37F8 800A2BF8 C42A873C */ lwc1 $f10, %lo(D_800E8738 + 4)($at) /* 0A37FC 800A2BFC 46003221 */ cvt.d.s $f8, $f6 /* 0A3800 800A2C00 462A4102 */ mul.d $f4, $f8, $f10 /* 0A3804 800A2C04 444FF800 */ cfc1 $t7, $31 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 7541e545..536068ce 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -247,11 +247,11 @@ glabel L800A63D8 /* 0A71C8 800A65C8 00000000 */ nop /* 0A71CC 800A65CC 8C8E0000 */ lw $t6, ($a0) .L800A65D0: -/* 0A71D0 800A65D0 3C01800F */ lui $at, %hi(D_800E875C) # $at, 0x800f +/* 0A71D0 800A65D0 3C01800F */ lui $at, %hi(D_800E8758 + 4) # $at, 0x800f /* 0A71D4 800A65D4 15C0002D */ bnez $t6, .L800A668C /* 0A71D8 800A65D8 00000000 */ nop /* 0A71DC 800A65DC C4318758 */ lwc1 $f17, %lo(D_800E8758)($at) -/* 0A71E0 800A65E0 C430875C */ lwc1 $f16, %lo(D_800E875C)($at) +/* 0A71E0 800A65E0 C430875C */ lwc1 $f16, %lo(D_800E8758 + 4)($at) /* 0A71E4 800A65E4 46000121 */ cvt.d.s $f4, $f0 /* 0A71E8 800A65E8 46302182 */ mul.d $f6, $f4, $f16 /* 0A71EC 800A65EC 3C014080 */ li $at, 0x40800000 # 4.000000 @@ -346,11 +346,11 @@ glabel L800A63D8 /* 0A7338 800A6738 00000000 */ nop /* 0A733C 800A673C 8C8F0000 */ lw $t7, ($a0) .L800A6740: -/* 0A7340 800A6740 3C01800F */ lui $at, %hi(D_800E8764) # $at, 0x800f +/* 0A7340 800A6740 3C01800F */ lui $at, %hi(D_800E8760 + 4) # $at, 0x800f /* 0A7344 800A6744 15E0002A */ bnez $t7, .L800A67F0 /* 0A7348 800A6748 00000000 */ nop /* 0A734C 800A674C C4318760 */ lwc1 $f17, %lo(D_800E8760)($at) -/* 0A7350 800A6750 C4308764 */ lwc1 $f16, %lo(D_800E8764)($at) +/* 0A7350 800A6750 C4308764 */ lwc1 $f16, %lo(D_800E8760 + 4)($at) /* 0A7354 800A6754 46000221 */ cvt.d.s $f8, $f0 /* 0A7358 800A6758 46304282 */ mul.d $f10, $f8, $f16 /* 0A735C 800A675C 46001121 */ cvt.d.s $f4, $f2 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7520.s b/asm/non_matchings/unknown_09F8F0/func_800A7520.s index cf4681b5..5383658e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A7520.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A7520.s @@ -69,11 +69,11 @@ glabel func_800A7520 /* 0A81F0 800A75F0 00000000 */ nop /* 0A81F4 800A75F4 A4590044 */ sh $t9, 0x44($v0) /* 0A81F8 800A75F8 8D020000 */ lw $v0, ($t0) -/* 0A81FC 800A75FC 3C01800F */ lui $at, %hi(D_800E8784) # $at, 0x800f +/* 0A81FC 800A75FC 3C01800F */ lui $at, %hi(D_800E8780 + 4) # $at, 0x800f /* 0A8200 800A7600 804A005B */ lb $t2, 0x5b($v0) /* 0A8204 800A7604 C4298780 */ lwc1 $f9, %lo(D_800E8780)($at) /* 0A8208 800A7608 448A2000 */ mtc1 $t2, $f4 -/* 0A820C 800A760C C4288784 */ lwc1 $f8, %lo(D_800E8784)($at) +/* 0A820C 800A760C C4288784 */ lwc1 $f8, %lo(D_800E8780 + 4)($at) /* 0A8210 800A7610 468021A1 */ cvt.d.w $f6, $f4 /* 0A8214 800A7614 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 /* 0A8218 800A7618 44818800 */ mtc1 $at, $f17 @@ -132,10 +132,10 @@ glabel func_800A7520 /* 0A82E0 800A76E0 15C0002A */ bnez $t6, .L800A778C /* 0A82E4 800A76E4 00000000 */ nop /* 0A82E8 800A76E8 44834000 */ mtc1 $v1, $f8 -/* 0A82EC 800A76EC 3C01800F */ lui $at, %hi(D_800E878C) # $at, 0x800f +/* 0A82EC 800A76EC 3C01800F */ lui $at, %hi(D_800E8788 + 4) # $at, 0x800f /* 0A82F0 800A76F0 468042A0 */ cvt.s.w $f10, $f8 /* 0A82F4 800A76F4 C4338788 */ lwc1 $f19, %lo(D_800E8788)($at) -/* 0A82F8 800A76F8 C432878C */ lwc1 $f18, %lo(D_800E878C)($at) +/* 0A82F8 800A76F8 C432878C */ lwc1 $f18, %lo(D_800E8788 + 4)($at) /* 0A82FC 800A76FC 46005421 */ cvt.d.s $f16, $f10 /* 0A8300 800A7700 46328102 */ mul.d $f4, $f16, $f18 /* 0A8304 800A7704 3C014010 */ li $at, 0x40100000 # 2.250000 @@ -155,9 +155,9 @@ glabel func_800A7520 /* 0A833C 800A773C 0004C400 */ sll $t8, $a0, 0x10 /* 0A8340 800A7740 0C01C1F1 */ jal func_800707C4 /* 0A8344 800A7744 00182403 */ sra $a0, $t8, 0x10 -/* 0A8348 800A7748 3C01800F */ lui $at, %hi(D_800E8794) # $at, 0x800f +/* 0A8348 800A7748 3C01800F */ lui $at, %hi(D_800E8790 + 4) # $at, 0x800f /* 0A834C 800A774C C4318790 */ lwc1 $f17, %lo(D_800E8790)($at) -/* 0A8350 800A7750 C4308794 */ lwc1 $f16, %lo(D_800E8794)($at) +/* 0A8350 800A7750 C4308794 */ lwc1 $f16, %lo(D_800E8790 + 4)($at) /* 0A8354 800A7754 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012 /* 0A8358 800A7758 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc /* 0A835C 800A775C 460004A1 */ cvt.d.s $f18, $f0 @@ -296,11 +296,11 @@ glabel func_800A7520 /* 0A854C 800A794C 00036B00 */ sll $t5, $v1, 0xc /* 0A8550 800A7950 A44D0044 */ sh $t5, 0x44($v0) /* 0A8554 800A7954 8D020000 */ lw $v0, ($t0) -/* 0A8558 800A7958 3C01800F */ lui $at, %hi(D_800E879C) # $at, 0x800f +/* 0A8558 800A7958 3C01800F */ lui $at, %hi(D_800E8798 + 4) # $at, 0x800f /* 0A855C 800A795C 804E005B */ lb $t6, 0x5b($v0) /* 0A8560 800A7960 C42B8798 */ lwc1 $f11, %lo(D_800E8798)($at) /* 0A8564 800A7964 448E4000 */ mtc1 $t6, $f8 -/* 0A8568 800A7968 C42A879C */ lwc1 $f10, %lo(D_800E879C)($at) +/* 0A8568 800A7968 C42A879C */ lwc1 $f10, %lo(D_800E8798 + 4)($at) /* 0A856C 800A796C 46804121 */ cvt.d.w $f4, $f8 /* 0A8570 800A7970 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 /* 0A8574 800A7974 44818800 */ mtc1 $at, $f17 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 4917c93b..c9775500 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -369,10 +369,10 @@ glabel func_800A8474 /* 0A958C 800A898C 44074000 */ mfc1 $a3, $f8 /* 0A9590 800A8990 44D8F800 */ ctc1 $t8, $31 /* 0A9594 800A8994 15800020 */ bnez $t4, .L800A8A18 -# Used to access D_800E87A0 and D_800E87A4. +# Used to access D_800E87A0 and D_800E87A0 + 4. /* 0A9598 800A8998 3C01800F */ lui $at, %hi(D_800E87A0) # $at, 0x800f /* 0A959C 800A899C C42187A0 */ lwc1 $f1, %lo(D_800E87A0)($at) -/* 0A95A0 800A89A0 C42087A4 */ lwc1 $f0, %lo(D_800E87A4)($at) +/* 0A95A0 800A89A0 C42087A4 */ lwc1 $f0, %lo(D_800E87A0 + 4)($at) /* 0A95A4 800A89A4 8E420000 */ lw $v0, ($s2) /* 0A95A8 800A89A8 3C014080 */ li $at, 0x40800000 # 4.000000 /* 0A95AC 800A89AC 44814000 */ mtc1 $at, $f8 @@ -956,12 +956,12 @@ glabel func_800A8474 /* 0A9E54 800A9254 AFA60054 */ sw $a2, 0x54($sp) /* 0A9E58 800A9258 0C02917C */ jal func_800A45F0 /* 0A9E5C 800A925C AFA300D0 */ sw $v1, 0xd0($sp) -# Used to access D_800E87B8 and D_800E87BC. +# Used to access D_800E87B8 and D_800E87B8 + 4. /* 0A9E60 800A9260 3C01800F */ lui $at, %hi(D_800E87B8) # $at, 0x800f /* 0A9E64 800A9264 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0A9E68 800A9268 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0A9E6C 800A926C C42187B8 */ lwc1 $f1, %lo(D_800E87B8)($at) -/* 0A9E70 800A9270 C42087BC */ lwc1 $f0, %lo(D_800E87BC)($at) +/* 0A9E70 800A9270 C42087BC */ lwc1 $f0, %lo(D_800E87B8 + 4)($at) /* 0A9E74 800A9274 8FA300D0 */ lw $v1, 0xd0($sp) /* 0A9E78 800A9278 8FA60054 */ lw $a2, 0x54($sp) /* 0A9E7C 800A927C 15C00012 */ bnez $t6, .L800A92C8 @@ -1165,10 +1165,10 @@ glabel func_800A8474 /* 0AA160 800A9560 44053000 */ mfc1 $a1, $f6 /* 0AA164 800A9564 44D8F800 */ ctc1 $t8, $31 /* 0AA168 800A9568 1580003C */ bnez $t4, .L800A965C -# Used to access D_800E87C0 and D_800E87C4. +# Used to access D_800E87C0 and D_800E87C0 + 4. /* 0AA16C 800A956C 3C01800F */ lui $at, %hi(D_800E87C0) # $at, 0x800f /* 0AA170 800A9570 C42187C0 */ lwc1 $f1, %lo(D_800E87C0)($at) -/* 0AA174 800A9574 C42087C4 */ lwc1 $f0, %lo(D_800E87C4)($at) +/* 0AA174 800A9574 C42087C4 */ lwc1 $f0, %lo(D_800E87C0 + 4)($at) /* 0AA178 800A9578 8E420000 */ lw $v0, ($s2) /* 0AA17C 800A957C 3C014080 */ li $at, 0x40800000 # 4.000000 /* 0AA180 800A9580 44813000 */ mtc1 $at, $f6 @@ -1570,11 +1570,11 @@ glabel func_800A8474 /* 0AA744 800A9B44 15C00013 */ bnez $t6, .L800A9B94 /* 0AA748 800A9B48 00000000 */ nop /* 0AA74C 800A9B4C 8E180000 */ lw $t8, ($s0) -/* 0AA750 800A9B50 3C01800F */ lui $at, %hi(D_800E87CC) # $at, 0x800f +/* 0AA750 800A9B50 3C01800F */ lui $at, %hi(D_800E87C8 + 4) # $at, 0x800f /* 0AA754 800A9B54 44982000 */ mtc1 $t8, $f4 /* 0AA758 800A9B58 C42B87C8 */ lwc1 $f11, %lo(D_800E87C8)($at) /* 0AA75C 800A9B5C 468021A1 */ cvt.d.w $f6, $f4 -/* 0AA760 800A9B60 C42A87CC */ lwc1 $f10, %lo(D_800E87CC)($at) +/* 0AA760 800A9B60 C42A87CC */ lwc1 $f10, %lo(D_800E87C8 + 4)($at) /* 0AA764 800A9B64 00000000 */ nop /* 0AA768 800A9B68 462A3482 */ mul.d $f18, $f6, $f10 /* 0AA76C 800A9B6C 4459F800 */ cfc1 $t9, $31 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/unknown_09F8F0/func_800AA600.s index 48d40b05..21a51605 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA600.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA600.s @@ -365,10 +365,10 @@ glabel func_800AA600 /* 0AB73C 800AAB3C 01CF0019 */ multu $t6, $t7 /* 0AB740 800AAB40 A7A00076 */ sh $zero, 0x76($sp) /* 0AB744 800AAB44 AFA00078 */ sw $zero, 0x78($sp) -# Used to access D_800E87E0 and D_800E87E4. +# Used to access D_800E87E0 and D_800E87E0 + 4. /* 0AB748 800AAB48 3C01800F */ lui $at, %hi(D_800E87E0) # $at, 0x800f /* 0AB74C 800AAB4C C43387E0 */ lwc1 $f19, %lo(D_800E87E0)($at) -/* 0AB750 800AAB50 C43287E4 */ lwc1 $f18, %lo(D_800E87E4)($at) +/* 0AB750 800AAB50 C43287E4 */ lwc1 $f18, %lo(D_800E87E0 + 4)($at) /* 0AB754 800AAB54 3C18800E */ lui $t8, %hi(D_800E2834) # $t8, 0x800e /* 0AB758 800AAB58 8F182834 */ lw $t8, %lo(D_800E2834)($t8) /* 0AB75C 800AAB5C 240B0001 */ li $t3, 1 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B0010.s b/asm/non_matchings/unknown_0AEE70/func_800B0010.s index ba972710..d4eb9ed1 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B0010.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B0010.s @@ -51,10 +51,10 @@ glabel func_800B0010 /* 0B0CA0 800B00A0 0C01BE53 */ jal func_8006F94C /* 0B0CA4 800B00A4 00052023 */ negu $a0, $a1 /* 0B0CA8 800B00A8 44822000 */ mtc1 $v0, $f4 -/* 0B0CAC 800B00AC 3C01800F */ lui $at, %hi(D_800E8B9C) # $at, 0x800f +/* 0B0CAC 800B00AC 3C01800F */ lui $at, %hi(D_800E8B98 + 4) # $at, 0x800f /* 0B0CB0 800B00B0 468021A0 */ cvt.s.w $f6, $f4 /* 0B0CB4 800B00B4 C42B8B98 */ lwc1 $f11, %lo(D_800E8B98)($at) -/* 0B0CB8 800B00B8 C42A8B9C */ lwc1 $f10, %lo(D_800E8B9C)($at) +/* 0B0CB8 800B00B8 C42A8B9C */ lwc1 $f10, %lo(D_800E8B98 + 4)($at) /* 0B0CBC 800B00BC 46003221 */ cvt.d.s $f8, $f6 /* 0B0CC0 800B00C0 462A4402 */ mul.d $f16, $f8, $f10 /* 0B0CC4 800B00C4 C612001C */ lwc1 $f18, 0x1c($s0) @@ -72,10 +72,10 @@ glabel func_800B0010 /* 0B0CF0 800B00F0 0C01BE53 */ jal func_8006F94C /* 0B0CF4 800B00F4 00052023 */ negu $a0, $a1 /* 0B0CF8 800B00F8 44825000 */ mtc1 $v0, $f10 -/* 0B0CFC 800B00FC 3C01800F */ lui $at, %hi(D_800E8BA4) # $at, 0x800f +/* 0B0CFC 800B00FC 3C01800F */ lui $at, %hi(D_800E8BA0 + 4) # $at, 0x800f /* 0B0D00 800B0100 468054A0 */ cvt.s.w $f18, $f10 /* 0B0D04 800B0104 C4318BA0 */ lwc1 $f17, %lo(D_800E8BA0)($at) -/* 0B0D08 800B0108 C4308BA4 */ lwc1 $f16, %lo(D_800E8BA4)($at) +/* 0B0D08 800B0108 C4308BA4 */ lwc1 $f16, %lo(D_800E8BA0 + 4)($at) /* 0B0D0C 800B010C 46009121 */ cvt.d.s $f4, $f18 /* 0B0D10 800B0110 46302182 */ mul.d $f6, $f4, $f16 /* 0B0D14 800B0114 C6080020 */ lwc1 $f8, 0x20($s0) @@ -92,10 +92,10 @@ glabel func_800B0010 /* 0B0D3C 800B013C 0C01BE53 */ jal func_8006F94C /* 0B0D40 800B0140 00052023 */ negu $a0, $a1 /* 0B0D44 800B0144 44828000 */ mtc1 $v0, $f16 -/* 0B0D48 800B0148 3C01800F */ lui $at, %hi(D_800E8BAC) # $at, 0x800f +/* 0B0D48 800B0148 3C01800F */ lui $at, %hi(D_800E8BA8 + 4) # $at, 0x800f /* 0B0D4C 800B014C 46808220 */ cvt.s.w $f8, $f16 /* 0B0D50 800B0150 C4278BA8 */ lwc1 $f7, %lo(D_800E8BA8)($at) -/* 0B0D54 800B0154 C4268BAC */ lwc1 $f6, %lo(D_800E8BAC)($at) +/* 0B0D54 800B0154 C4268BAC */ lwc1 $f6, %lo(D_800E8BA8 + 4)($at) /* 0B0D58 800B0158 460042A1 */ cvt.d.s $f10, $f8 /* 0B0D5C 800B015C 46265482 */ mul.d $f18, $f10, $f6 /* 0B0D60 800B0160 C6040024 */ lwc1 $f4, 0x24($s0) @@ -181,10 +181,10 @@ glabel func_800B0010 /* 0B0E90 800B0290 0C01BE53 */ jal func_8006F94C /* 0B0E94 800B0294 00052023 */ negu $a0, $a1 /* 0B0E98 800B0298 44828000 */ mtc1 $v0, $f16 -/* 0B0E9C 800B029C 3C01800F */ lui $at, %hi(D_800E8BB4) # $at, 0x800f +/* 0B0E9C 800B029C 3C01800F */ lui $at, %hi(D_800E8BB0 + 4) # $at, 0x800f /* 0B0EA0 800B02A0 468084A0 */ cvt.s.w $f18, $f16 /* 0B0EA4 800B02A4 C42B8BB0 */ lwc1 $f11, %lo(D_800E8BB0)($at) -/* 0B0EA8 800B02A8 C42A8BB4 */ lwc1 $f10, %lo(D_800E8BB4)($at) +/* 0B0EA8 800B02A8 C42A8BB4 */ lwc1 $f10, %lo(D_800E8BB0 + 4)($at) /* 0B0EAC 800B02AC 46009221 */ cvt.d.s $f8, $f18 /* 0B0EB0 800B02B0 462A4182 */ mul.d $f6, $f8, $f10 /* 0B0EB4 800B02B4 C7A40038 */ lwc1 $f4, 0x38($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s index 60a68c6a..28eda078 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s @@ -42,10 +42,10 @@ glabel func_800B03C0 /* 0B1044 800B0444 0C01BE53 */ jal func_8006F94C /* 0B1048 800B0448 00052023 */ negu $a0, $a1 /* 0B104C 800B044C 44823000 */ mtc1 $v0, $f6 -/* 0B1050 800B0450 3C01800F */ lui $at, %hi(D_800E8BBC) # $at, 0x800f +/* 0B1050 800B0450 3C01800F */ lui $at, %hi(D_800E8BB8 + 4) # $at, 0x800f /* 0B1054 800B0454 46803220 */ cvt.s.w $f8, $f6 /* 0B1058 800B0458 C4318BB8 */ lwc1 $f17, %lo(D_800E8BB8)($at) -/* 0B105C 800B045C C4308BBC */ lwc1 $f16, %lo(D_800E8BBC)($at) +/* 0B105C 800B045C C4308BBC */ lwc1 $f16, %lo(D_800E8BB8 + 4)($at) /* 0B1060 800B0460 460042A1 */ cvt.d.s $f10, $f8 /* 0B1064 800B0464 46305482 */ mul.d $f18, $f10, $f16 /* 0B1068 800B0468 C6040058 */ lwc1 $f4, 0x58($s0) @@ -81,10 +81,10 @@ glabel func_800B03C0 /* 0B10DC 800B04DC 0C01BE53 */ jal func_8006F94C /* 0B10E0 800B04E0 00052023 */ negu $a0, $a1 /* 0B10E4 800B04E4 44823000 */ mtc1 $v0, $f6 -/* 0B10E8 800B04E8 3C01800F */ lui $at, %hi(D_800E8BC4) # $at, 0x800f +/* 0B10E8 800B04E8 3C01800F */ lui $at, %hi(D_800E8BC0 + 4) # $at, 0x800f /* 0B10EC 800B04EC 468034A0 */ cvt.s.w $f18, $f6 /* 0B10F0 800B04F0 C42B8BC0 */ lwc1 $f11, %lo(D_800E8BC0)($at) -/* 0B10F4 800B04F4 C42A8BC4 */ lwc1 $f10, %lo(D_800E8BC4)($at) +/* 0B10F4 800B04F4 C42A8BC4 */ lwc1 $f10, %lo(D_800E8BC0 + 4)($at) /* 0B10F8 800B04F8 46009221 */ cvt.d.s $f8, $f18 /* 0B10FC 800B04FC 462A4402 */ mul.d $f16, $f8, $f10 /* 0B1100 800B0500 C7A40038 */ lwc1 $f4, 0x38($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1130.s b/asm/non_matchings/unknown_0AEE70/func_800B1130.s index 59eb5756..8ec0b69c 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1130.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1130.s @@ -91,10 +91,10 @@ glabel func_800B1130 /* 0B1E5C 800B125C 0C01BE53 */ jal func_8006F94C /* 0B1E60 800B1260 00052023 */ negu $a0, $a1 /* 0B1E64 800B1264 44829000 */ mtc1 $v0, $f18 -/* 0B1E68 800B1268 3C01800F */ lui $at, %hi(D_800E8BCC) # $at, 0x800f +/* 0B1E68 800B1268 3C01800F */ lui $at, %hi(D_800E8BC8 + 4) # $at, 0x800f /* 0B1E6C 800B126C 46809120 */ cvt.s.w $f4, $f18 /* 0B1E70 800B1270 C4298BC8 */ lwc1 $f9, %lo(D_800E8BC8)($at) -/* 0B1E74 800B1274 C4288BCC */ lwc1 $f8, %lo(D_800E8BCC)($at) +/* 0B1E74 800B1274 C4288BCC */ lwc1 $f8, %lo(D_800E8BC8 + 4)($at) /* 0B1E78 800B1278 460021A1 */ cvt.d.s $f6, $f4 /* 0B1E7C 800B127C 46283282 */ mul.d $f10, $f6, $f8 /* 0B1E80 800B1280 C7B00024 */ lwc1 $f16, 0x24($sp) @@ -121,10 +121,10 @@ glabel func_800B1130 /* 0B1ED0 800B12D0 0C01BE53 */ jal func_8006F94C /* 0B1ED4 800B12D4 00052023 */ negu $a0, $a1 /* 0B1ED8 800B12D8 44829000 */ mtc1 $v0, $f18 -/* 0B1EDC 800B12DC 3C01800F */ lui $at, %hi(D_800E8BD4) # $at, 0x800f +/* 0B1EDC 800B12DC 3C01800F */ lui $at, %hi(D_800E8BD0 + 4) # $at, 0x800f /* 0B1EE0 800B12E0 468092A0 */ cvt.s.w $f10, $f18 /* 0B1EE4 800B12E4 C4278BD0 */ lwc1 $f7, %lo(D_800E8BD0)($at) -/* 0B1EE8 800B12E8 C4268BD4 */ lwc1 $f6, %lo(D_800E8BD4)($at) +/* 0B1EE8 800B12E8 C4268BD4 */ lwc1 $f6, %lo(D_800E8BD0 + 4)($at) /* 0B1EEC 800B12EC 46005121 */ cvt.d.s $f4, $f10 /* 0B1EF0 800B12F0 46262202 */ mul.d $f8, $f4, $f6 /* 0B1EF4 800B12F4 C7B00024 */ lwc1 $f16, 0x24($sp) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s index e054b24f..74dac3d5 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s @@ -82,10 +82,10 @@ glabel func_800CB2D4 /* 0CBFF4 800CB3F4 448B8000 */ mtc1 $t3, $f16 /* 0CBFF8 800CB3F8 C7AA0004 */ lwc1 $f10, 4($sp) /* 0CBFFC 800CB3FC 468084A0 */ cvt.s.w $f18, $f16 -/* 0CC000 800CB400 3C01800F */ lui $at, %hi(D_800E95FC) # $at, 0x800f +/* 0CC000 800CB400 3C01800F */ lui $at, %hi(D_800E95F8 + 4) # $at, 0x800f /* 0CC004 800CB404 C42595F8 */ lwc1 $f5, %lo(D_800E95F8)($at) /* 0CC008 800CB408 460091A1 */ cvt.d.s $f6, $f18 -/* 0CC00C 800CB40C C42495FC */ lwc1 $f4, %lo(D_800E95FC)($at) +/* 0CC00C 800CB40C C42495FC */ lwc1 $f4, %lo(D_800E95F8 + 4)($at) /* 0CC010 800CB410 46265201 */ sub.d $f8, $f10, $f6 /* 0CC014 800CB414 8FB80024 */ lw $t8, 0x24($sp) /* 0CC018 800CB418 46244402 */ mul.d $f16, $f8, $f4 diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 87fffbdb..fbc5a998 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -49,7 +49,7 @@ const char D_800E49BC[] = "Invalid midi sequence index\n"; /************ .bss ************/ -extern u8 D_800EBF60; +u8 D_800EBF60; extern ALHeap gALHeap; /* Unknown size */ diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 9f430bc2..3aab02a8 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -47,7 +47,8 @@ const char D_800E7700[] = "WARNING : No Eprom\n"; const char D_800E7714[] = "WARNING : No Eprom\n"; const char D_800E7728[] = "WARNING : No Eprom\n"; -const char D_800E773C[] = "DKRACING-GHOSTS\0"; +const char D_800E773C[] = "DKRACING-GHOSTS"; // Used in func_80074B34 +const u8 D_800E774C[4] = { 0, 0, 0, 0 }; // Used in func_80074B34, but I'm confused to what this is for. const char D_800E7750[] = "warning: corrupt ghost\n"; /*********************************/ diff --git a/src/unknown_0B7A50.c b/src/unknown_0B7A50.c index 4b0f9649..deab665b 100644 --- a/src/unknown_0B7A50.c +++ b/src/unknown_0B7A50.c @@ -9,9 +9,12 @@ const char D_800E8E70[] = "\nAssertion failed: '%s' in file %s, line %d\n"; const char D_800E8EA0[] = "\nAssertion failed: '%s' in file %s, line %d\n"; const char D_800E8ED0[] = ">fault< "; -const char D_800E8EDC[] = "CORE\0\0\0\0"; -const char D_800E8EE8[] = "CORE\0\0\0\0"; -const char D_800E8EF4[] = "CORE\0\0\0\0"; +const char D_800E8EDC[] = "CORE"; +const u8 D_800E8EE4[4] = { 0, 0, 0, 0 }; +const char D_800E8EE8[] = "CORE"; +const u8 D_800E8EF0[4] = { 0, 0, 0, 0 }; +const char D_800E8EF4[] = "CORE"; +const u8 D_800E8EFC[4] = { 0, 0, 0, 0 }; /*********************************/ diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 9e32a4c0..8f3a4c70 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -51,6 +51,7 @@ class GenerateLD: self.gen_data_section() self.gen_rodata_section() self.gen_ucode_data_section() + self.gen_bss_section() self.gen_assets_section() self.gen_discard() self.gen_close_block() @@ -115,6 +116,17 @@ class GenerateLD: self.gen_line('romPos += SIZEOF(.rodata);') self.gen_newline() + def gen_bss_section(self): + self.gen_line('.bss.noload (NOLOAD):') + self.gen_open_block() + for file in self.files: + if file[0] not in LATE_DATA_FILES: + self.gen_line(file[0] + '(.bss);') + for file in LATE_DATA_FILES: + self.gen_line(file + '(.bss);') + self.gen_close_block() + self.gen_newline() + def gen_ucode_data_section(self): self.gen_line('.ucodeData . : AT(romPos)') self.gen_open_block() diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py index 7ca2234d..cae892c0 100644 --- a/tools/python/undefined_sym_fix.py +++ b/tools/python/undefined_sym_fix.py @@ -32,24 +32,27 @@ def check_is_double(symbol, address): outLines = command.stdout.decode("utf-8").split('\n') for outLine in outLines: if 'lwc1' in outLine: - newSym = hex(address - 4)[2:].upper() + '+4' + newSym = 'D_' + hex(address - 4)[2:].upper() + ' + 4' subprocess.run(['./rename_sym.sh', symbol, newSym]) return True return False def fixDoubleLoads(): syms = load_syms() - for i in range(0, len(syms)): + target = len(syms) + i = 0 + while i < target: sym = syms[i] - if not sym.startswith('D_'): - continue - symSplit = sym.split(' = ') - symbol = symSplit[0] - address = int(symSplit[1][2:-1], 16) - if address >= 0x800E4BFC and address < 0x800E9BA0 and (address & 4 == 4): - if check_is_double(symbol, address): - syms.pop(i) - i -= 1 + if sym.startswith('D_'): + symSplit = sym.split(' = ') + symbol = symSplit[0] + address = int(symSplit[1][2:-1], 16) + if address >= 0x800E4BFC and address < 0x800E9BA0 and ((address & 4) != 0): + if check_is_double(symbol, address): + syms.pop(i) + target -= 1 + continue + i += 1 save_syms(syms) #fixBadLabel() diff --git a/undefined_syms.txt b/undefined_syms.txt index 59ca3a06..6d5c0064 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,319 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_800E4BFC = 0x800E4BFC; -D_800E4C0C = 0x800E4C0C; -D_800E4C14 = 0x800E4C14; -D_800E4C1C = 0x800E4C1C; -D_800E4C24 = 0x800E4C24; -D_800E4C2C = 0x800E4C2C; -D_800E4C34 = 0x800E4C34; -D_800E4C44 = 0x800E4C44; -D_800E4C4C = 0x800E4C4C; -D_800E4C54 = 0x800E4C54; -D_800E4C5C = 0x800E4C5C; -D_800E4C64 = 0x800E4C64; -D_800E4C6C = 0x800E4C6C; -D_800E4C84 = 0x800E4C84; -D_800E4C8C = 0x800E4C8C; -D_800E4C94 = 0x800E4C94; -D_800E4CA4 = 0x800E4CA4; -D_800E4CAC = 0x800E4CAC; -D_800E4CBC = 0x800E4CBC; -D_800E4CCC = 0x800E4CCC; -D_800E4CDC = 0x800E4CDC; -D_800E4CEC = 0x800E4CEC; -D_800E4CFC = 0x800E4CFC; -D_800E4F1C = 0x800E4F1C; -D_800E4F24 = 0x800E4F24; -D_800E553C = 0x800E553C; -D_800E5544 = 0x800E5544; -D_800E554C = 0x800E554C; -D_800E557C = 0x800E557C; -D_800E55BC = 0x800E55BC; -D_800E55C4 = 0x800E55C4; -D_800E55CC = 0x800E55CC; -D_800E55D4 = 0x800E55D4; -D_800E55DC = 0x800E55DC; -D_800E55E4 = 0x800E55E4; -D_800E55EC = 0x800E55EC; -D_800E55F4 = 0x800E55F4; -D_800E55FC = 0x800E55FC; -D_800E5604 = 0x800E5604; -D_800E560C = 0x800E560C; -D_800E5614 = 0x800E5614; -D_800E561C = 0x800E561C; -D_800E5624 = 0x800E5624; -D_800E562C = 0x800E562C; -D_800E5634 = 0x800E5634; -D_800E564C = 0x800E564C; -D_800E565C = 0x800E565C; -D_800E566C = 0x800E566C; -D_800E5674 = 0x800E5674; -D_800E5684 = 0x800E5684; -D_800E5E64 = 0x800E5E64; -D_800E5E6C = 0x800E5E6C; -D_800E5E74 = 0x800E5E74; -D_800E5E7C = 0x800E5E7C; -D_800E5E84 = 0x800E5E84; -D_800E5E8C = 0x800E5E8C; -D_800E5E94 = 0x800E5E94; -D_800E5E9C = 0x800E5E9C; -D_800E5EA4 = 0x800E5EA4; -D_800E5EAC = 0x800E5EAC; -D_800E5EB4 = 0x800E5EB4; -D_800E5EBC = 0x800E5EBC; -D_800E5F44 = 0x800E5F44; -D_800E5FE4 = 0x800E5FE4; -D_800E5FEC = 0x800E5FEC; -D_800E5FF4 = 0x800E5FF4; -D_800E5FFC = 0x800E5FFC; -D_800E6014 = 0x800E6014; -D_800E601C = 0x800E601C; -D_800E6024 = 0x800E6024; -D_800E602C = 0x800E602C; -D_800E6034 = 0x800E6034; -D_800E603C = 0x800E603C; -D_800E6044 = 0x800E6044; -D_800E6054 = 0x800E6054; -D_800E605C = 0x800E605C; -D_800E6064 = 0x800E6064; -D_800E606C = 0x800E606C; -D_800E6144 = 0x800E6144; -D_800E6154 = 0x800E6154; -D_800E615C = 0x800E615C; -D_800E6164 = 0x800E6164; -D_800E616C = 0x800E616C; -D_800E6174 = 0x800E6174; -D_800E617C = 0x800E617C; -D_800E618C = 0x800E618C; -D_800E6194 = 0x800E6194; -D_800E619C = 0x800E619C; -D_800E61AC = 0x800E61AC; -D_800E61BC = 0x800E61BC; -D_800E61F4 = 0x800E61F4; -D_800E61FC = 0x800E61FC; -D_800E6204 = 0x800E6204; -D_800E6254 = 0x800E6254; -D_800E62AC = 0x800E62AC; -D_800E62B4 = 0x800E62B4; -D_800E62BC = 0x800E62BC; -D_800E62C4 = 0x800E62C4; -D_800E62CC = 0x800E62CC; -D_800E62D4 = 0x800E62D4; -D_800E62DC = 0x800E62DC; -D_800E62E4 = 0x800E62E4; -D_800E62EC = 0x800E62EC; -D_800E62F4 = 0x800E62F4; -D_800E62FC = 0x800E62FC; -D_800E6304 = 0x800E6304; -D_800E630C = 0x800E630C; -D_800E6314 = 0x800E6314; -D_800E6354 = 0x800E6354; -D_800E63A4 = 0x800E63A4; -D_800E63AC = 0x800E63AC; -D_800E63B4 = 0x800E63B4; -D_800E63BC = 0x800E63BC; -D_800E63C4 = 0x800E63C4; -D_800E63CC = 0x800E63CC; -D_800E63D4 = 0x800E63D4; -D_800E63E4 = 0x800E63E4; -D_800E63EC = 0x800E63EC; -D_800E63FC = 0x800E63FC; -D_800E6404 = 0x800E6404; -D_800E640C = 0x800E640C; -D_800E6414 = 0x800E6414; -D_800E641C = 0x800E641C; -D_800E6424 = 0x800E6424; -D_800E642C = 0x800E642C; -D_800E6434 = 0x800E6434; -D_800E643C = 0x800E643C; -D_800E6444 = 0x800E6444; -D_800E644C = 0x800E644C; -D_800E645C = 0x800E645C; -D_800E6464 = 0x800E6464; -D_800E648C = 0x800E648C; -D_800E6494 = 0x800E6494; -D_800E649C = 0x800E649C; -D_800E64A4 = 0x800E64A4; -D_800E64AC = 0x800E64AC; -D_800E64B4 = 0x800E64B4; -D_800E64BC = 0x800E64BC; -D_800E64C4 = 0x800E64C4; -D_800E64CC = 0x800E64CC; -D_800E64D4 = 0x800E64D4; -D_800E64E4 = 0x800E64E4; -D_800E64FC = 0x800E64FC; -D_800E6504 = 0x800E6504; -D_800E6514 = 0x800E6514; -D_800E651C = 0x800E651C; -D_800E6524 = 0x800E6524; -D_800E6534 = 0x800E6534; -D_800E653C = 0x800E653C; -D_800E6544 = 0x800E6544; -D_800E654C = 0x800E654C; -D_800E6554 = 0x800E6554; -D_800E655C = 0x800E655C; -D_800E6564 = 0x800E6564; -D_800E6574 = 0x800E6574; -D_800E657C = 0x800E657C; -D_800E6594 = 0x800E6594; -D_800E659C = 0x800E659C; -D_800E65FC = 0x800E65FC; -D_800E6604 = 0x800E6604; -D_800E660C = 0x800E660C; -D_800E6614 = 0x800E6614; -D_800E661C = 0x800E661C; -D_800E6624 = 0x800E6624; -D_800E662C = 0x800E662C; -D_800E6634 = 0x800E6634; -D_800E663C = 0x800E663C; -D_800E6644 = 0x800E6644; -D_800E664C = 0x800E664C; -D_800E6654 = 0x800E6654; -D_800E665C = 0x800E665C; -D_800E666C = 0x800E666C; -D_800E6674 = 0x800E6674; -D_800E667C = 0x800E667C; -D_800E6684 = 0x800E6684; -D_800E668C = 0x800E668C; -D_800E6694 = 0x800E6694; -D_800E669C = 0x800E669C; -D_800E66A4 = 0x800E66A4; -D_800E66AC = 0x800E66AC; -D_800E66B4 = 0x800E66B4; -D_800E66BC = 0x800E66BC; -D_800E66CC = 0x800E66CC; -D_800E66F4 = 0x800E66F4; -D_800E66FC = 0x800E66FC; -D_800E6704 = 0x800E6704; -D_800E670C = 0x800E670C; -D_800E6714 = 0x800E6714; -D_800E671C = 0x800E671C; -D_800E672C = 0x800E672C; -D_800E6734 = 0x800E6734; -D_800E673C = 0x800E673C; -D_800E6744 = 0x800E6744; -D_800E674C = 0x800E674C; -D_800E6754 = 0x800E6754; -D_800E6764 = 0x800E6764; -D_800E678C = 0x800E678C; -D_800E6794 = 0x800E6794; -D_800E679C = 0x800E679C; -D_800E67C4 = 0x800E67C4; -D_800E67CC = 0x800E67CC; -D_800E67D4 = 0x800E67D4; -D_800E67DC = 0x800E67DC; -D_800E67E4 = 0x800E67E4; -D_800E67EC = 0x800E67EC; -D_800E67F4 = 0x800E67F4; -D_800E67FC = 0x800E67FC; -D_800E680C = 0x800E680C; -D_800E6814 = 0x800E6814; -D_800E681C = 0x800E681C; -D_800E6824 = 0x800E6824; -D_800E682C = 0x800E682C; -D_800E6834 = 0x800E6834; -D_800E683C = 0x800E683C; -D_800E6844 = 0x800E6844; -D_800E684C = 0x800E684C; -D_800E68F4 = 0x800E68F4; -D_800E68FC = 0x800E68FC; -D_800E6904 = 0x800E6904; -D_800E690C = 0x800E690C; -D_800E6914 = 0x800E6914; -D_800E691C = 0x800E691C; -D_800E6924 = 0x800E6924; -D_800E692C = 0x800E692C; -D_800E6934 = 0x800E6934; -D_800E693C = 0x800E693C; -D_800E6944 = 0x800E6944; -D_800E6954 = 0x800E6954; -D_800E6964 = 0x800E6964; -D_800E69A4 = 0x800E69A4; -D_800E69BC = 0x800E69BC; -D_800E69C4 = 0x800E69C4; -D_800E69CC = 0x800E69CC; -D_800E69D4 = 0x800E69D4; -D_800E69DC = 0x800E69DC; -D_800E69E4 = 0x800E69E4; -D_800E69F4 = 0x800E69F4; -D_800E69FC = 0x800E69FC; -D_800E6A14 = 0x800E6A14; -D_800E6A1C = 0x800E6A1C; -D_800E6A24 = 0x800E6A24; -D_800E6A2C = 0x800E6A2C; -D_800E6A34 = 0x800E6A34; -D_800E6A3C = 0x800E6A3C; -D_800E6A44 = 0x800E6A44; -D_800E6A4C = 0x800E6A4C; -D_800E6A54 = 0x800E6A54; -D_800E6A5C = 0x800E6A5C; -D_800E6A64 = 0x800E6A64; -D_800E6A6C = 0x800E6A6C; -D_800E6A8C = 0x800E6A8C; -D_800E6A94 = 0x800E6A94; -D_800E6A9C = 0x800E6A9C; -D_800E6AA4 = 0x800E6AA4; -D_800E6AAC = 0x800E6AAC; -D_800E6AB4 = 0x800E6AB4; -D_800E6ABC = 0x800E6ABC; -D_800E6AC4 = 0x800E6AC4; -D_800E6ACC = 0x800E6ACC; -D_800E6AEC = 0x800E6AEC; -D_800E6AF4 = 0x800E6AF4; -D_800E6B04 = 0x800E6B04; -D_800E6B0C = 0x800E6B0C; -D_800E6B14 = 0x800E6B14; -D_800E6EC4 = 0x800E6EC4; -D_800E774C = 0x800E774C; -D_800E7778 = 0x800E7778; -D_800E778C = 0x800E778C; -D_800E77A0 = 0x800E77A0; -D_800E77B4 = 0x800E77B4; -D_800E77C8 = 0x800E77C8; -D_800E77DC = 0x800E77DC; -D_800E77E4 = 0x800E77E4; -D_800E77EC = 0x800E77EC; -D_800E77F4 = 0x800E77F4; -D_800E839C = 0x800E839C; -D_800E83A4 = 0x800E83A4; -D_800E83AC = 0x800E83AC; -D_800E84D4 = 0x800E84D4; -D_800E84E4 = 0x800E84E4; -D_800E84EC = 0x800E84EC; -D_800E86AC = 0x800E86AC; -D_800E86EC = 0x800E86EC; -D_800E86F4 = 0x800E86F4; -D_800E8724 = 0x800E8724; -D_800E872C = 0x800E872C; -D_800E8734 = 0x800E8734; -D_800E873C = 0x800E873C; -D_800E875C = 0x800E875C; -D_800E8764 = 0x800E8764; -D_800E8784 = 0x800E8784; -D_800E878C = 0x800E878C; -D_800E8794 = 0x800E8794; -D_800E879C = 0x800E879C; -D_800E87A4 = 0x800E87A4; -D_800E87BC = 0x800E87BC; -D_800E87C4 = 0x800E87C4; -D_800E87CC = 0x800E87CC; -D_800E87E4 = 0x800E87E4; -D_800E8B9C = 0x800E8B9C; -D_800E8BA4 = 0x800E8BA4; -D_800E8BAC = 0x800E8BAC; -D_800E8BB4 = 0x800E8BB4; -D_800E8BBC = 0x800E8BBC; -D_800E8BC4 = 0x800E8BC4; -D_800E8BCC = 0x800E8BCC; -D_800E8BD4 = 0x800E8BD4; -D_800E8EE4 = 0x800E8EE4; -D_800E8EF0 = 0x800E8EF0; -D_800E8EFC = 0x800E8EFC; -D_800E95FC = 0x800E95FC; - -D_800EBF60 = 0x800EBF60; gALHeap = 0x80115CE8; ALSeqFile_80115CF8 = 0x80115CF8; D_80115CFC = 0x80115CFC; From 2b19923238ad0516ca66fb4446a7d55d3d358bf7 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 15:44:39 -0500 Subject: [PATCH 26/39] Added bss for unknown_001050, unknown_003260, and unknown_005740 --- asm/entrypoint.s | 12 +- .../unknown_003260/audioNewThread.s | 8 +- bss.txt | 1165 +++++++++++++++++ src/unknown_001050.c | 74 +- src/unknown_003260.c | 52 +- src/unknown_005740.c | 22 + tools/python/generate_ld.py | 20 +- tools/python/undefined_sym_fix.py | 54 +- undefined_syms.txt | 145 +- 9 files changed, 1411 insertions(+), 141 deletions(-) create mode 100644 bss.txt diff --git a/asm/entrypoint.s b/asm/entrypoint.s index 1adf1b38..0e10d93f 100644 --- a/asm/entrypoint.s +++ b/asm/entrypoint.s @@ -8,11 +8,15 @@ .set noreorder # dont insert nops after branches .set gp=64 # 64-bit instructions are used +.section .text + +# .word __BSS_SECTION_SIZE # Should equal 0x41490 + glabel entrypoint -/* 001000 80000400 3C08800F */ lui $t0, %hi(D_800EBF60) # $t0, 0x800f -/* 001004 80000404 3C090004 */ lui $t1, (0x00041490 >> 16) # lui $t1, 4 -/* 001008 80000408 2508BF60 */ addiu $t0, %lo(D_800EBF60) # addiu $t0, $t0, -0x40a0 -/* 00100C 8000040C 35291490 */ ori $t1, (0x00041490 & 0xFFFF) # ori $t1, $t1, 0x1490 +/* 001000 80000400 3C08800F */ lui $t0, %hi(gBssSectionStart) # $t0, 0x800f +/* 001004 80000404 3C090004 */ lui $t1, (0x41490 >> 16) # lui $t1, 4 +/* 001008 80000408 2508BF60 */ addiu $t0, %lo(gBssSectionStart) # addiu $t0, $t0, -0x40a0 +/* 00100C 8000040C 35291490 */ ori $t1, (0x41490 & 0xFFFF) # ori $t1, $t1, 0x1490 .L80000410: /* 001010 80000410 2129FFF8 */ addi $t1, $t1, -8 /* 001014 80000414 AD000000 */ sw $zero, ($t0) diff --git a/asm/non_matchings/unknown_003260/audioNewThread.s b/asm/non_matchings/unknown_003260/audioNewThread.s index f9c51000..1713d444 100644 --- a/asm/non_matchings/unknown_003260/audioNewThread.s +++ b/asm/non_matchings/unknown_003260/audioNewThread.s @@ -109,10 +109,10 @@ glabel audioNewThread /* 0033F8 800027F8 3C028012 */ lui $v0, %hi(D_80119240) # $v0, 0x8012 /* 0033FC 800027FC 24429240 */ addiu $v0, %lo(D_80119240) # addiu $v0, $v0, -0x6dc0 /* 003400 80002800 3C128012 */ lui $s2, %hi(D_80119240) # $s2, 0x8012 -/* 003404 80002804 3C108012 */ lui $s0, %hi(D_80119254) # $s0, 0x8012 +/* 003404 80002804 3C108012 */ lui $s0, %hi(D_80119240+20) # $s0, 0x8012 /* 003408 80002808 AC400004 */ sw $zero, 4($v0) /* 00340C 8000280C AC400000 */ sw $zero, ($v0) -/* 003410 80002810 26109254 */ addiu $s0, %lo(D_80119254) # addiu $s0, $s0, -0x6dac +/* 003410 80002810 26109254 */ addiu $s0, %lo(D_80119240+20) # addiu $s0, $s0, -0x6dac /* 003414 80002814 26529240 */ addiu $s2, %lo(D_80119240) # addiu $s2, $s2, -0x6dc0 /* 003418 80002818 00008825 */ move $s1, $zero .L8000281C: @@ -203,9 +203,9 @@ glabel audioNewThread /* 00355C 8000295C 0C01C3BE */ jal func_80070EF8 /* 003560 80002960 00801025 */ move $v0, $a0 /* 003564 80002964 3C108011 */ lui $s0, %hi(D_80115F98) # $s0, 0x8011 -/* 003568 80002968 3C118011 */ lui $s1, %hi(D_80115FA4) # $s1, 0x8011 +/* 003568 80002968 3C118011 */ lui $s1, %hi(D_80115FA0+4) # $s1, 0x8011 /* 00356C 8000296C 00401825 */ move $v1, $v0 -/* 003570 80002970 26315FA4 */ addiu $s1, %lo(D_80115FA4) # addiu $s1, $s1, 0x5fa4 +/* 003570 80002970 26315FA4 */ addiu $s1, %lo(D_80115FA0+4) # addiu $s1, $s1, 0x5fa4 /* 003574 80002974 26105F98 */ addiu $s0, %lo(D_80115F98) # addiu $s0, $s0, 0x5f98 .L80002978: /* 003578 80002978 8E660014 */ lw $a2, 0x14($s3) diff --git a/bss.txt b/bss.txt new file mode 100644 index 00000000..3d486755 --- /dev/null +++ b/bss.txt @@ -0,0 +1,1165 @@ +unknown_001050 + + +unknown_003260 + + +unknown_005740 + + +unknown_00BC20 +D_8011AD20; +D_8011AD21; +D_8011AD22; +D_8011AD24; +D_8011AD25; +D_8011AD26; +D_8011AD28; +D_8011AD30; +D_8011AD34; +D_8011AD38; +D_8011AD3C; +D_8011AD3D; +D_8011AD3E; +D_8011AD40; +D_8011AD44; +D_8011AD45; +D_8011AD46; +D_8011AD48; +D_8011AD4A; +D_8011AD4C; +D_8011AD4E; +D_8011AD50; +D_8011AD51; +D_8011AD52; +D_8011AD53; +D_8011AD58; +D_8011AD5C; +D_8011AD60; +D_8011AD64; +D_8011AD68; +D_8011AD6C; +D_8011AD70; +D_8011AD78; +D_8011ADA0; +D_8011ADA4; +D_8011ADA8; +D_8011ADAC; +D_8011ADB0; +D_8011ADB4; +D_8011ADB8; +D_8011ADBC; +D_8011ADC0; +D_8011ADC4; +D_8011ADC5; +D_8011ADC8; +D_8011ADCC; +D_8011ADD0; +D_8011ADD4; +D_8011ADD5; +D_8011ADD8; +D_8011AE00; +D_8011AE01; +D_8011AE02; +D_8011AE03; +D_8011AE08; +D_8011AE48; +D_8011AE4C; +D_8011AE50; +D_8011AE54; +objPtrList; +objCount; +D_8011AE60; +D_8011AE64; +D_8011AE68; +D_8011AE6C; +D_8011AE70; +D_8011AE74; +D_8011AE78; +D_8011AE7A; +D_8011AE7C; +D_8011AE7E; +D_8011AE80; +D_8011AE82; +D_8011AE84; +D_8011AE88; +D_8011AE8C; +D_8011AE90; +D_8011AE94; +D_8011AE98; +D_8011AEA0; +D_8011AEA4; +D_8011AEA8; +D_8011AEB0; +D_8011AEB8; +D_8011AEBC; +D_8011AEC0; +particlePtrList; +particleCount; +D_8011AECC; +D_8011AED0; +D_8011AED4; +D_8011AED8; +D_8011AEDC; +D_8011AEE0; +playerStructArray_Ptr; +D_8011AEE8; +D_8011AEEC; +playerCount; +D_8011AEF4; +D_8011AEF5; +D_8011AEF6; +D_8011AEF7; +D_8011AEF8; +D_8011AEFC; +D_8011AF00; +D_8011AF04; +D_8011AF08; +D_8011AF10; +D_8011AF18; +D_8011AF2C; +D_8011AF30; +D_8011AF60; +D_8011AF68; +D_8011AFE8; +D_8011AFEE; +D_8011AFF4; +D_8011AFF8; +D_8011AFFC; +D_8011B000; +D_8011B004; +D_8011B008; +D_8011B010; +D_8011B020; +D_8011B048; +D_8011B058; +D_8011B068; +D_8011B078; +D_8011B07B; + + +unknown_0255E0 +D_8011B0A0; +D_8011B0A4; +D_8011B0A8; +D_8011B0AC; +D_8011B0B0; +D_8011B0B4; +D_8011B0B8; +D_8011B0BC; +D_8011B0C0; +D_8011B0C4; +D_8011B0C8; +D_8011B0CC; +D_8011B0D0; +D_8011B0D4; +D_8011B0DC; +D_8011B0E0; +D_8011B0E1; +D_8011B0E2; +D_8011B0E3; +D_8011B0E4; +D_8011B0E8; +D_8011B0EC; +D_8011B0F0; +D_8011B0F4; +D_8011B0F8; +D_8011B0FC; +D_8011B100; +D_8011B104; +D_8011B108; +D_8011B10C; +D_8011B110; +D_8011B114; +D_8011B118; +D_8011B120; +D_8011B320; +D_8011B330; +D_8011C230; +D_8011C238; +D_8011C3B8; +D_8011C8B8; +D_8011D0B8; +D_8011D0BC; +D_8011D0C0; +D_8011D0C4; +D_8011D0C8; +D_8011D0CC; +D_8011D0CE; +D_8011D0D0; +D_8011D0D4; +D_8011D0D8; +D_8011D0DC; +D_8011D0E0; +D_8011D0E4; +D_8011D0E8; +D_8011D0EC; +D_8011D0F0; +D_8011D0F4; +D_8011D0F8; +D_8011D128; +D_8011D164; +D_8011D2B8; +D_8011D308; +D_8011D30C; +D_8011D310; +D_8011D314; +D_8011D318; +D_8011D31C; +D_8011D320; +D_8011D330; +D_8011D338; +D_8011D348; +D_8011D350; +D_8011D360; +D_8011D364; +D_8011D368; +D_8011D36C; +D_8011D370; +D_8011D374; +D_8011D378; +D_8011D37C; +D_8011D380; +D_8011D384; +D_8011D388; +D_8011D468; +D_8011D474; +D_8011D478; +D_8011D47C; +D_8011D480; +D_8011D488; +D_8011D490; +D_8011D498; +D_8011D49C; +D_8011D49E; +D_8011D4A0; +D_8011D4A4; +D_8011D4A8; +D_8011D4AC; +D_8011D4B0; +D_8011D4B4; +D_8011D4B6; +D_8011D4B8; +D_8011D4BA; +D_8011D4BC; + + +unknown_032760 +D_8011D4C0; +D_8011D4C4; +D_8011D4C8; +D_8011D4CC; +D_8011D4D0; + + +unknown_0348C0 +D_8011D4D4; +D_8011D4D8; +D_8011D4DC; +D_8011D4E0; +D_8011D4E2; + + +unknown_043920 +D_8011D4F0; +D_8011D4F8; +D_8011D504; +D_8011D508; +D_8011D510; +D_8011D528; +D_8011D52C; +D_8011D530; +D_8011D534; +D_8011D538; +D_8011D53C; +D_8011D540; +D_8011D544; +D_8011D548; +D_8011D54C; +D_8011D550; +D_8011D552; +D_8011D553; +D_8011D554; +D_8011D558; +D_8011D55C; +D_8011D560; +D_8011D564; +D_8011D568; +D_8011D56C; +D_8011D570; +D_8011D574; +D_8011D578; +D_8011D57C; +D_8011D580; +D_8011D581; +D_8011D582; +D_8011D583; +D_8011D584; +D_8011D585; +D_8011D586; +D_8011D588; +D_8011D589; +D_8011D58A; +D_8011D58B; +D_8011D58C; +D_8011D58D; +D_8011D58E; +D_8011D58F; +D_8011D590; +D_8011D598; +D_8011D59C; +D_8011D59D; +D_8011D59E; +D_8011D5A0; +D_8011D5A4; +D_8011D5A8; +D_8011D5AC; +D_8011D5AE; +D_8011D5B0; +D_8011D5B4; +D_8011D5B8; +D_8011D5BA; +D_8011D5BB; +D_8011D5BC; + + +unknown_05CEF0 +D_8011D5C0; +D_8011D5C4; +D_8011D5C8; +D_8011D5CC; + + +unknown_05DCD0 +D_8011D5D0; +D_8011D5D1; +D_8011D5E0; +D_8011D5E1; + + +unknown_05F0C0 +D_8011D5F0; +D_8011D5F1; + + +unknown_05F690 +D_8011D600; +D_8011D601; +D_8011D610; +D_8011D611; +D_8011D620; +D_8011D624; +D_8011D628; +D_8011D62C; +D_8011D630; +D_8011D634; +D_8011D638; +D_8011D63C; +D_8011D640; +D_8011D644; + + +unknown_0667D0 +D_8011D750; +D_8011D758; +D_8011F758; +D_8011F760; +D_8011F910; +D_8011FFF0; +D_80120001; + + +unknown_080500 +D_80120004; + + +unknown_00BC20 +D_80120010; + + +unknown_09F8F0 +D_8012004B; +D_80120AC0; + + +unknown_066AA0 +D_80120AC4; +D_80120AF4; +D_80120BD0; +D_80120BD4; +D_80120CE0; +D_80120CE4; +D_80120CE8; +D_80120CF0; +D_80120D08; +D_80120D0C; +D_80120D10; +D_80120D14; +D_80120D15; +D_80120D18; +D_80120D1C; +D_80120D20; +D_80120D28; +D_80120D40; +D_80120D58; +D_80120D6C; +D_80120D70; +D_80120D74; +D_80120D88; +D_80120DA0; +D_80120EE0; +D_80120F20; +D_80120F60; +D_80120FA0; +D_80120FE0; +D_80121020; +D_80121060; +D_801210A0; +D_801210E0; +D_801210F8; +D_801210FC; +D_80121100; +D_80121103; +D_80121110; +D_80121128; +D_80121140; +D_80121148; +D_80121150; +D_80121151; +D_80121152; +D_80121153; +D_80121160; +D_80121164; +D_80121168; +D_8012116C; +D_80121170; +D_80121174; +D_80121178; +D_8012117C; +D_80121180; +D_801211C0; + + +unknown_06B2B0 +D_801211C8; +D_801211F0; +D_801211F8; +D_80121200; +D_80121204; +D_80121208; +D_80121210; +D_80121214; +D_80121218; +D_80121220; +D_80121224; +D_80121228; +D_80121250; +D_80121260; +D_801234E8; +D_801234EC; +D_801234F0; +D_801234F4; +D_801234F8; +D_801234FC; +D_80123500; +D_80123504; +D_80123508; +D_8012350C; +gSettingsPtr; +D_80123514; +gIsPaused; +D_80123516; +D_80123518; +D_8012351C; +D_80123520; +D_80123524; +D_80123525; +D_80123526; +D_80123528; +D_8012352C; +D_80123530; +D_80123534; +D_80123538; +D_80123544; +D_80123548; +D_80123560; + + +unknown_071730 +D_80123580; +D_80123588; +D_801235C0; +D_801235C8; +D_80123DC8; +D_80123DCC; +D_80123DD0; +D_80123ED0; +D_80123FD0; +D_80123FF0; + + +unknown_072E50 +D_80124010; +D_80124018; +D_801241B8; +D_801241E0; +D_801241E4; +D_801241E5; +D_801241E6; +D_801241E7; +D_801241E8; +D_801241EC; +D_801241F0; +D_801241F4; + + +unknown_0777A0 +D_80124200; +D_80124218; +D_80124220; +D_80124238; +D_80124278; +D_80124290; + + +unknown_078050 +D_801242A0; +D_801246A0; +D_80125EA0; +D_80125EB8; +D_80125EC0; +D_80125ED8; +D_80125EF0; +D_80125F10; +D_80125F30; +D_80125F31; +D_80125F32; +D_80125F33; +D_80125F34; +D_80125F35; +D_80125F36; +D_80125F37; +D_80125F38; +D_80125F3C; +D_80125F40; +D_80126020; +D_80126100; + + +unknown_079F50 +D_80126110; +D_80126114; +D_80126118; +D_8012611C; +D_80126120; +D_80126124; +D_80126170; +D_80126174; + + +unknown_07AF10 +D_80126178; +D_80126180; +D_801261A0; +D_80126260; +D_801262B0; +D_801262B8; +D_801262C0; +D_801262C8; +D_801262CC; +D_801262D0; +D_801262D4; +D_801262D8; +D_801262DC; +D_801262E0; +D_801262E4; +D_80126308; +D_80126309; +D_80126310; + + +unknown_07B870 +D_80126320; +D_80126328; +D_8012632C; +D_80126330; +D_80126338; +D_8012633C; +D_80126340; +D_80126344; +D_80126348; +D_8012634C; +D_80126350; +D_80126354; +D_80126358; +D_8012635C; +D_80126360; +D_80126364; +D_80126368; +D_8012636C; +D_80126370; +D_80126374; +D_80126378; +D_8012637C; +D_80126380; +D_80126382; +D_80126384; + + +unknown_080500 +D_80126390; +D_80126394; +D_80126398; +D_8012639C; +D_801263A0; +D_801263A4; +D_801263A8; +D_801263AC; +D_801263B0; +D_801263B4; +D_801263B8; +D_801263BC; +D_801263C0; +D_801263C4; +D_801263C8; +D_801263CC; +D_801263D0; +D_801263D4; +D_801263D5; +D_801263D6; +D_801263D7; +D_801263D8; +D_801263DC; +D_801263E0; +players_character_array; +D_801263F0; +D_801263F8; +D_80126418; +D_80126420; +D_80126428; +D_80126430; +D_80126431; +D_80126438; +D_80126448; +D_8012644C; +D_80126450; +D_80126454; +D_80126458; +D_8012645C; +D_8012645D; +D_80126460; +D_80126464; +D_80126465; +D_80126468; +D_8012646C; +D_80126470; +D_80126474; +D_80126478; +D_8012647C; +D_80126480; +D_80126484; +D_80126488; +D_8012648C; +D_80126490; +D_80126494; +D_80126498; +D_801264A0; +D_801264D0; +D_801264D4; +D_801264D8; +D_801264DC; +D_801264E2; +D_801264E4; +D_801264EC; +D_801264F8; +D_80126504; +D_80126508; +D_8012650E; +D_80126510; +D_80126516; +D_80126518; +D_80126520; +D_80126530; +D_80126534; +D_80126538; +D_8012653C; +D_80126540; +D_80126541; +D_80126548; +D_80126550; +D_8012665C; +D_80126660; +D_80126664; +D_80126750; +D_801267D0; +D_801267D8; +D_801267E4; +D_801267E8; +D_801267EC; +D_801267F0; +D_80126804; +D_80126808; +D_8012680C; +D_80126810; +D_80126814; +D_80126818; +D_80126820; +D_80126824; +D_80126828; +D_80126830; +D_80126838; +D_8012683A; +D_8012683C; +D_80126840; +D_80126844; +D_80126848; +D_8012684C; +D_80126850; +D_80126854; +D_80126858; +D_8012685C; +D_80126860; +D_80126864; +D_80126868; +D_8012686C; +D_80126870; +D_80126874; +D_80126878; +D_801268D8; +D_801268DC; +D_801268E0; +D_801268E8; +D_80126918; +D_80126924; +D_80126928; +D_8012692C; +D_80126930; +p1_vehicle; +p2_vehicle; +D_801269C4; +D_801269C8; +D_801269CC; +D_801269D0; +D_801269DC; +D_801269E0; +D_801269E4; +D_801269E8; +D_801269EC; +D_801269F0; +D_801269F4; +D_801269F8; +D_801269FC; +D_80126A00; +D_80126A04; +D_80126A08; +D_80126A0C; +D_80126A10; +D_80126A14; +D_80126A18; +D_80126A1C; +D_80126A20; +D_80126A30; +D_80126A34; +D_80126A38; +D_80126A3C; +D_80126A40; +D_80126A60; +D_80126A64; +D_80126A68; +D_80126A6C; +D_80126A70; +D_80126A74; +D_80126A78; +D_80126A80; +D_80126A90; +D_80126A94; +D_80126A98; +D_80126AA0; +D_80126AE0; +D_80126B20; +D_80126B60; +D_80126B70; +D_80126BB0; +D_80126BB4; +D_80126BB8; +D_80126BBC; +D_80126BC0; +D_80126BC4; +D_80126BC8; +D_80126BCC; +D_80126BD0; +D_80126BD4; +D_80126BD8; +D_80126BDC; +D_80126BE0; +D_80126BE4; +D_80126BE8; +D_80126BEC; +D_80126BF0; +D_80126C10; +D_80126C14; +D_80126C18; +D_80126C1C; +D_80126C20; +D_80126C24; +D_80126C28; +D_80126C2C; +D_80126C30; +D_80126C34; +D_80126C38; +D_80126C3C; +D_80126C40; +D_80126C42; +D_80126C44; +D_80126C46; +D_80126C48; +D_80126C4C; +D_80126C50; +D_80126C54; +D_80126C57; +D_80126C58; +D_80126C6C; +D_80126C70; +D_80126C74; +D_80126C78; +D_80126C80; +D_80126CC0; + + +unknown_09F8F0 +D_80126CD0; +D_80126CD1; +D_80126CD2; +D_80126CD3; +D_80126CD4; +D_80126CD5; +D_80126CD8; +D_80126CDC; +D_80126CE0; +D_80126CEC; +D_80126CF0; +D_80126CF4; +D_80126CF8; +D_80126CFC; +D_80126D00; +D_80126D04; +D_80126D08; +D_80126D0C; +D_80126D10; +D_80126D14; +D_80126D18; +D_80126D1C; +D_80126D20; +D_80126D24; +D_80126D28; +D_80126D2C; +D_80126D30; +D_80126D34; +D_80126D35; +D_80126D36; +D_80126D37; +D_80126D38; +D_80126D3C; +D_80126D40; +D_80126D44; +D_80126D48; +D_80126D4C; +D_80126D50; +D_80126D54; +D_80126D55; +D_80126D56; +D_80126D58; +D_80126D5C; +D_80126D60; +D_80126D64; +D_80126D65; +D_80126D66; +D_80126D67; +D_80126D68; +D_80126D69; +D_80126D6C; +D_80126D70; +D_80126D71; +D_80126D74; +D_80126D78; +D_80126D7C; +D_80126D80; +D_80127180; +D_80127184; +D_80127188; +D_80127189; +D_8012718A; +D_8012718B; +D_8012718C; +D_80127190; +D_80127194; + + +unknown_078050 +D_801271B0; + + +unknown_09F8F0 +D_80127BB0; +D_80127BB4; +D_80127BB8; +D_80127BF8; +D_80127C00; +D_80127C04; +D_80127C08; +D_80127C0C; +D_80127C10; +D_80127C14; +D_80127C18; +D_80127C1C; +D_80127C20; +D_80127C24; +D_80127C28; +D_80127C2C; +D_80127C30; +D_80127C40; +D_80127C80; + + +unknown_0AEE70 +D_80127C88; +D_80127CA0; +D_80127CA4; +D_80127CA8; +D_80127CAC; +D_80127CAE; +D_80127CB0; +D_80127CB2; +D_80127CB4; +D_80127CB8; +D_80127CBC; +D_80127CC0; +D_80127CC4; +D_80127CC8; +D_80127CCC; +D_80127CD0; +D_80127CD2; +D_80127CD8; +D_801285D8; +D_801295E0; +D_80129790; +D_801297A8; +D_801297C8; +D_801297E8; +D_80129800; +D_80129824; +D_8012982C; +D_80129834; +D_8012983C; +D_80129844; +D_8012984C; +D_80129854; +D_8012985C; +D_80129864; +D_8012986C; +D_80129874; +D_8012987C; +D_80129884; +D_8012988C; +D_80129894; +D_8012989C; +D_801298A4; +D_801298AC; +D_801298B4; +D_801298BC; +D_801298C4; +D_801298CC; +D_801298D4; +D_801298DC; +D_801298E4; +D_801298EC; +D_801298F4; +D_801298FC; +D_80129904; +D_80129918; +D_8012991C; +D_80129920; +D_80129924; +D_801299B0; + + +unknown_0C4800 +piThreadStack; +D_80129BB0; +D_80129FB0; +D_80129FBC; + + +unknown_0B8920 +D_80129FC0; +D_80129FC4; +D_80129FC8; +D_80129FCC; +D_80129FE8; +D_80129FF0; +D_8012A008; +D_8012A00C; +D_8012A018; +D_8012A01C; +D_8012A020; +D_8012A028; +D_8012A078; +D_8012A07C; +D_8012A080; +D_8012A084; +D_8012A088; +D_8012A08C; +D_8012A090; +D_8012A094; +D_8012A098; +D_8012A09C; +D_8012A0A0; +D_8012A0A4; +D_8012A0A8; +D_8012A0AC; +D_8012A0B0; +D_8012A0B4; +D_8012A0B8; +D_8012A0BC; +D_8012A0C0; +D_8012A0C4; +D_8012A0C8; +D_8012A0CC; +D_8012A0D0; +D_8012A0D4; +D_8012A0D8; +D_8012A0DC; +D_8012A0E0; +D_8012A0E8; +D_8012A1E8; +D_8012A5E8; +D_8012A5F4; +D_8012A600; +D_8012A720; +D_8012A724; +D_8012A728; +D_8012A730; +D_8012A734; +D_8012A735; +D_8012A736; +D_8012A737; +D_8012A738; +D_8012A73C; +D_8012A740; +D_8012A744; +D_8012A748; +D_8012A74C; +D_8012A750; +D_8012A754; +D_8012A758; +D_8012A75C; +D_8012A760; +D_8012A764; +D_8012A768; +D_8012A76C; +D_8012A770; +D_8012A774; +D_8012A778; +D_8012A77C; +D_8012A780; +D_8012A784; +D_8012A785; +D_8012A786; +D_8012A787; +D_8012A788; +D_8012A789; +D_8012A78A; +D_8012A78C; +D_8012A78E; +D_8012A790; +D_8012A798; +D_8012A7A0; +D_8012A7A4; +D_8012A7A8; +D_8012A7AA; +D_8012A7AC; +D_8012A7AE; +D_8012A7B0; +D_8012A7B2; +D_8012A7B4; +D_8012A7B6; +D_8012A7B8; +D_8012A7BA; +D_8012A7C0; +D_8012A7C8; +D_8012A7D0; +D_8012A7D4; +D_8012A7E0; +D_8012A7E4; +D_8012A7E8; +D_8012A7EC; +D_8012A7F0; +D_8012A7F4; + + +unknown_0C4800 +piThread; +piEventQueue; +piEventBuf; +gzip_bit_buffer; +gzip_num_bits; +D_8012AAD8; +D_8012AAE0; + + +unknown_0C7F50 +D_8012AAF0; +D_8012ACA0; +D_8012ACB8; + + +osViMgr +viThreadStack; +D_8012CCC0; +__osEventStateTab; + + +unknown_0CD820 +D_8012CD50; +D_8012CD8C; +D_8012CD90; +__osMaxControllers; +D_8012CDB8; +D_8012CDD0; +__osPfsPifRam; +D_8012CE1C; + + +unknown_0CE200 +D_8012CE20; +D_8012CE28; +D_8012CE40; +D_8012CE7C; + + +osViMgr +viThread; +viEventQueue; +viEventBuf; +viRetraceMsg; +viCounterMsg; +D_8012D190; + + +unknown_0D29F0 +D_8012D1A0; + + +unknown_0D3020 +D_8012D1E0; +piAccessQueue; +__osCurrentTime; +D_8012D224; +__osBaseCounter; +D_8012D22C; +D_8012D230; +D_8012D240; + + +unknown_071730 +D_8012D3F0; \ No newline at end of file diff --git a/src/unknown_001050.c b/src/unknown_001050.c index fbc5a998..c7296133 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -49,8 +49,12 @@ const char D_800E49BC[] = "Invalid midi sequence index\n"; /************ .bss ************/ -u8 D_800EBF60; -extern ALHeap gALHeap; +#define AUDIO_HEAP_SIZE 0x29D88 + +// The audio heap is located at the start of the BSS section. +u8 gBssSectionStart[AUDIO_HEAP_SIZE]; + +ALHeap gALHeap; /* Unknown size */ typedef struct unk80115CF8 { @@ -58,16 +62,16 @@ typedef struct unk80115CF8 { s16 unk2; } unk80115CF8; -extern ALSeqFile *ALSeqFile_80115CF8; -extern void *D_80115CFC; +ALSeqFile *ALSeqFile_80115CF8; +void *D_80115CFC; -extern u8 D_80115D04; -extern u8 D_80115D05; -extern s32 musicTempo; - -extern ALBankFile *ALBankFile_80115D10; - -extern ALBankFile *ALBankFile_80115D14; +void *D_80115D00; +u8 D_80115D04; +u8 D_80115D05; +s32 musicTempo; +u32 *D_80115D0C; +ALBankFile *ALBankFile_80115D10; +ALBankFile *ALBankFile_80115D14; /* Size: 0x0A bytes */ typedef struct unk80115D18 { @@ -76,7 +80,7 @@ typedef struct unk80115D18 { u8 pad8[2]; } unk80115D18; -extern unk80115D18* D_80115D18; +unk80115D18 *D_80115D18; /* Size: 3 bytes */ typedef struct unk80115D1C { @@ -84,26 +88,27 @@ typedef struct unk80115D1C { u8 unk1; u8 unk2; } unk80115D1C; -extern void *D_80115D00; -extern u32 *D_80115D0C; -extern unk80115D1C* D_80115D1C; -extern s32 D_80115D20; -extern s32 D_80115D24; -extern u32 D_80115D28; -extern u32 D_80115D2C; -extern s16 D_80115D30; -extern s32 D_80115D38; -extern s32 D_80115D3C; -extern u8 D_80115D40; -extern u8 D_80115D41; -extern unk80115D48 D_80115D48[8]; -extern ALCSeq D_80115D88; -extern ALCSeq D_80115E80; -extern u8 D_80115F78; -extern u8 D_80115F79; -extern s32 D_80115F7C; -extern u32 D_80115F84; -extern u32 D_80115F88; +unk80115D1C* D_80115D1C; + +s32 D_80115D20; +s32 D_80115D24; +u32 D_80115D28; +u32 D_80115D2C; +s16 D_80115D30; +f32 D_80115D34; +s32 D_80115D38; +s32 D_80115D3C; +u8 D_80115D40; +u8 D_80115D41; +unk80115D48 D_80115D48[8]; +ALCSeq D_80115D88; +ALCSeq D_80115E80; +u8 D_80115F78; +u8 D_80115F79; +s32 D_80115F7C; +s32 D_80115F80; +u32 D_80115F84; +u32 D_80115F88; /******************************/ @@ -132,7 +137,7 @@ void audio_init(u32 arg0){ audioMgrConfig audConfig; seq_max_len = 0; - alHeapInit(&gALHeap, &D_800EBF60, 0x00029D88); + alHeapInit(&gALHeap, gBssSectionStart, 0x00029D88); reg_s2 = func_80076C58(38); ALBankFile_80115D14 = (ALBankFile*) func_80070C9C(reg_s2[2] - reg_s2[1], 0x00FFFFFF); @@ -559,9 +564,6 @@ u8 musicIsPlaying(void) { return (alCSPGetState(gMusicPlayer) == AL_PLAYING); } - -extern f32 D_80115D34; - #if 1 GLOBAL_ASM("asm/non_matchings/unknown_001050/func_800015F8.s") #else diff --git a/src/unknown_003260.c b/src/unknown_003260.c index 8237bcb2..d4f461d8 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -32,6 +32,21 @@ typedef union { }ALSndpEvent; +/* Unknown Size */ +typedef struct unk800DC6BC { + ALPlayer node; + ALEventQueue evtq; + ALEvent nextEvent; + ALSynth *drvr; + u32 unk3C; + unk800DC6BC_40 *unk40; + s32 unk44; + s32 unk48; + s32 frameTime; + ALMicroTime nextDelta; + ALMicroTime curTime; +} unk800DC6BC; //ALSndPlayer + typedef struct unk80119240 { ALLink node; @@ -99,20 +114,29 @@ const char D_800E4B80[] = "WARNING: Attempt to stop NULL sound aborted\n"; /************ .bss ************/ -extern s32 D_80115F90; -extern ALHeap* D_80115F94; -extern OSThread audioThread; -extern OSMesgQueue OSMesgQueue_80116160; -extern OSMesg D_80116178; -extern OSMesgQueue D_80116198; -extern OSMesg D_801161B0; -extern ALGlobals ALGlobals_801161D0; -extern s32 D_80119230; -extern unk80119240 D_80119240[0x31]; -extern s32 D_8011962C; -extern OSMesgQueue D_80119AF0; -extern OSMesg D_80119B08; -extern u16* D_80119C28; +s32 D_80115F90; +ALHeap* D_80115F94; +s32 D_80115F98[2]; +s32 D_80115FA0[3]; +OSThread audioThread; +OSMesgQueue OSMesgQueue_80116160; +OSMesg D_80116178[8]; +OSMesgQueue D_80116198; +OSMesg D_801161B0[8]; +ALGlobals ALGlobals_801161D0; +s32 D_80116220[3076]; +s32 D_80119230[3]; +unk80119240 D_80119240[50]; +s32 D_80119628; +s32 D_8011962C; +s32 D_80119630; +s32 D_80119634; +s32 D_80119638[2]; +s32 D_80119640[300]; +OSMesgQueue D_80119AF0; +OSMesg D_80119B08[72]; +u16* D_80119C28; + extern f32 D_80126170; /******************************/ diff --git a/src/unknown_005740.c b/src/unknown_005740.c index 39c65d26..36709afe 100644 --- a/src/unknown_005740.c +++ b/src/unknown_005740.c @@ -14,6 +14,28 @@ s32 D_800DC6D8 = 1; // Currently unknown, might be a different type. /*******************************/ +/************ .bss ************/ + +s32 D_80119C30[2]; +s32 D_80119C38; +s32 D_80119C3C; +s32 D_80119C40; +s32 D_80119C44; +s32 D_80119C48; +s32 D_80119C4C; +s32 D_80119C50[2]; +s32 D_80119C58; +s32 D_80119C5C; +s32 D_80119C60[670]; +s32 D_8011A6D8; +s32 D_8011A6DC; +s32 D_8011A6E0[334]; +s32 D_8011AC18; +s32 D_8011AC1C; +s32 D_8011AC20[64]; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80004B40.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_800050D0.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80005254.s") diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 8f3a4c70..4c67e61a 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -116,8 +116,18 @@ class GenerateLD: self.gen_line('romPos += SIZEOF(.rodata);') self.gen_newline() + def gen_ucode_data_section(self): + self.gen_line('.ucodeData . : AT(romPos)') + self.gen_open_block() + self.gen_line(BUILD_DIR + '/asm/assets/ucode_data.o(.text);') + self.gen_close_block() + self.gen_line('romPos += SIZEOF(.ucodeData);') + self.gen_newline() + def gen_bss_section(self): - self.gen_line('.bss.noload (NOLOAD):') + self.gen_line('__BSS_SECTION_SIZE = SIZEOF(.bss.noload);') + self.gen_newline() + self.gen_line('.bss.noload . (NOLOAD): SUBALIGN(4)') self.gen_open_block() for file in self.files: if file[0] not in LATE_DATA_FILES: @@ -127,14 +137,6 @@ class GenerateLD: self.gen_close_block() self.gen_newline() - def gen_ucode_data_section(self): - self.gen_line('.ucodeData . : AT(romPos)') - self.gen_open_block() - self.gen_line(BUILD_DIR + '/asm/assets/ucode_data.o(.text);') - self.gen_close_block() - self.gen_line('romPos += SIZEOF(.ucodeData);') - self.gen_newline() - def gen_assets_section(self): self.gen_line('__ASSETS_LUT_START = romPos;'); self.gen_line('__ASSETS_LUT_END = __ASSETS_LUT_START + ' + hex((((self.assets.numAssets + 2) * 4) + 15) & 0xFFFFFFF0) + ';'); diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py index cae892c0..a7b4047b 100644 --- a/tools/python/undefined_sym_fix.py +++ b/tools/python/undefined_sym_fix.py @@ -1,5 +1,6 @@ import subprocess import sys +import re import subprocess import argparse @@ -55,6 +56,55 @@ def fixDoubleLoads(): i += 1 save_syms(syms) -#fixBadLabel() -fixDoubleLoads() +def getMatches(string, regex): + out = [] + matches = re.finditer(regex, string, re.MULTILINE) + for matchNum, match in enumerate(matches, start=1): + start = match.start() + end = match.end() + out.append((string[start:end], match.groups(), (start, end))) + return out + +FILE_REGEX = r"(?:lib/)?(?:(?:src/)|(?:asm/non_matchings/))([^/.]*)" +def getFiles(symbol): + command = subprocess.run(['fgrep', '-ri', symbol], capture_output=True) + outLines = command.stdout.decode("utf-8").split('\n') + fileNames = [] + for outLine in outLines: + if 'src' in outLine or 'asm' in outLine: + match = getMatches(outLine, FILE_REGEX)[0][1][0] + if match not in fileNames: + fileNames.append(match) + return fileNames + +def getBss(): + currentFile = '' + out = [] + syms = load_syms() + for sym in syms: + if ' = ' in sym: + symSplit = sym.split(' = ') + symbol = symSplit[0] + address = int(symSplit[1][2:-1], 16) + if address >= 0x80115CE8 and address <= 0x8012D3F0: + try: + files = getFiles(symbol) + if currentFile not in files: + if len(files) == 1: + if currentFile != '': + out.append('\n') + currentFile = files[0] + out.append(currentFile) + else: + print(symbol, files, 'Cannot tell which file to use!') + except IndexError: + print('Error with symbol: ' + symbol) + out.append(sym) + with open('bss.txt', 'w') as outFile: + outFile.write('\n'.join(out)) + + +fixBadLabel() +#fixDoubleLoads() +#getBss() diff --git a/undefined_syms.txt b/undefined_syms.txt index 6d5c0064..d622687f 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,78 +25,79 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -gALHeap = 0x80115CE8; -ALSeqFile_80115CF8 = 0x80115CF8; -D_80115CFC = 0x80115CFC; -D_80115D00 = 0x80115D00; -D_80115D04 = 0x80115D04; -D_80115D05 = 0x80115D05; -musicTempo = 0x80115D08; -D_80115D0C = 0x80115D0C; -ALBankFile_80115D10 = 0x80115D10; -ALBankFile_80115D14 = 0x80115D14; -D_80115D18 = 0x80115D18; -D_80115D1C = 0x80115D1C; -D_80115D20 = 0x80115D20; -D_80115D24 = 0x80115D24; -D_80115D28 = 0x80115D28; -D_80115D2C = 0x80115D2C; -D_80115D30 = 0x80115D30; -D_80115D34 = 0x80115D34; -D_80115D38 = 0x80115D38; -D_80115D3C = 0x80115D3C; -D_80115D40 = 0x80115D40; -D_80115D41 = 0x80115D41; -D_80115D48 = 0x80115D48; -D_80115D88 = 0x80115D88; -D_80115E80 = 0x80115E80; -D_80115F78 = 0x80115F78; -D_80115F79 = 0x80115F79; -D_80115F7C = 0x80115F7C; -D_80115F80 = 0x80115F80; -D_80115F84 = 0x80115F84; -D_80115F88 = 0x80115F88; -D_80115F90 = 0x80115F90; -D_80115F94 = 0x80115F94; -D_80115F98 = 0x80115F98; -D_80115FA0 = 0x80115FA0; -D_80115FA4 = 0x80115FA4; -audioThread = 0x80115FB0; -OSMesgQueue_80116160 = 0x80116160; -D_80116178 = 0x80116178; -D_80116198 = 0x80116198; -D_801161B0 = 0x801161B0; -ALGlobals_801161D0 = 0x801161D0; -D_80116220 = 0x80116220; -D_80119230 = 0x80119230; -D_80119240 = 0x80119240; -D_80119254 = 0x80119254; -D_80119628 = 0x80119628; -D_8011962C = 0x8011962C; -D_80119630 = 0x80119630; -D_80119634 = 0x80119634; -D_80119638 = 0x80119638; -D_80119640 = 0x80119640; -D_80119AF0 = 0x80119AF0; -D_80119B08 = 0x80119B08; -D_80119C28 = 0x80119C28; -D_80119C30 = 0x80119C30; -D_80119C38 = 0x80119C38; -D_80119C3C = 0x80119C3C; -D_80119C40 = 0x80119C40; -D_80119C44 = 0x80119C44; -D_80119C48 = 0x80119C48; -D_80119C4C = 0x80119C4C; -D_80119C50 = 0x80119C50; -D_80119C58 = 0x80119C58; -D_80119C5C = 0x80119C5C; -D_80119C60 = 0x80119C60; -D_8011A6D8 = 0x8011A6D8; -D_8011A6DC = 0x8011A6DC; -D_8011A6E0 = 0x8011A6E0; -D_8011AC18 = 0x8011AC18; -D_8011AC1C = 0x8011AC1C; -D_8011AC20 = 0x8011AC20; +/gALHeap = 0x80115CE8; +/ALSeqFile_80115CF8 = 0x80115CF8; +/D_80115CFC = 0x80115CFC; +/D_80115D00 = 0x80115D00; +/D_80115D04 = 0x80115D04; +/D_80115D05 = 0x80115D05; +/musicTempo = 0x80115D08; +/D_80115D0C = 0x80115D0C; +/ALBankFile_80115D10 = 0x80115D10; +/ALBankFile_80115D14 = 0x80115D14; +/D_80115D18 = 0x80115D18; +/D_80115D1C = 0x80115D1C; +/D_80115D20 = 0x80115D20; +/D_80115D24 = 0x80115D24; +/D_80115D28 = 0x80115D28; +/D_80115D2C = 0x80115D2C; +/D_80115D30 = 0x80115D30; +/D_80115D34 = 0x80115D34; +/D_80115D38 = 0x80115D38; +/D_80115D3C = 0x80115D3C; +/D_80115D40 = 0x80115D40; +/D_80115D41 = 0x80115D41; +/D_80115D48 = 0x80115D48; +/D_80115D88 = 0x80115D88; +/D_80115E80 = 0x80115E80; +/D_80115F78 = 0x80115F78; +/D_80115F79 = 0x80115F79; +/D_80115F7C = 0x80115F7C; +/D_80115F80 = 0x80115F80; +/D_80115F84 = 0x80115F84; +/D_80115F88 = 0x80115F88; + +/D_80115F90 = 0x80115F90; +/D_80115F94 = 0x80115F94; +/D_80115F98 = 0x80115F98; +/D_80115FA0 = 0x80115FA0; +/audioThread = 0x80115FB0; +/OSMesgQueue_80116160 = 0x80116160; +/D_80116178 = 0x80116178; +/D_80116198 = 0x80116198; +/D_801161B0 = 0x801161B0; +/ALGlobals_801161D0 = 0x801161D0; +/D_80116220 = 0x80116220; +/D_80119230 = 0x80119230; +/D_80119240 = 0x80119240; +/D_80119628 = 0x80119628; +/D_8011962C = 0x8011962C; +/D_80119630 = 0x80119630; +/D_80119634 = 0x80119634; +/D_80119638 = 0x80119638; +/D_80119640 = 0x80119640; +/D_80119AF0 = 0x80119AF0; +/D_80119B08 = 0x80119B08; +/D_80119C28 = 0x80119C28; + +/D_80119C30 = 0x80119C30; +/D_80119C38 = 0x80119C38; +/D_80119C3C = 0x80119C3C; +/D_80119C40 = 0x80119C40; +/D_80119C44 = 0x80119C44; +/D_80119C48 = 0x80119C48; +/D_80119C4C = 0x80119C4C; +/D_80119C50 = 0x80119C50; +/D_80119C58 = 0x80119C58; +/D_80119C5C = 0x80119C5C; +/D_80119C60 = 0x80119C60; +/D_8011A6D8 = 0x8011A6D8; +/D_8011A6DC = 0x8011A6DC; +/D_8011A6E0 = 0x8011A6E0; +/D_8011AC18 = 0x8011AC18; +/D_8011AC1C = 0x8011AC1C; +/D_8011AC20 = 0x8011AC20; + D_8011AD20 = 0x8011AD20; D_8011AD21 = 0x8011AD21; D_8011AD22 = 0x8011AD22; From 7b6e1906d9d6b41f1cf60357f974136db4c0081e Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 19:05:13 -0500 Subject: [PATCH 27/39] Added bss for unknown_00BC20, unknown_0255E0 --- .../unknown_00BC20/func_8000CC7C.s | 12 +- .../unknown_00BC20/func_80010994.s | 4 +- .../unknown_00BC20/func_8002125C.s | 4 +- bss.txt | 231 --------- src/unknown_005740.c | 2 +- src/unknown_00BC20.c | 251 ++++++---- src/unknown_0255E0.c | 140 ++++-- undefined_syms.txt | 468 +++++++++--------- 8 files changed, 505 insertions(+), 607 deletions(-) diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index c9a79bab..8a24cf2f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -556,10 +556,10 @@ glabel func_8000CC7C /* 00E01C 8000D41C 8FB80078 */ lw $t8, 0x78($sp) /* 00E020 8000D420 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) /* 00E024 8000D424 830D00B8 */ lb $t5, 0xb8($t8) -/* 00E028 8000D428 3C018012 */ lui $at, %hi(D_8011AD25) # $at, 0x8012 +/* 00E028 8000D428 3C018012 */ lui $at, %hi(D_8011AD24+1) # $at, 0x8012 /* 00E02C 8000D42C A3B90127 */ sb $t9, 0x127($sp) /* 00E030 8000D430 1860015E */ blez $v1, .L8000D9AC -/* 00E034 8000D434 A02DAD25 */ sb $t5, %lo(D_8011AD25)($at) +/* 00E034 8000D434 A02DAD25 */ sb $t5, %lo(D_8011AD24+1)($at) /* 00E038 8000D438 8FA40068 */ lw $a0, 0x68($sp) /* 00E03C 8000D43C 24020005 */ li $v0, 5 .L8000D440: @@ -625,9 +625,9 @@ glabel func_8000CC7C /* 00E114 8000D514 14410012 */ bne $v0, $at, .L8000D560 /* 00E118 8000D518 24110001 */ li $s1, 1 /* 00E11C 8000D51C 16000009 */ bnez $s0, .L8000D544 -/* 00E120 8000D520 3C188012 */ lui $t8, %hi(D_8011AD25) # $t8, 0x8012 -/* 00E124 8000D524 3C0E8012 */ lui $t6, %hi(D_8011AD25) # $t6, 0x8012 -/* 00E128 8000D528 81CEAD25 */ lb $t6, %lo(D_8011AD25)($t6) +/* 00E120 8000D520 3C188012 */ lui $t8, %hi(D_8011AD24+1) # $t8, 0x8012 +/* 00E124 8000D524 3C0E8012 */ lui $t6, %hi(D_8011AD24+1) # $t6, 0x8012 +/* 00E128 8000D528 81CEAD25 */ lb $t6, %lo(D_8011AD24+1)($t6) # Indexing into D_800DC820 only reading the MSB? /* 00E12C 8000D52C 3C1E800E */ lui $fp, %hi(D_800DC820) # $fp, 0x800e /* 00E130 8000D530 000E7840 */ sll $t7, $t6, 1 @@ -636,7 +636,7 @@ glabel func_8000CC7C /* 00E13C 8000D53C 10000028 */ b .L8000D5E0 /* 00E140 8000D540 00000000 */ nop .L8000D544: -/* 00E144 8000D544 8318AD25 */ lb $t8, %lo(D_8011AD25)($t8) +/* 00E144 8000D544 8318AD25 */ lb $t8, %lo(D_8011AD24+1)($t8) # Indexing into D_800DC820 only reading the LSB? /* 00E148 8000D548 3C1E800E */ lui $fp, %hi(D_800DC820) # $fp, 0x800e /* 00E14C 8000D54C 00186840 */ sll $t5, $t8, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index e78f8db6..8ca113fe 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -43,9 +43,9 @@ glabel func_80010994 /* 011630 80010A30 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 011634 80010A34 AC20ADB0 */ sw $zero, %lo(D_8011ADB0)($at) .L80010A38: -/* 011638 80010A38 3C028012 */ lui $v0, %hi(D_8011AD21) # $v0, 0x8012 +/* 011638 80010A38 3C028012 */ lui $v0, %hi(D_8011AD20+1) # $v0, 0x8012 /* 01163C 80010A3C 3C018012 */ lui $at, %hi(D_8011AD3D) # $at, 0x8012 -/* 011640 80010A40 2442AD21 */ addiu $v0, %lo(D_8011AD21) # addiu $v0, $v0, -0x52df +/* 011640 80010A40 2442AD21 */ addiu $v0, %lo(D_8011AD20+1) # addiu $v0, $v0, -0x52df /* 011644 80010A44 A020AD3D */ sb $zero, %lo(D_8011AD3D)($at) /* 011648 80010A48 80480000 */ lb $t0, ($v0) /* 01164C 80010A4C 24090001 */ li $t1, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_8002125C.s b/asm/non_matchings/unknown_00BC20/func_8002125C.s index e08fde9d..f10a0435 100644 --- a/asm/non_matchings/unknown_00BC20/func_8002125C.s +++ b/asm/non_matchings/unknown_00BC20/func_8002125C.s @@ -96,10 +96,10 @@ glabel func_8002125C /* 021FC0 800213C0 00000000 */ nop .L800213C4: /* 021FC4 800213C4 80B90028 */ lb $t9, 0x28($a1) -/* 021FC8 800213C8 3C088012 */ lui $t0, %hi(D_8011AD21) # $t0, 0x8012 +/* 021FC8 800213C8 3C088012 */ lui $t0, %hi(D_8011AD20+1) # $t0, 0x8012 /* 021FCC 800213CC 07200008 */ bltz $t9, .L800213F0 /* 021FD0 800213D0 3C098012 */ lui $t1, %hi(D_8011AD22) # $t1, 0x8012 -/* 021FD4 800213D4 8108AD21 */ lb $t0, %lo(D_8011AD21)($t0) +/* 021FD4 800213D4 8108AD21 */ lb $t0, %lo(D_8011AD20+1)($t0) /* 021FD8 800213D8 2529AD22 */ addiu $t1, %lo(D_8011AD22) # addiu $t1, $t1, -0x52de /* 021FDC 800213DC 01091021 */ addu $v0, $t0, $t1 /* 021FE0 800213E0 804A0000 */ lb $t2, ($v0) diff --git a/bss.txt b/bss.txt index 3d486755..9733b080 100644 --- a/bss.txt +++ b/bss.txt @@ -8,240 +8,9 @@ unknown_005740 unknown_00BC20 -D_8011AD20; -D_8011AD21; -D_8011AD22; -D_8011AD24; -D_8011AD25; -D_8011AD26; -D_8011AD28; -D_8011AD30; -D_8011AD34; -D_8011AD38; -D_8011AD3C; -D_8011AD3D; -D_8011AD3E; -D_8011AD40; -D_8011AD44; -D_8011AD45; -D_8011AD46; -D_8011AD48; -D_8011AD4A; -D_8011AD4C; -D_8011AD4E; -D_8011AD50; -D_8011AD51; -D_8011AD52; -D_8011AD53; -D_8011AD58; -D_8011AD5C; -D_8011AD60; -D_8011AD64; -D_8011AD68; -D_8011AD6C; -D_8011AD70; -D_8011AD78; -D_8011ADA0; -D_8011ADA4; -D_8011ADA8; -D_8011ADAC; -D_8011ADB0; -D_8011ADB4; -D_8011ADB8; -D_8011ADBC; -D_8011ADC0; -D_8011ADC4; -D_8011ADC5; -D_8011ADC8; -D_8011ADCC; -D_8011ADD0; -D_8011ADD4; -D_8011ADD5; -D_8011ADD8; -D_8011AE00; -D_8011AE01; -D_8011AE02; -D_8011AE03; -D_8011AE08; -D_8011AE48; -D_8011AE4C; -D_8011AE50; -D_8011AE54; -objPtrList; -objCount; -D_8011AE60; -D_8011AE64; -D_8011AE68; -D_8011AE6C; -D_8011AE70; -D_8011AE74; -D_8011AE78; -D_8011AE7A; -D_8011AE7C; -D_8011AE7E; -D_8011AE80; -D_8011AE82; -D_8011AE84; -D_8011AE88; -D_8011AE8C; -D_8011AE90; -D_8011AE94; -D_8011AE98; -D_8011AEA0; -D_8011AEA4; -D_8011AEA8; -D_8011AEB0; -D_8011AEB8; -D_8011AEBC; -D_8011AEC0; -particlePtrList; -particleCount; -D_8011AECC; -D_8011AED0; -D_8011AED4; -D_8011AED8; -D_8011AEDC; -D_8011AEE0; -playerStructArray_Ptr; -D_8011AEE8; -D_8011AEEC; -playerCount; -D_8011AEF4; -D_8011AEF5; -D_8011AEF6; -D_8011AEF7; -D_8011AEF8; -D_8011AEFC; -D_8011AF00; -D_8011AF04; -D_8011AF08; -D_8011AF10; -D_8011AF18; -D_8011AF2C; -D_8011AF30; -D_8011AF60; -D_8011AF68; -D_8011AFE8; -D_8011AFEE; -D_8011AFF4; -D_8011AFF8; -D_8011AFFC; -D_8011B000; -D_8011B004; -D_8011B008; -D_8011B010; -D_8011B020; -D_8011B048; -D_8011B058; -D_8011B068; -D_8011B078; -D_8011B07B; unknown_0255E0 -D_8011B0A0; -D_8011B0A4; -D_8011B0A8; -D_8011B0AC; -D_8011B0B0; -D_8011B0B4; -D_8011B0B8; -D_8011B0BC; -D_8011B0C0; -D_8011B0C4; -D_8011B0C8; -D_8011B0CC; -D_8011B0D0; -D_8011B0D4; -D_8011B0DC; -D_8011B0E0; -D_8011B0E1; -D_8011B0E2; -D_8011B0E3; -D_8011B0E4; -D_8011B0E8; -D_8011B0EC; -D_8011B0F0; -D_8011B0F4; -D_8011B0F8; -D_8011B0FC; -D_8011B100; -D_8011B104; -D_8011B108; -D_8011B10C; -D_8011B110; -D_8011B114; -D_8011B118; -D_8011B120; -D_8011B320; -D_8011B330; -D_8011C230; -D_8011C238; -D_8011C3B8; -D_8011C8B8; -D_8011D0B8; -D_8011D0BC; -D_8011D0C0; -D_8011D0C4; -D_8011D0C8; -D_8011D0CC; -D_8011D0CE; -D_8011D0D0; -D_8011D0D4; -D_8011D0D8; -D_8011D0DC; -D_8011D0E0; -D_8011D0E4; -D_8011D0E8; -D_8011D0EC; -D_8011D0F0; -D_8011D0F4; -D_8011D0F8; -D_8011D128; -D_8011D164; -D_8011D2B8; -D_8011D308; -D_8011D30C; -D_8011D310; -D_8011D314; -D_8011D318; -D_8011D31C; -D_8011D320; -D_8011D330; -D_8011D338; -D_8011D348; -D_8011D350; -D_8011D360; -D_8011D364; -D_8011D368; -D_8011D36C; -D_8011D370; -D_8011D374; -D_8011D378; -D_8011D37C; -D_8011D380; -D_8011D384; -D_8011D388; -D_8011D468; -D_8011D474; -D_8011D478; -D_8011D47C; -D_8011D480; -D_8011D488; -D_8011D490; -D_8011D498; -D_8011D49C; -D_8011D49E; -D_8011D4A0; -D_8011D4A4; -D_8011D4A8; -D_8011D4AC; -D_8011D4B0; -D_8011D4B4; -D_8011D4B6; -D_8011D4B8; -D_8011D4BA; -D_8011D4BC; unknown_032760 diff --git a/src/unknown_005740.c b/src/unknown_005740.c index 36709afe..58f754bf 100644 --- a/src/unknown_005740.c +++ b/src/unknown_005740.c @@ -32,7 +32,7 @@ s32 D_8011A6DC; s32 D_8011A6E0[334]; s32 D_8011AC18; s32 D_8011AC1C; -s32 D_8011AC20[64]; +s16 D_8011AC20[128]; /******************************/ diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 9d97311e..c2f9f827 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -113,80 +113,98 @@ const char D_800E5120[] = "ARGHHHHHHHHH\n"; /************ .bss ************/ -extern s16 D_8011AC20[12]; -extern s16 D_8011AD4E; -extern s8 D_8011AD20[4]; -extern s8 D_8011AD21; -extern s8 D_8011AD22[2]; -extern s8 D_8011AD25; -extern s8 D_8011AD26; -extern s32 D_8011AD34; -extern s8 D_8011AD3C; -extern s8 D_8011AD3D; +// Currently defined in unknown_005740. Might need to be defined here. +extern s16 D_8011AC20[128]; - -extern Player *D_8011AD40; -extern s8 D_8011AD44; -extern s8 D_8011AD45; -extern s16 D_8011AD46; -extern s16 D_8011AD48; -extern s16 D_8011AD4A; -extern s16 D_8011AD4C; -extern s8 D_8011AD50; -extern s8 D_8011AD51; -extern s8 D_8011AD52; -extern s8 D_8011AD53; -extern s32 *D_8011AD58; -extern s32 D_8011AD5C; -extern s32 D_8011AD60; -extern s32 *D_8011AD64; -extern s32 D_8011AD68; -extern s32 *D_8011AD6C; -extern s32 *D_8011AD70; -extern Gfx *D_8011AD78[9]; -extern s32 D_8011ADA0; -extern s16 D_8011ADA4; -extern f32 D_8011ADA8; -extern s32 D_8011ADAC; - -extern s32 D_8011ADB0; -extern s32 D_8011ADB8; -extern s32 D_8011ADBC; -extern u8 D_8011ADC4; -extern s32 D_8011ADC8; -extern s8 (*D_8011ADCC)[8]; -extern f32 D_8011ADD0; -extern s8 D_8011ADD4; -extern s8 D_8011ADD5; -extern s8 D_8011AE00; -extern s8 D_8011AE01; -extern s8 D_8011AE02; -extern s8 D_8011AE03; -extern u32 *D_8011AE08[16]; -extern s32 (*D_8011AE48)[8]; // Unknown number of entries. -extern u8 (*D_8011AE4C)[8]; // Unknown number of entries. -extern Player **objPtrList; // Not sure about the number of elements -extern s32 objCount; -extern s32 D_8011AE60; -extern s32 D_8011AE64; -extern s32 *D_8011AE68; -extern s32 *D_8011AE6C; -extern s32 D_8011AE70; -extern s32 *D_8011AE74; -extern s16 D_8011AE78; -extern s16 D_8011AE7A; -extern s16 D_8011AE7C; -extern s8 D_8011AE7E; -extern s16 D_8011AE82; -extern s32 D_8011AE88; -extern u32 D_8011AE8C; -extern u32 D_8011AE90; -extern u32 D_8011AE94; -extern s32 D_8011AEB0[2]; -extern s16 *D_8011AEB8; -extern s32 D_8011AEBC; -extern Player **particlePtrList; -extern s32 particleCount; +s8 D_8011AD20[2]; +s8 D_8011AD22[2]; +s8 D_8011AD24[2]; +s8 D_8011AD26[2]; +f32 D_8011AD28; +s32 D_8011AD2C; +f32 D_8011AD30; +s32 D_8011AD34; +s32 D_8011AD38; +s8 D_8011AD3C; +s8 D_8011AD3D; +s8 D_8011AD3E; +Player *D_8011AD40; +s8 D_8011AD44; +s8 D_8011AD45; +s16 D_8011AD46; +s16 D_8011AD48; +s16 D_8011AD4A; +s16 D_8011AD4C; +s16 D_8011AD4E; +s8 D_8011AD50; +s8 D_8011AD51; +s8 D_8011AD52; +s8 D_8011AD53; +s32 D_8011AD54; +s32 *D_8011AD58; +s32 D_8011AD5C; +s32 D_8011AD60; +s32 *D_8011AD64; +s32 D_8011AD68; +s32 *D_8011AD6C; +s32 *D_8011AD70; +s32 D_8011AD74; +Gfx *D_8011AD78[10]; +s32 D_8011ADA0; +s16 D_8011ADA4; +f32 D_8011ADA8; +s32 D_8011ADAC; +s32 D_8011ADB0; +s32 D_8011ADB4; +s32 D_8011ADB8; +s32 D_8011ADBC; +s32 D_8011ADC0; +u8 D_8011ADC4; +u8 D_8011ADC5; +s32 D_8011ADC8; +s8 (*D_8011ADCC)[8]; +f32 D_8011ADD0; +s8 D_8011ADD4; +s8 D_8011ADD5; +s32 D_8011ADD8[10]; +s8 D_8011AE00; +s8 D_8011AE01; +s8 D_8011AE02; +s8 D_8011AE03; +u32 *D_8011AE08[16]; +s32 (*D_8011AE48)[8]; // Unknown number of entries. +u8 (*D_8011AE4C)[8]; // Unknown number of entries. +s32 D_8011AE50; +s32 D_8011AE54; +Player **objPtrList; // Not sure about the number of elements +s32 objCount; +s32 D_8011AE60; +s32 D_8011AE64; +s32 *D_8011AE68; +s32 *D_8011AE6C; +s32 D_8011AE70; +s32 *D_8011AE74; +s16 D_8011AE78; +s16 D_8011AE7A; +s16 D_8011AE7C; +s8 D_8011AE7E; +s16 D_8011AE80; +s16 D_8011AE82; +s32 D_8011AE84; +s32 D_8011AE88; +u32 D_8011AE8C; +u32 D_8011AE90; +u32 D_8011AE94; +s32 D_8011AE98[2]; +s32 D_8011AEA0; +s32 D_8011AEA4; +s32 D_8011AEA8[2]; +s32 D_8011AEB0[2]; +s16 *D_8011AEB8; +s32 D_8011AEBC; +s32 D_8011AEC0; +Player **particlePtrList; +s32 particleCount; /* Size: 0x3C bytes */ typedef struct unknown8011AECC { @@ -194,26 +212,31 @@ typedef struct unknown8011AECC { s8 unk3A; s8 unk3B; } unknown8011AECC; -extern unknown8011AECC* D_8011AECC; // Array of structs, unknown number of members - -extern s32 D_8011AED0; -extern s32 D_8011AED4; -extern s16 D_8011AED8; -extern u32 (*D_8011AEDC)[64]; // Not sure about the number of elements -extern s32 D_8011AEE0; -extern Player *(*playerStructArray_Ptr)[8]; -extern s32 *D_8011AEE8; -extern s32 *D_8011AEEC; -extern s32 playerCount; -extern u8 D_8011AEF4; -extern u8 D_8011AEF5; -extern u8 D_8011AEF6; -extern u8 D_8011AEF7; -extern u32 (*D_8011AF04)[64]; // Not sure about the number of elements -extern s32 D_8011AF08[2]; -extern s32 D_8011AF10; -extern s32 D_8011AF60; - +unknown8011AECC* D_8011AECC; // Array of structs, unknown number of members +s32 D_8011AED0; +s32 D_8011AED4; +s16 D_8011AED8; +u32 (*D_8011AEDC)[64]; // Not sure about the number of elements +s32 D_8011AEE0; +Player *(*playerStructArray_Ptr)[8]; +s32 *D_8011AEE8; +s32 *D_8011AEEC; +s32 playerCount; +u8 D_8011AEF4; +u8 D_8011AEF5; +u8 D_8011AEF6; +u8 D_8011AEF7; +s32 D_8011AEF8; +s32 D_8011AEFC; +s32 D_8011AF00; +u32 (*D_8011AF04)[64]; // Not sure about the number of elements +s32 D_8011AF08[2]; +s32 D_8011AF10[2]; +s32 D_8011AF18[5]; +s32 D_8011AF2C; +s32 D_8011AF30[12]; +s32 D_8011AF60[2]; +s32 D_8011AF68[32]; /* Size: 0x40 bytes */ typedef struct unk800179D0 { @@ -226,12 +249,28 @@ typedef struct unk800179D0 { /* Unknown Size */ typedef struct unk800179D0_2 { - unk800179D0* unk0; s32 unk04; } unk800179D0_2; -extern unk800179D0_2 D_8011AFF4; -extern u32* D_8011B020[10]; +s32 D_8011AFE8; +s16 D_8011AFEC; +s16 D_8011AFEE; +s32 D_8011AFF0; +unk800179D0* D_8011AFF4; +s32 D_8011AFF8; +s32 D_8011AFFC; +s32 D_8011B000; +s32 D_8011B004; +s32 D_8011B008; +s32 D_8011B010[4]; +u32* D_8011B020[10]; +s32 D_8011B048[4]; +s32 D_8011B058[4]; +s32 D_8011B068[4]; +s8 D_8011B078[3]; +s8 D_8011B07B; +s32 D_8011B07C; +s32 D_8011B080[7]; extern s16 D_8011D5AC; @@ -321,7 +360,7 @@ void func_8000BF8C(void) { D_8011AEE8 = (s32*)func_80070C9C(0x28, 0xFFFF); D_8011AF04 = (s32*)func_80070C9C(0x200, 0xFFFF); D_8011ADCC = (s32*)func_80070C9C(8, 0xFFFF); - D_8011AFF4.unk0 = (s32*)func_80070C9C(0x400, 0xFFFF); + D_8011AFF4 = (s32*)func_80070C9C(0x400, 0xFFFF); D_8011AEB8 = (s32*)func_80076C58(0x23); D_8011AEBC = (func_80076F30(0x23) >> 1) - 1; while (D_8011AEB8[D_8011AEBC] == 0) { @@ -386,7 +425,7 @@ void func_8000C2D8(u8 *arg0, s32 length) { void func_8000C460(void) { s32 i; - D_8011AD26 = 1; + D_8011AD26[0] = 1; D_8011AD5C = 0; D_8011AD60 = 0; particleCount = 0; @@ -395,7 +434,7 @@ void func_8000C460(void) { D_8011AED4 = 0; playerCount = 0; D_8011AE78 = 0; - D_8011AD21 = 0; + D_8011AD20[1] = 0; D_8011AD22[0] = 0; D_8011AD22[1] = 0; @@ -406,7 +445,7 @@ void func_8000C460(void) { (*D_8011ADCC)[i] = 0; } for (i = 0; i < 0x10; i++) { - D_8011AFF4.unk0[i].unk0 = 0; + D_8011AFF4[i].unk0 = 0; } D_8011AF08[0] = 0xFF; @@ -422,7 +461,7 @@ void func_8000C460(void) { D_8011AD44 = 0; D_8011AEF6 = 0; D_8011AEF7 = 0; - D_8011AF60 = 0; + D_8011AF60[0] = 0; D_8011AE00 = 0; D_8011AE01 = 1; D_8011AD53 = 0; @@ -1095,7 +1134,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80017978.s") u32 func_800179D0(void) { s16 i = 0; while(i < 16) { - unk800179D0* temp = &D_8011AFF4.unk0[i]; + unk800179D0* temp = &D_8011AFF4[i]; if (temp->unk0 != 0) { temp->unk0--; } @@ -1273,7 +1312,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001CC48.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001CD28.s") void func_8001D1AC(void) { - D_8011AF10 = 1; + D_8011AF10[0] = 1; } void func_8001D1BC(s32 arg0) { @@ -1417,7 +1456,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8002125C.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80021400.s") s8 func_800214C4(void) { - return D_8011AD20[3 - D_8011AD21]; + return D_8011AD22[1 - D_8011AD20[1]]; } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800214E4.s") @@ -1507,9 +1546,9 @@ Player* func_8002342C(f32 x, f32 z){ s32 func_80023568(void) { if (D_8011AD3C != 0) { - return D_8011AD25 + 1; + return D_8011AD24[1] + 1; } else if (func_8006BD98() == 8) { - return D_8011AD25 + 1; + return D_8011AD24[1] + 1; } return 0; } diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index da9989e8..1c88bdeb 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -78,44 +78,128 @@ const char D_800E5E10[] = "TrackGetHeight() - Overflow!!!\n"; /************ .bss ************/ -extern s32 D_8011D37C; -extern s32 D_8011D474; - -extern s32 D_8011B0A0; -extern s32 D_8011B0A4; -extern s32 D_8011B0A8; - -typedef struct{ - Player * unk00; -} unk8011B0B8; - -extern unk8011B0B8 D_8011B0B8; - -extern s32 D_8011B0DC; -extern s32 D_8011B0F0; -extern s32 D_8011B0F4; -extern s32 D_8011B0FC; - -extern f32 D_8011B0E4; -extern f32 D_8011B0E8; -extern f32 D_8011B0EC; +s32 D_8011B0A0; +s32 D_8011B0A4; +s32 D_8011B0A8; +s32 D_8011B0AC; typedef struct{ s16 unk00; s16 unk02; s16 unk04; }unk8011B0B0; - unk8011B0B0 *D_8011B0B0; +s32 D_8011B0B4; +Player *D_8011B0B8; +s32 D_8011B0BC; +s32 D_8011B0C0; +s32 D_8011B0C4; +s32 D_8011B0C8; +s32 D_8011B0CC; +s32 D_8011B0D0; +s32 D_8011B0D4; +s32 D_8011B0D8; +s32 D_8011B0DC; +s8 D_8011B0E0; +s8 D_8011B0E1; +s8 D_8011B0E2; +s8 D_8011B0E3; +f32 D_8011B0E4; +f32 D_8011B0E8; +f32 D_8011B0EC; +s32 D_8011B0F0; +s32 D_8011B0F4; +s32 D_8011B0F8; +s32 D_8011B0FC; +s32 D_8011B100; +s32 D_8011B104; +s32 D_8011B108; +s32 D_8011B10C; +s32 D_8011B110; +s32 D_8011B114; +s32 D_8011B118; +s32 D_8011B11C; +s32 D_8011B120[128]; +s32 D_8011B320[4]; +s32 D_8011B330[960]; +s32 D_8011C230[2]; +s32 D_8011C238[96]; +s32 D_8011C3B8[320]; +s32 D_8011C8B8[512]; +s32 D_8011D0B8; +s32 D_8011D0BC; +s32 D_8011D0C0; +s32 D_8011D0C4; +s32 D_8011D0C8; +s16 D_8011D0CC; +s16 D_8011D0CE; +s32 D_8011D0D0; +s32 D_8011D0D4; +s32 D_8011D0D8; +s32 D_8011D0DC; +s32 D_8011D0E0; +s32 D_8011D0E4; +s32 D_8011D0E8; +s32 D_8011D0EC; +s32 D_8011D0F0; +s32 D_8011D0F4; +s32 D_8011D0F8[12]; +s32 D_8011D128[15]; +s32 D_8011D164; +s32 D_8011D168[84]; +s32 D_8011D2B8[20]; +s32 D_8011D308; +s32 D_8011D30C; +s32 D_8011D310; +s32 D_8011D314; +s32 D_8011D318; +s32 D_8011D31C; +s32 D_8011D320[4]; +s32 D_8011D330[2]; +s32 D_8011D338[4]; +s32 D_8011D348[2]; +s32 D_8011D350[4]; +s32 D_8011D360; +s32 D_8011D364; +s32 D_8011D368; +s32 D_8011D36C; +s32 D_8011D370; +s32 D_8011D374; +s32 D_8011D378; +s32 D_8011D37C; +s32 D_8011D380; +s32 D_8011D384; +s32 D_8011D388[56]; + typedef struct{ s32 unk00; s32 unk04; s32 unk08; }unk8011D468; - unk8011D468 D_8011D468; +s32 D_8011D474; +s32 D_8011D478; +s32 D_8011D47C; +s32 D_8011D480[2]; +s32 D_8011D488[2]; +s32 D_8011D490[2]; +s32 D_8011D498; +s16 D_8011D49C; +s16 D_8011D49E; +s32 D_8011D4A0; +s32 D_8011D4A4; +s32 D_8011D4A8; +s32 D_8011D4AC; +s32 D_8011D4B0; +s16 D_8011D4B4; +s16 D_8011D4B6; +s16 D_8011D4B8; +s16 D_8011D4BA; +s32 D_8011D4BC; + + /******************************/ extern void func_8006F64C(void*, f32, f32, f32, f32*, f32*, f32*); @@ -293,19 +377,19 @@ void func_800289B8(void){ void func_80028C10(void){ unk80120AC0 * v0_some_struct; - if(D_8011B0B8.unk00 == NULL) + if(D_8011B0B8 == NULL) return; v0_some_struct = func_80069D20(); if(D_800DC91C->unk49 == 0){ - D_8011B0B8.unk00->x_position = v0_some_struct->x_position; - D_8011B0B8.unk00->y_position = v0_some_struct->y_position; - D_8011B0B8.unk00->z_position = v0_some_struct->z_position; + D_8011B0B8->x_position = v0_some_struct->x_position; + D_8011B0B8->y_position = v0_some_struct->y_position; + D_8011B0B8->z_position = v0_some_struct->z_position; } func_80068408(&D_8011B0A0, &D_8011B0A4); if(D_8011B0DC){ - func_80012D5C(&D_8011B0A0, &D_8011B0A4, &D_8011B0A8, D_8011B0B8.unk00); + func_80012D5C(&D_8011B0A0, &D_8011B0A4, &D_8011B0A8, D_8011B0B8); } } #if 1 diff --git a/undefined_syms.txt b/undefined_syms.txt index d622687f..ed8ceeeb 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -98,237 +98,243 @@ eqpower = 0x800E37A0; /D_8011AC1C = 0x8011AC1C; /D_8011AC20 = 0x8011AC20; -D_8011AD20 = 0x8011AD20; -D_8011AD21 = 0x8011AD21; -D_8011AD22 = 0x8011AD22; -D_8011AD24 = 0x8011AD24; -D_8011AD25 = 0x8011AD25; -D_8011AD26 = 0x8011AD26; -D_8011AD28 = 0x8011AD28; -D_8011AD30 = 0x8011AD30; -D_8011AD34 = 0x8011AD34; -D_8011AD38 = 0x8011AD38; -D_8011AD3C = 0x8011AD3C; -D_8011AD3D = 0x8011AD3D; -D_8011AD3E = 0x8011AD3E; -D_8011AD40 = 0x8011AD40; -D_8011AD44 = 0x8011AD44; -D_8011AD45 = 0x8011AD45; -D_8011AD46 = 0x8011AD46; -D_8011AD48 = 0x8011AD48; -D_8011AD4A = 0x8011AD4A; -D_8011AD4C = 0x8011AD4C; -D_8011AD4E = 0x8011AD4E; -D_8011AD50 = 0x8011AD50; -D_8011AD51 = 0x8011AD51; -D_8011AD52 = 0x8011AD52; -D_8011AD53 = 0x8011AD53; -D_8011AD58 = 0x8011AD58; -D_8011AD5C = 0x8011AD5C; -D_8011AD60 = 0x8011AD60; -D_8011AD64 = 0x8011AD64; -D_8011AD68 = 0x8011AD68; -D_8011AD6C = 0x8011AD6C; -D_8011AD70 = 0x8011AD70; -D_8011AD78 = 0x8011AD78; -D_8011ADA0 = 0x8011ADA0; -D_8011ADA4 = 0x8011ADA4; -D_8011ADA8 = 0x8011ADA8; -D_8011ADAC = 0x8011ADAC; -D_8011ADB0 = 0x8011ADB0; -D_8011ADB4 = 0x8011ADB4; -D_8011ADB8 = 0x8011ADB8; -D_8011ADBC = 0x8011ADBC; -D_8011ADC0 = 0x8011ADC0; -D_8011ADC4 = 0x8011ADC4; -D_8011ADC5 = 0x8011ADC5; -D_8011ADC8 = 0x8011ADC8; -D_8011ADCC = 0x8011ADCC; -D_8011ADD0 = 0x8011ADD0; -D_8011ADD4 = 0x8011ADD4; -D_8011ADD5 = 0x8011ADD5; -D_8011ADD8 = 0x8011ADD8; -D_8011AE00 = 0x8011AE00; -D_8011AE01 = 0x8011AE01; -D_8011AE02 = 0x8011AE02; -D_8011AE03 = 0x8011AE03; -D_8011AE08 = 0x8011AE08; -D_8011AE48 = 0x8011AE48; -D_8011AE4C = 0x8011AE4C; -D_8011AE50 = 0x8011AE50; -D_8011AE54 = 0x8011AE54; -objPtrList = 0x8011AE58; -objCount = 0x8011AE5C; -D_8011AE60 = 0x8011AE60; -D_8011AE64 = 0x8011AE64; -D_8011AE68 = 0x8011AE68; -D_8011AE6C = 0x8011AE6C; -D_8011AE70 = 0x8011AE70; -D_8011AE74 = 0x8011AE74; -D_8011AE78 = 0x8011AE78; -D_8011AE7A = 0x8011AE7A; -D_8011AE7C = 0x8011AE7C; -D_8011AE7E = 0x8011AE7E; -D_8011AE80 = 0x8011AE80; -D_8011AE82 = 0x8011AE82; -D_8011AE84 = 0x8011AE84; -D_8011AE88 = 0x8011AE88; -D_8011AE8C = 0x8011AE8C; -D_8011AE90 = 0x8011AE90; -D_8011AE94 = 0x8011AE94; -D_8011AE98 = 0x8011AE98; -D_8011AEA0 = 0x8011AEA0; -D_8011AEA4 = 0x8011AEA4; -D_8011AEA8 = 0x8011AEA8; -D_8011AEB0 = 0x8011AEB0; -D_8011AEB8 = 0x8011AEB8; -D_8011AEBC = 0x8011AEBC; -D_8011AEC0 = 0x8011AEC0; -particlePtrList = 0x8011AEC4; -particleCount = 0x8011AEC8; -D_8011AECC = 0x8011AECC; -D_8011AED0 = 0x8011AED0; -D_8011AED4 = 0x8011AED4; -D_8011AED8 = 0x8011AED8; -D_8011AEDC = 0x8011AEDC; -D_8011AEE0 = 0x8011AEE0; -playerStructArray_Ptr = 0x8011AEE4; -D_8011AEE8 = 0x8011AEE8; -D_8011AEEC = 0x8011AEEC; -playerCount = 0x8011AEF0; -D_8011AEF4 = 0x8011AEF4; -D_8011AEF5 = 0x8011AEF5; -D_8011AEF6 = 0x8011AEF6; -D_8011AEF7 = 0x8011AEF7; -D_8011AEF8 = 0x8011AEF8; -D_8011AEFC = 0x8011AEFC; -D_8011AF00 = 0x8011AF00; -D_8011AF04 = 0x8011AF04; -D_8011AF08 = 0x8011AF08; -D_8011AF10 = 0x8011AF10; -D_8011AF18 = 0x8011AF18; -D_8011AF2C = 0x8011AF2C; -D_8011AF30 = 0x8011AF30; -D_8011AF60 = 0x8011AF60; -D_8011AF68 = 0x8011AF68; -D_8011AFE8 = 0x8011AFE8; -D_8011AFEE = 0x8011AFEE; -D_8011AFF4 = 0x8011AFF4; -D_8011AFF8 = 0x8011AFF8; -D_8011AFFC = 0x8011AFFC; -D_8011B000 = 0x8011B000; -D_8011B004 = 0x8011B004; -D_8011B008 = 0x8011B008; -D_8011B010 = 0x8011B010; -D_8011B020 = 0x8011B020; -D_8011B048 = 0x8011B048; -D_8011B058 = 0x8011B058; -D_8011B068 = 0x8011B068; -D_8011B078 = 0x8011B078; -D_8011B07B = 0x8011B07B; -D_8011B0A0 = 0x8011B0A0; -D_8011B0A4 = 0x8011B0A4; -D_8011B0A8 = 0x8011B0A8; -D_8011B0AC = 0x8011B0AC; -D_8011B0B0 = 0x8011B0B0; -D_8011B0B4 = 0x8011B0B4; -D_8011B0B8 = 0x8011B0B8; -D_8011B0BC = 0x8011B0BC; -D_8011B0C0 = 0x8011B0C0; -D_8011B0C4 = 0x8011B0C4; -D_8011B0C8 = 0x8011B0C8; -D_8011B0CC = 0x8011B0CC; -D_8011B0D0 = 0x8011B0D0; -D_8011B0D4 = 0x8011B0D4; -D_8011B0DC = 0x8011B0DC; -D_8011B0E0 = 0x8011B0E0; -D_8011B0E1 = 0x8011B0E1; -D_8011B0E2 = 0x8011B0E2; -D_8011B0E3 = 0x8011B0E3; -D_8011B0E4 = 0x8011B0E4; -D_8011B0E8 = 0x8011B0E8; -D_8011B0EC = 0x8011B0EC; -D_8011B0F0 = 0x8011B0F0; -D_8011B0F4 = 0x8011B0F4; -D_8011B0F8 = 0x8011B0F8; -D_8011B0FC = 0x8011B0FC; -D_8011B100 = 0x8011B100; -D_8011B104 = 0x8011B104; -D_8011B108 = 0x8011B108; -D_8011B10C = 0x8011B10C; -D_8011B110 = 0x8011B110; -D_8011B114 = 0x8011B114; -D_8011B118 = 0x8011B118; -D_8011B120 = 0x8011B120; -D_8011B320 = 0x8011B320; -D_8011B330 = 0x8011B330; -D_8011C230 = 0x8011C230; -D_8011C238 = 0x8011C238; -D_8011C3B8 = 0x8011C3B8; -D_8011C8B8 = 0x8011C8B8; -D_8011D0B8 = 0x8011D0B8; -D_8011D0BC = 0x8011D0BC; -D_8011D0C0 = 0x8011D0C0; -D_8011D0C4 = 0x8011D0C4; -D_8011D0C8 = 0x8011D0C8; -D_8011D0CC = 0x8011D0CC; -D_8011D0CE = 0x8011D0CE; -D_8011D0D0 = 0x8011D0D0; -D_8011D0D4 = 0x8011D0D4; -D_8011D0D8 = 0x8011D0D8; -D_8011D0DC = 0x8011D0DC; -D_8011D0E0 = 0x8011D0E0; -D_8011D0E4 = 0x8011D0E4; -D_8011D0E8 = 0x8011D0E8; -D_8011D0EC = 0x8011D0EC; -D_8011D0F0 = 0x8011D0F0; -D_8011D0F4 = 0x8011D0F4; -D_8011D0F8 = 0x8011D0F8; -D_8011D128 = 0x8011D128; -D_8011D164 = 0x8011D164; -D_8011D2B8 = 0x8011D2B8; -D_8011D308 = 0x8011D308; -D_8011D30C = 0x8011D30C; -D_8011D310 = 0x8011D310; -D_8011D314 = 0x8011D314; -D_8011D318 = 0x8011D318; -D_8011D31C = 0x8011D31C; -D_8011D320 = 0x8011D320; -D_8011D330 = 0x8011D330; -D_8011D338 = 0x8011D338; -D_8011D348 = 0x8011D348; -D_8011D350 = 0x8011D350; -D_8011D360 = 0x8011D360; -D_8011D364 = 0x8011D364; -D_8011D368 = 0x8011D368; -D_8011D36C = 0x8011D36C; -D_8011D370 = 0x8011D370; -D_8011D374 = 0x8011D374; -D_8011D378 = 0x8011D378; -D_8011D37C = 0x8011D37C; -D_8011D380 = 0x8011D380; -D_8011D384 = 0x8011D384; -D_8011D388 = 0x8011D388; -D_8011D468 = 0x8011D468; -D_8011D474 = 0x8011D474; -D_8011D478 = 0x8011D478; -D_8011D47C = 0x8011D47C; -D_8011D480 = 0x8011D480; -D_8011D488 = 0x8011D488; -D_8011D490 = 0x8011D490; -D_8011D498 = 0x8011D498; -D_8011D49C = 0x8011D49C; -D_8011D49E = 0x8011D49E; -D_8011D4A0 = 0x8011D4A0; -D_8011D4A4 = 0x8011D4A4; -D_8011D4A8 = 0x8011D4A8; -D_8011D4AC = 0x8011D4AC; -D_8011D4B0 = 0x8011D4B0; -D_8011D4B4 = 0x8011D4B4; -D_8011D4B6 = 0x8011D4B6; -D_8011D4B8 = 0x8011D4B8; -D_8011D4BA = 0x8011D4BA; -D_8011D4BC = 0x8011D4BC; +/D_8011AD20 = 0x8011AD20; +/D_8011AD21 = 0x8011AD21; +/D_8011AD22 = 0x8011AD22; +/D_8011AD24 = 0x8011AD24; +/D_8011AD25 = 0x8011AD25; +/D_8011AD26 = 0x8011AD26; +/D_8011AD28 = 0x8011AD28; +/D_8011AD30 = 0x8011AD30; +/D_8011AD34 = 0x8011AD34; +/D_8011AD38 = 0x8011AD38; +/D_8011AD3C = 0x8011AD3C; +/D_8011AD3D = 0x8011AD3D; +/D_8011AD3E = 0x8011AD3E; +/D_8011AD40 = 0x8011AD40; +/D_8011AD44 = 0x8011AD44; +/D_8011AD45 = 0x8011AD45; +/D_8011AD46 = 0x8011AD46; +/D_8011AD48 = 0x8011AD48; +/D_8011AD4A = 0x8011AD4A; +/D_8011AD4C = 0x8011AD4C; +/D_8011AD4E = 0x8011AD4E; +/D_8011AD50 = 0x8011AD50; +/D_8011AD51 = 0x8011AD51; +/D_8011AD52 = 0x8011AD52; +/D_8011AD53 = 0x8011AD53; +/D_8011AD58 = 0x8011AD58; +/D_8011AD5C = 0x8011AD5C; +/D_8011AD60 = 0x8011AD60; +/D_8011AD64 = 0x8011AD64; +/D_8011AD68 = 0x8011AD68; +/D_8011AD6C = 0x8011AD6C; +/D_8011AD70 = 0x8011AD70; +/D_8011AD78 = 0x8011AD78; +/D_8011ADA0 = 0x8011ADA0; +/D_8011ADA4 = 0x8011ADA4; +/D_8011ADA8 = 0x8011ADA8; +/D_8011ADAC = 0x8011ADAC; + + +/D_8011ADB0 = 0x8011ADB0; +/D_8011ADB4 = 0x8011ADB4; +/D_8011ADB8 = 0x8011ADB8; +/D_8011ADBC = 0x8011ADBC; +/D_8011ADC0 = 0x8011ADC0; +/D_8011ADC4 = 0x8011ADC4; +/D_8011ADC5 = 0x8011ADC5; +/D_8011ADC8 = 0x8011ADC8; +/D_8011ADCC = 0x8011ADCC; +/D_8011ADD0 = 0x8011ADD0; +/D_8011ADD4 = 0x8011ADD4; +/D_8011ADD5 = 0x8011ADD5; +/D_8011ADD8 = 0x8011ADD8; +/D_8011AE00 = 0x8011AE00; +/D_8011AE01 = 0x8011AE01; +/D_8011AE02 = 0x8011AE02; +/D_8011AE03 = 0x8011AE03; +/D_8011AE08 = 0x8011AE08; +/D_8011AE48 = 0x8011AE48; +/D_8011AE4C = 0x8011AE4C; +/D_8011AE50 = 0x8011AE50; +/D_8011AE54 = 0x8011AE54; +/objPtrList = 0x8011AE58; +/objCount = 0x8011AE5C; +/D_8011AE60 = 0x8011AE60; +/D_8011AE64 = 0x8011AE64; +/D_8011AE68 = 0x8011AE68; +/D_8011AE6C = 0x8011AE6C; +/D_8011AE70 = 0x8011AE70; +/D_8011AE74 = 0x8011AE74; +/D_8011AE78 = 0x8011AE78; +/D_8011AE7A = 0x8011AE7A; +/D_8011AE7C = 0x8011AE7C; +/D_8011AE7E = 0x8011AE7E; +/D_8011AE80 = 0x8011AE80; +/D_8011AE82 = 0x8011AE82; +/D_8011AE84 = 0x8011AE84; +/D_8011AE88 = 0x8011AE88; +/D_8011AE8C = 0x8011AE8C; +/D_8011AE90 = 0x8011AE90; +/D_8011AE94 = 0x8011AE94; +/D_8011AE98 = 0x8011AE98; +/D_8011AEA0 = 0x8011AEA0; +/D_8011AEA4 = 0x8011AEA4; +/D_8011AEA8 = 0x8011AEA8; +/D_8011AEB0 = 0x8011AEB0; +/D_8011AEB8 = 0x8011AEB8; +/D_8011AEBC = 0x8011AEBC; +/D_8011AEC0 = 0x8011AEC0; +/particlePtrList = 0x8011AEC4; +/particleCount = 0x8011AEC8; + +/D_8011AECC = 0x8011AECC; +/D_8011AED0 = 0x8011AED0; +/D_8011AED4 = 0x8011AED4; +/D_8011AED8 = 0x8011AED8; +/D_8011AEDC = 0x8011AEDC; +/D_8011AEE0 = 0x8011AEE0; +/playerStructArray_Ptr = 0x8011AEE4; +/D_8011AEE8 = 0x8011AEE8; +/D_8011AEEC = 0x8011AEEC; +/playerCount = 0x8011AEF0; +/D_8011AEF4 = 0x8011AEF4; +/D_8011AEF5 = 0x8011AEF5; +/D_8011AEF6 = 0x8011AEF6; +/D_8011AEF7 = 0x8011AEF7; +/D_8011AEF8 = 0x8011AEF8; +/D_8011AEFC = 0x8011AEFC; +/D_8011AF00 = 0x8011AF00; +/D_8011AF04 = 0x8011AF04; +/D_8011AF08 = 0x8011AF08; +/D_8011AF10 = 0x8011AF10; +/D_8011AF18 = 0x8011AF18; +/D_8011AF2C = 0x8011AF2C; +/D_8011AF30 = 0x8011AF30; +/D_8011AF60 = 0x8011AF60; +/D_8011AF68 = 0x8011AF68; + +/D_8011AFE8 = 0x8011AFE8; +/D_8011AFEE = 0x8011AFEE; +/D_8011AFF4 = 0x8011AFF4; +/D_8011AFF8 = 0x8011AFF8; +/D_8011AFFC = 0x8011AFFC; +/D_8011B000 = 0x8011B000; +/D_8011B004 = 0x8011B004; +/D_8011B008 = 0x8011B008; +/D_8011B010 = 0x8011B010; +/D_8011B020 = 0x8011B020; +/D_8011B048 = 0x8011B048; +/D_8011B058 = 0x8011B058; +/D_8011B068 = 0x8011B068; +/D_8011B078 = 0x8011B078; +/D_8011B07B = 0x8011B07B; + +/D_8011B0A0 = 0x8011B0A0; +/D_8011B0A4 = 0x8011B0A4; +/D_8011B0A8 = 0x8011B0A8; +/D_8011B0AC = 0x8011B0AC; +/D_8011B0B0 = 0x8011B0B0; +/D_8011B0B4 = 0x8011B0B4; +/D_8011B0B8 = 0x8011B0B8; +/D_8011B0BC = 0x8011B0BC; +/D_8011B0C0 = 0x8011B0C0; +/D_8011B0C4 = 0x8011B0C4; +/D_8011B0C8 = 0x8011B0C8; +/D_8011B0CC = 0x8011B0CC; +/D_8011B0D0 = 0x8011B0D0; +/D_8011B0D4 = 0x8011B0D4; +/D_8011B0DC = 0x8011B0DC; +/D_8011B0E0 = 0x8011B0E0; +/D_8011B0E1 = 0x8011B0E1; +/D_8011B0E2 = 0x8011B0E2; +/D_8011B0E3 = 0x8011B0E3; +/D_8011B0E4 = 0x8011B0E4; +/D_8011B0E8 = 0x8011B0E8; +/D_8011B0EC = 0x8011B0EC; +/D_8011B0F0 = 0x8011B0F0; +/D_8011B0F4 = 0x8011B0F4; +/D_8011B0F8 = 0x8011B0F8; +/D_8011B0FC = 0x8011B0FC; +/D_8011B100 = 0x8011B100; +/D_8011B104 = 0x8011B104; +/D_8011B108 = 0x8011B108; +/D_8011B10C = 0x8011B10C; +/D_8011B110 = 0x8011B110; +/D_8011B114 = 0x8011B114; +/D_8011B118 = 0x8011B118; +/D_8011B120 = 0x8011B120; +/D_8011B320 = 0x8011B320; +/D_8011B330 = 0x8011B330; +/D_8011C230 = 0x8011C230; +/D_8011C238 = 0x8011C238; +/D_8011C3B8 = 0x8011C3B8; +/D_8011C8B8 = 0x8011C8B8; +/D_8011D0B8 = 0x8011D0B8; +/D_8011D0BC = 0x8011D0BC; +/D_8011D0C0 = 0x8011D0C0; +/D_8011D0C4 = 0x8011D0C4; +/D_8011D0C8 = 0x8011D0C8; +/D_8011D0CC = 0x8011D0CC; +/D_8011D0CE = 0x8011D0CE; +/D_8011D0D0 = 0x8011D0D0; +/D_8011D0D4 = 0x8011D0D4; +/D_8011D0D8 = 0x8011D0D8; +/D_8011D0DC = 0x8011D0DC; +/D_8011D0E0 = 0x8011D0E0; +/D_8011D0E4 = 0x8011D0E4; +/D_8011D0E8 = 0x8011D0E8; +/D_8011D0EC = 0x8011D0EC; +/D_8011D0F0 = 0x8011D0F0; +/D_8011D0F4 = 0x8011D0F4; +/D_8011D0F8 = 0x8011D0F8; +/D_8011D128 = 0x8011D128; +/D_8011D164 = 0x8011D164; +/D_8011D2B8 = 0x8011D2B8; +/D_8011D308 = 0x8011D308; +/D_8011D30C = 0x8011D30C; +/D_8011D310 = 0x8011D310; +/D_8011D314 = 0x8011D314; +/D_8011D318 = 0x8011D318; +/D_8011D31C = 0x8011D31C; +/D_8011D320 = 0x8011D320; +/D_8011D330 = 0x8011D330; +/D_8011D338 = 0x8011D338; +/D_8011D348 = 0x8011D348; +/D_8011D350 = 0x8011D350; +/D_8011D360 = 0x8011D360; +/D_8011D364 = 0x8011D364; +/D_8011D368 = 0x8011D368; +/D_8011D36C = 0x8011D36C; +/D_8011D370 = 0x8011D370; +/D_8011D374 = 0x8011D374; +/D_8011D378 = 0x8011D378; +/D_8011D37C = 0x8011D37C; +/D_8011D380 = 0x8011D380; +/D_8011D384 = 0x8011D384; +/D_8011D388 = 0x8011D388; +/D_8011D468 = 0x8011D468; +/D_8011D474 = 0x8011D474; +/D_8011D478 = 0x8011D478; +/D_8011D47C = 0x8011D47C; +/D_8011D480 = 0x8011D480; +/D_8011D488 = 0x8011D488; +/D_8011D490 = 0x8011D490; +/D_8011D498 = 0x8011D498; +/D_8011D49C = 0x8011D49C; +/D_8011D49E = 0x8011D49E; +/D_8011D4A0 = 0x8011D4A0; +/D_8011D4A4 = 0x8011D4A4; +/D_8011D4A8 = 0x8011D4A8; +/D_8011D4AC = 0x8011D4AC; +/D_8011D4B0 = 0x8011D4B0; +/D_8011D4B4 = 0x8011D4B4; +/D_8011D4B6 = 0x8011D4B6; +/D_8011D4B8 = 0x8011D4B8; +/D_8011D4BA = 0x8011D4BA; +/D_8011D4BC = 0x8011D4BC; + D_8011D4C0 = 0x8011D4C0; D_8011D4C4 = 0x8011D4C4; D_8011D4C8 = 0x8011D4C8; From 0153108b37bf8b68ec734bbe46cf72311aac134a Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 19:12:06 -0500 Subject: [PATCH 28/39] Added bss for unknown_032760, unknown_0348C0 --- bss.txt | 10 ---------- src/unknown_032760.c | 9 +++++++++ src/unknown_0348C0.c | 11 ++++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bss.txt b/bss.txt index 9733b080..fb04cfc9 100644 --- a/bss.txt +++ b/bss.txt @@ -14,19 +14,9 @@ unknown_0255E0 unknown_032760 -D_8011D4C0; -D_8011D4C4; -D_8011D4C8; -D_8011D4CC; -D_8011D4D0; unknown_0348C0 -D_8011D4D4; -D_8011D4D8; -D_8011D4DC; -D_8011D4E0; -D_8011D4E2; unknown_043920 diff --git a/src/unknown_032760.c b/src/unknown_032760.c index d08659d5..bb311769 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -19,6 +19,15 @@ s32 D_800DC968 = 0; // Currently unknown, might be a different type. /*******************************/ +/************ .bss ************/ + +s32 D_8011D4C0; +s32 D_8011D4C4; +s32 D_8011D4C8; +s32 D_8011D4CC; + +/*******************************/ + void func_80031B60(void) { if (D_800DC950 != 0) { func_80071140(D_800DC950); diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 7865610b..21551a45 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -106,11 +106,12 @@ u16 D_800DCB28[20] = { /************ .bss ************/ -extern f32 D_8011D4D0; -extern s32 D_8011D4D4; -extern s32 D_8011D4D8; -extern s32 D_8011D4DC; -extern s16 D_8011D4E2; +f32 D_8011D4D0; +s32 D_8011D4D4; +s32 D_8011D4D8; +s32 D_8011D4DC; +s16 D_8011D4E0; +s16 D_8011D4E2; /******************************/ From 3cc8b1e40fb283e9deb67beea9f796326e75e4a8 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 19:51:50 -0500 Subject: [PATCH 29/39] Added bss for unknown_043920, _05CEF0, and _05DCD0 --- bss.txt | 68 -------- src/unknown_043920.c | 100 ++++++++--- src/unknown_05CEF0.c | 9 + src/unknown_05DCD0.c | 15 ++ undefined_syms.txt | 388 ------------------------------------------- 5 files changed, 100 insertions(+), 480 deletions(-) diff --git a/bss.txt b/bss.txt index fb04cfc9..8455e0b1 100644 --- a/bss.txt +++ b/bss.txt @@ -20,80 +20,12 @@ unknown_0348C0 unknown_043920 -D_8011D4F0; -D_8011D4F8; -D_8011D504; -D_8011D508; -D_8011D510; -D_8011D528; -D_8011D52C; -D_8011D530; -D_8011D534; -D_8011D538; -D_8011D53C; -D_8011D540; -D_8011D544; -D_8011D548; -D_8011D54C; -D_8011D550; -D_8011D552; -D_8011D553; -D_8011D554; -D_8011D558; -D_8011D55C; -D_8011D560; -D_8011D564; -D_8011D568; -D_8011D56C; -D_8011D570; -D_8011D574; -D_8011D578; -D_8011D57C; -D_8011D580; -D_8011D581; -D_8011D582; -D_8011D583; -D_8011D584; -D_8011D585; -D_8011D586; -D_8011D588; -D_8011D589; -D_8011D58A; -D_8011D58B; -D_8011D58C; -D_8011D58D; -D_8011D58E; -D_8011D58F; -D_8011D590; -D_8011D598; -D_8011D59C; -D_8011D59D; -D_8011D59E; -D_8011D5A0; -D_8011D5A4; -D_8011D5A8; -D_8011D5AC; -D_8011D5AE; -D_8011D5B0; -D_8011D5B4; -D_8011D5B8; -D_8011D5BA; -D_8011D5BB; -D_8011D5BC; unknown_05CEF0 -D_8011D5C0; -D_8011D5C4; -D_8011D5C8; -D_8011D5CC; unknown_05DCD0 -D_8011D5D0; -D_8011D5D1; -D_8011D5E0; -D_8011D5E1; unknown_05F0C0 diff --git a/src/unknown_043920.c b/src/unknown_043920.c index d449b844..9db5fff7 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -118,19 +118,82 @@ const char D_800E62A0[] = "Back\n"; /************ .bss ************/ -extern s32 D_8011D528; -extern s32 D_8011D55C; -extern s8 D_8011D582; -extern s8 D_8011D583; -extern s8 D_8011D584; -extern s32 D_8011D598; -extern s8 D_8011D59C; -extern s8 D_8011D59D; -extern s16 D_8011D59E; -extern u32 D_8011D590[]; -extern s16 D_8011D5A0[]; -extern s16 D_8011D5A8[]; -extern s16 D_8011D5AC; +s32 D_8011D4F0[2]; +s32 D_8011D4F8[3]; +s32 D_8011D504; +s32 D_8011D508[2]; + +/* Size: 0x18 bytes */ +typedef struct unk8011D510 { + s16 unk0; + s16 unk2; + s16 unk4; + u16 unk6; + f32 unk8; + f32 unkC; + f32 unk10; + f32 unk14; +} unk8011D510; +unk8011D510 D_8011D510; + +s32 D_8011D528; +s32 D_8011D52C; +s32 D_8011D530; +s32 D_8011D534; +s32 D_8011D538; +s32 D_8011D53C; +s32 D_8011D540; +s32 D_8011D544; +s32 D_8011D548; +s32 D_8011D54C; +s16 D_8011D550; +s8 D_8011D552; +s8 D_8011D553; +s32 D_8011D554; +s32 D_8011D558; +s32 D_8011D55C; +s32 D_8011D560; +s32 D_8011D564; +s32 D_8011D568; +s32 D_8011D56C; +s32 D_8011D570; +s32 D_8011D574; +s32 D_8011D578; +s32 D_8011D57C; +s8 D_8011D580; +s8 D_8011D581; +s8 D_8011D582; +s8 D_8011D583; +s8 D_8011D584; +s8 D_8011D585; +s8 D_8011D586; +s8 D_8011D587; +s8 D_8011D588; +s8 D_8011D589; +s8 D_8011D58A; +s8 D_8011D58B; +s8 D_8011D58C; +s8 D_8011D58D; +s8 D_8011D58E; +s8 D_8011D58F; +u32 D_8011D590[2]; +s32 D_8011D598; +s8 D_8011D59C; +s8 D_8011D59D; +s16 D_8011D59E; +s16 D_8011D5A0[2]; +s32 D_8011D5A4; +s16 D_8011D5A8[2]; +s16 D_8011D5AC; +s16 D_8011D5AE; +s32 D_8011D5B0; +s32 D_8011D5B4; +s16 D_8011D5B8; +s8 D_8011D5BA; +s8 D_8011D5BB; +s8 D_8011D5BC; + +/******************************/ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80042D20.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80043ECC.s") @@ -286,17 +349,6 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80052B64.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80052D7C.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80053478.s") -/* Unknown Size */ -typedef struct unk8011D510 { - s16 unk0; - s16 unk2; - s16 unk4; - u16 unk6; - f32 unk8; - f32 unkC; - f32 unk10; - f32 unk14; -} unk8011D510; extern unk8011D510 D_8011D510; diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index 35d56ac7..ec1d1c23 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -17,6 +17,15 @@ s16 D_800DCDE0[16] = { /*******************************/ +/************ .bss ************/ + +s32 D_8011D5C0; +s32 D_8011D5C4; +s32 D_8011D5C8; +s32 D_8011D5CC; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C2F0.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005C364.s") GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005CA78.s") diff --git a/src/unknown_05DCD0.c b/src/unknown_05DCD0.c index 8a9bc51d..7ce872d5 100644 --- a/src/unknown_05DCD0.c +++ b/src/unknown_05DCD0.c @@ -24,6 +24,21 @@ s16 D_800DCE20[16] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D5D0; +s8 D_8011D5D1; + +// These 3 might be a file boundary. +s32 D_8011D5D4; +s32 D_8011D5D8; +s32 D_8011D5DC; + +s8 D_8011D5E0; +s8 D_8011D5E1; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D0D0.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005D820.s") GLOBAL_ASM("asm/non_matchings/unknown_05DCD0/func_8005E204.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index ed8ceeeb..360b2931 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,394 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/gALHeap = 0x80115CE8; -/ALSeqFile_80115CF8 = 0x80115CF8; -/D_80115CFC = 0x80115CFC; -/D_80115D00 = 0x80115D00; -/D_80115D04 = 0x80115D04; -/D_80115D05 = 0x80115D05; -/musicTempo = 0x80115D08; -/D_80115D0C = 0x80115D0C; -/ALBankFile_80115D10 = 0x80115D10; -/ALBankFile_80115D14 = 0x80115D14; -/D_80115D18 = 0x80115D18; -/D_80115D1C = 0x80115D1C; -/D_80115D20 = 0x80115D20; -/D_80115D24 = 0x80115D24; -/D_80115D28 = 0x80115D28; -/D_80115D2C = 0x80115D2C; -/D_80115D30 = 0x80115D30; -/D_80115D34 = 0x80115D34; -/D_80115D38 = 0x80115D38; -/D_80115D3C = 0x80115D3C; -/D_80115D40 = 0x80115D40; -/D_80115D41 = 0x80115D41; -/D_80115D48 = 0x80115D48; -/D_80115D88 = 0x80115D88; -/D_80115E80 = 0x80115E80; -/D_80115F78 = 0x80115F78; -/D_80115F79 = 0x80115F79; -/D_80115F7C = 0x80115F7C; -/D_80115F80 = 0x80115F80; -/D_80115F84 = 0x80115F84; -/D_80115F88 = 0x80115F88; - -/D_80115F90 = 0x80115F90; -/D_80115F94 = 0x80115F94; -/D_80115F98 = 0x80115F98; -/D_80115FA0 = 0x80115FA0; -/audioThread = 0x80115FB0; -/OSMesgQueue_80116160 = 0x80116160; -/D_80116178 = 0x80116178; -/D_80116198 = 0x80116198; -/D_801161B0 = 0x801161B0; -/ALGlobals_801161D0 = 0x801161D0; -/D_80116220 = 0x80116220; -/D_80119230 = 0x80119230; -/D_80119240 = 0x80119240; -/D_80119628 = 0x80119628; -/D_8011962C = 0x8011962C; -/D_80119630 = 0x80119630; -/D_80119634 = 0x80119634; -/D_80119638 = 0x80119638; -/D_80119640 = 0x80119640; -/D_80119AF0 = 0x80119AF0; -/D_80119B08 = 0x80119B08; -/D_80119C28 = 0x80119C28; - -/D_80119C30 = 0x80119C30; -/D_80119C38 = 0x80119C38; -/D_80119C3C = 0x80119C3C; -/D_80119C40 = 0x80119C40; -/D_80119C44 = 0x80119C44; -/D_80119C48 = 0x80119C48; -/D_80119C4C = 0x80119C4C; -/D_80119C50 = 0x80119C50; -/D_80119C58 = 0x80119C58; -/D_80119C5C = 0x80119C5C; -/D_80119C60 = 0x80119C60; -/D_8011A6D8 = 0x8011A6D8; -/D_8011A6DC = 0x8011A6DC; -/D_8011A6E0 = 0x8011A6E0; -/D_8011AC18 = 0x8011AC18; -/D_8011AC1C = 0x8011AC1C; -/D_8011AC20 = 0x8011AC20; - -/D_8011AD20 = 0x8011AD20; -/D_8011AD21 = 0x8011AD21; -/D_8011AD22 = 0x8011AD22; -/D_8011AD24 = 0x8011AD24; -/D_8011AD25 = 0x8011AD25; -/D_8011AD26 = 0x8011AD26; -/D_8011AD28 = 0x8011AD28; -/D_8011AD30 = 0x8011AD30; -/D_8011AD34 = 0x8011AD34; -/D_8011AD38 = 0x8011AD38; -/D_8011AD3C = 0x8011AD3C; -/D_8011AD3D = 0x8011AD3D; -/D_8011AD3E = 0x8011AD3E; -/D_8011AD40 = 0x8011AD40; -/D_8011AD44 = 0x8011AD44; -/D_8011AD45 = 0x8011AD45; -/D_8011AD46 = 0x8011AD46; -/D_8011AD48 = 0x8011AD48; -/D_8011AD4A = 0x8011AD4A; -/D_8011AD4C = 0x8011AD4C; -/D_8011AD4E = 0x8011AD4E; -/D_8011AD50 = 0x8011AD50; -/D_8011AD51 = 0x8011AD51; -/D_8011AD52 = 0x8011AD52; -/D_8011AD53 = 0x8011AD53; -/D_8011AD58 = 0x8011AD58; -/D_8011AD5C = 0x8011AD5C; -/D_8011AD60 = 0x8011AD60; -/D_8011AD64 = 0x8011AD64; -/D_8011AD68 = 0x8011AD68; -/D_8011AD6C = 0x8011AD6C; -/D_8011AD70 = 0x8011AD70; -/D_8011AD78 = 0x8011AD78; -/D_8011ADA0 = 0x8011ADA0; -/D_8011ADA4 = 0x8011ADA4; -/D_8011ADA8 = 0x8011ADA8; -/D_8011ADAC = 0x8011ADAC; - - -/D_8011ADB0 = 0x8011ADB0; -/D_8011ADB4 = 0x8011ADB4; -/D_8011ADB8 = 0x8011ADB8; -/D_8011ADBC = 0x8011ADBC; -/D_8011ADC0 = 0x8011ADC0; -/D_8011ADC4 = 0x8011ADC4; -/D_8011ADC5 = 0x8011ADC5; -/D_8011ADC8 = 0x8011ADC8; -/D_8011ADCC = 0x8011ADCC; -/D_8011ADD0 = 0x8011ADD0; -/D_8011ADD4 = 0x8011ADD4; -/D_8011ADD5 = 0x8011ADD5; -/D_8011ADD8 = 0x8011ADD8; -/D_8011AE00 = 0x8011AE00; -/D_8011AE01 = 0x8011AE01; -/D_8011AE02 = 0x8011AE02; -/D_8011AE03 = 0x8011AE03; -/D_8011AE08 = 0x8011AE08; -/D_8011AE48 = 0x8011AE48; -/D_8011AE4C = 0x8011AE4C; -/D_8011AE50 = 0x8011AE50; -/D_8011AE54 = 0x8011AE54; -/objPtrList = 0x8011AE58; -/objCount = 0x8011AE5C; -/D_8011AE60 = 0x8011AE60; -/D_8011AE64 = 0x8011AE64; -/D_8011AE68 = 0x8011AE68; -/D_8011AE6C = 0x8011AE6C; -/D_8011AE70 = 0x8011AE70; -/D_8011AE74 = 0x8011AE74; -/D_8011AE78 = 0x8011AE78; -/D_8011AE7A = 0x8011AE7A; -/D_8011AE7C = 0x8011AE7C; -/D_8011AE7E = 0x8011AE7E; -/D_8011AE80 = 0x8011AE80; -/D_8011AE82 = 0x8011AE82; -/D_8011AE84 = 0x8011AE84; -/D_8011AE88 = 0x8011AE88; -/D_8011AE8C = 0x8011AE8C; -/D_8011AE90 = 0x8011AE90; -/D_8011AE94 = 0x8011AE94; -/D_8011AE98 = 0x8011AE98; -/D_8011AEA0 = 0x8011AEA0; -/D_8011AEA4 = 0x8011AEA4; -/D_8011AEA8 = 0x8011AEA8; -/D_8011AEB0 = 0x8011AEB0; -/D_8011AEB8 = 0x8011AEB8; -/D_8011AEBC = 0x8011AEBC; -/D_8011AEC0 = 0x8011AEC0; -/particlePtrList = 0x8011AEC4; -/particleCount = 0x8011AEC8; - -/D_8011AECC = 0x8011AECC; -/D_8011AED0 = 0x8011AED0; -/D_8011AED4 = 0x8011AED4; -/D_8011AED8 = 0x8011AED8; -/D_8011AEDC = 0x8011AEDC; -/D_8011AEE0 = 0x8011AEE0; -/playerStructArray_Ptr = 0x8011AEE4; -/D_8011AEE8 = 0x8011AEE8; -/D_8011AEEC = 0x8011AEEC; -/playerCount = 0x8011AEF0; -/D_8011AEF4 = 0x8011AEF4; -/D_8011AEF5 = 0x8011AEF5; -/D_8011AEF6 = 0x8011AEF6; -/D_8011AEF7 = 0x8011AEF7; -/D_8011AEF8 = 0x8011AEF8; -/D_8011AEFC = 0x8011AEFC; -/D_8011AF00 = 0x8011AF00; -/D_8011AF04 = 0x8011AF04; -/D_8011AF08 = 0x8011AF08; -/D_8011AF10 = 0x8011AF10; -/D_8011AF18 = 0x8011AF18; -/D_8011AF2C = 0x8011AF2C; -/D_8011AF30 = 0x8011AF30; -/D_8011AF60 = 0x8011AF60; -/D_8011AF68 = 0x8011AF68; - -/D_8011AFE8 = 0x8011AFE8; -/D_8011AFEE = 0x8011AFEE; -/D_8011AFF4 = 0x8011AFF4; -/D_8011AFF8 = 0x8011AFF8; -/D_8011AFFC = 0x8011AFFC; -/D_8011B000 = 0x8011B000; -/D_8011B004 = 0x8011B004; -/D_8011B008 = 0x8011B008; -/D_8011B010 = 0x8011B010; -/D_8011B020 = 0x8011B020; -/D_8011B048 = 0x8011B048; -/D_8011B058 = 0x8011B058; -/D_8011B068 = 0x8011B068; -/D_8011B078 = 0x8011B078; -/D_8011B07B = 0x8011B07B; - -/D_8011B0A0 = 0x8011B0A0; -/D_8011B0A4 = 0x8011B0A4; -/D_8011B0A8 = 0x8011B0A8; -/D_8011B0AC = 0x8011B0AC; -/D_8011B0B0 = 0x8011B0B0; -/D_8011B0B4 = 0x8011B0B4; -/D_8011B0B8 = 0x8011B0B8; -/D_8011B0BC = 0x8011B0BC; -/D_8011B0C0 = 0x8011B0C0; -/D_8011B0C4 = 0x8011B0C4; -/D_8011B0C8 = 0x8011B0C8; -/D_8011B0CC = 0x8011B0CC; -/D_8011B0D0 = 0x8011B0D0; -/D_8011B0D4 = 0x8011B0D4; -/D_8011B0DC = 0x8011B0DC; -/D_8011B0E0 = 0x8011B0E0; -/D_8011B0E1 = 0x8011B0E1; -/D_8011B0E2 = 0x8011B0E2; -/D_8011B0E3 = 0x8011B0E3; -/D_8011B0E4 = 0x8011B0E4; -/D_8011B0E8 = 0x8011B0E8; -/D_8011B0EC = 0x8011B0EC; -/D_8011B0F0 = 0x8011B0F0; -/D_8011B0F4 = 0x8011B0F4; -/D_8011B0F8 = 0x8011B0F8; -/D_8011B0FC = 0x8011B0FC; -/D_8011B100 = 0x8011B100; -/D_8011B104 = 0x8011B104; -/D_8011B108 = 0x8011B108; -/D_8011B10C = 0x8011B10C; -/D_8011B110 = 0x8011B110; -/D_8011B114 = 0x8011B114; -/D_8011B118 = 0x8011B118; -/D_8011B120 = 0x8011B120; -/D_8011B320 = 0x8011B320; -/D_8011B330 = 0x8011B330; -/D_8011C230 = 0x8011C230; -/D_8011C238 = 0x8011C238; -/D_8011C3B8 = 0x8011C3B8; -/D_8011C8B8 = 0x8011C8B8; -/D_8011D0B8 = 0x8011D0B8; -/D_8011D0BC = 0x8011D0BC; -/D_8011D0C0 = 0x8011D0C0; -/D_8011D0C4 = 0x8011D0C4; -/D_8011D0C8 = 0x8011D0C8; -/D_8011D0CC = 0x8011D0CC; -/D_8011D0CE = 0x8011D0CE; -/D_8011D0D0 = 0x8011D0D0; -/D_8011D0D4 = 0x8011D0D4; -/D_8011D0D8 = 0x8011D0D8; -/D_8011D0DC = 0x8011D0DC; -/D_8011D0E0 = 0x8011D0E0; -/D_8011D0E4 = 0x8011D0E4; -/D_8011D0E8 = 0x8011D0E8; -/D_8011D0EC = 0x8011D0EC; -/D_8011D0F0 = 0x8011D0F0; -/D_8011D0F4 = 0x8011D0F4; -/D_8011D0F8 = 0x8011D0F8; -/D_8011D128 = 0x8011D128; -/D_8011D164 = 0x8011D164; -/D_8011D2B8 = 0x8011D2B8; -/D_8011D308 = 0x8011D308; -/D_8011D30C = 0x8011D30C; -/D_8011D310 = 0x8011D310; -/D_8011D314 = 0x8011D314; -/D_8011D318 = 0x8011D318; -/D_8011D31C = 0x8011D31C; -/D_8011D320 = 0x8011D320; -/D_8011D330 = 0x8011D330; -/D_8011D338 = 0x8011D338; -/D_8011D348 = 0x8011D348; -/D_8011D350 = 0x8011D350; -/D_8011D360 = 0x8011D360; -/D_8011D364 = 0x8011D364; -/D_8011D368 = 0x8011D368; -/D_8011D36C = 0x8011D36C; -/D_8011D370 = 0x8011D370; -/D_8011D374 = 0x8011D374; -/D_8011D378 = 0x8011D378; -/D_8011D37C = 0x8011D37C; -/D_8011D380 = 0x8011D380; -/D_8011D384 = 0x8011D384; -/D_8011D388 = 0x8011D388; -/D_8011D468 = 0x8011D468; -/D_8011D474 = 0x8011D474; -/D_8011D478 = 0x8011D478; -/D_8011D47C = 0x8011D47C; -/D_8011D480 = 0x8011D480; -/D_8011D488 = 0x8011D488; -/D_8011D490 = 0x8011D490; -/D_8011D498 = 0x8011D498; -/D_8011D49C = 0x8011D49C; -/D_8011D49E = 0x8011D49E; -/D_8011D4A0 = 0x8011D4A0; -/D_8011D4A4 = 0x8011D4A4; -/D_8011D4A8 = 0x8011D4A8; -/D_8011D4AC = 0x8011D4AC; -/D_8011D4B0 = 0x8011D4B0; -/D_8011D4B4 = 0x8011D4B4; -/D_8011D4B6 = 0x8011D4B6; -/D_8011D4B8 = 0x8011D4B8; -/D_8011D4BA = 0x8011D4BA; -/D_8011D4BC = 0x8011D4BC; - -D_8011D4C0 = 0x8011D4C0; -D_8011D4C4 = 0x8011D4C4; -D_8011D4C8 = 0x8011D4C8; -D_8011D4CC = 0x8011D4CC; -D_8011D4D0 = 0x8011D4D0; -D_8011D4D4 = 0x8011D4D4; -D_8011D4D8 = 0x8011D4D8; -D_8011D4DC = 0x8011D4DC; -D_8011D4E0 = 0x8011D4E0; -D_8011D4E2 = 0x8011D4E2; -D_8011D4F0 = 0x8011D4F0; -D_8011D4F8 = 0x8011D4F8; -D_8011D504 = 0x8011D504; -D_8011D508 = 0x8011D508; -D_8011D510 = 0x8011D510; -D_8011D528 = 0x8011D528; -D_8011D52C = 0x8011D52C; -D_8011D530 = 0x8011D530; -D_8011D534 = 0x8011D534; -D_8011D538 = 0x8011D538; -D_8011D53C = 0x8011D53C; -D_8011D540 = 0x8011D540; -D_8011D544 = 0x8011D544; -D_8011D548 = 0x8011D548; -D_8011D54C = 0x8011D54C; -D_8011D550 = 0x8011D550; -D_8011D552 = 0x8011D552; -D_8011D553 = 0x8011D553; -D_8011D554 = 0x8011D554; -D_8011D558 = 0x8011D558; -D_8011D55C = 0x8011D55C; -D_8011D560 = 0x8011D560; -D_8011D564 = 0x8011D564; -D_8011D568 = 0x8011D568; -D_8011D56C = 0x8011D56C; -D_8011D570 = 0x8011D570; -D_8011D574 = 0x8011D574; -D_8011D578 = 0x8011D578; -D_8011D57C = 0x8011D57C; -D_8011D580 = 0x8011D580; -D_8011D581 = 0x8011D581; -D_8011D582 = 0x8011D582; -D_8011D583 = 0x8011D583; -D_8011D584 = 0x8011D584; -D_8011D585 = 0x8011D585; -D_8011D586 = 0x8011D586; -D_8011D588 = 0x8011D588; -D_8011D589 = 0x8011D589; -D_8011D58A = 0x8011D58A; -D_8011D58B = 0x8011D58B; -D_8011D58C = 0x8011D58C; -D_8011D58D = 0x8011D58D; -D_8011D58E = 0x8011D58E; -D_8011D58F = 0x8011D58F; -D_8011D590 = 0x8011D590; -D_8011D598 = 0x8011D598; -D_8011D59C = 0x8011D59C; -D_8011D59D = 0x8011D59D; -D_8011D59E = 0x8011D59E; -D_8011D5A0 = 0x8011D5A0; -D_8011D5A4 = 0x8011D5A4; -D_8011D5A8 = 0x8011D5A8; -D_8011D5AC = 0x8011D5AC; -D_8011D5AE = 0x8011D5AE; -D_8011D5B0 = 0x8011D5B0; -D_8011D5B4 = 0x8011D5B4; -D_8011D5B8 = 0x8011D5B8; -D_8011D5BA = 0x8011D5BA; -D_8011D5BB = 0x8011D5BB; -D_8011D5BC = 0x8011D5BC; -D_8011D5C0 = 0x8011D5C0; -D_8011D5C4 = 0x8011D5C4; -D_8011D5C8 = 0x8011D5C8; -D_8011D5CC = 0x8011D5CC; -D_8011D5D0 = 0x8011D5D0; -D_8011D5D1 = 0x8011D5D1; -D_8011D5E0 = 0x8011D5E0; -D_8011D5E1 = 0x8011D5E1; D_8011D5F0 = 0x8011D5F0; D_8011D5F1 = 0x8011D5F1; D_8011D600 = 0x8011D600; From 9b55d0e9a4723fe7e525551692e172b94bf24aaa Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 20:00:10 -0500 Subject: [PATCH 30/39] Added bss for unknown_05F0C0, _05F690, _05FF10, _060450 --- bss.txt | 16 ---------------- src/unknown_05F0C0.c | 7 +++++++ src/unknown_05F690.c | 7 +++++++ src/unknown_05FF10.c | 8 +++++++- src/unknown_060450.c | 15 +++++++++++++++ undefined_syms.txt | 33 +++++++++++++++++---------------- 6 files changed, 53 insertions(+), 33 deletions(-) diff --git a/bss.txt b/bss.txt index 8455e0b1..7ae3dcaf 100644 --- a/bss.txt +++ b/bss.txt @@ -29,25 +29,9 @@ unknown_05DCD0 unknown_05F0C0 -D_8011D5F0; -D_8011D5F1; unknown_05F690 -D_8011D600; -D_8011D601; -D_8011D610; -D_8011D611; -D_8011D620; -D_8011D624; -D_8011D628; -D_8011D62C; -D_8011D630; -D_8011D634; -D_8011D638; -D_8011D63C; -D_8011D640; -D_8011D644; unknown_0667D0 diff --git a/src/unknown_05F0C0.c b/src/unknown_05F0C0.c index 65b25ea5..b6e5cb84 100644 --- a/src/unknown_05F0C0.c +++ b/src/unknown_05F0C0.c @@ -17,4 +17,11 @@ s16 D_800DCE40[16] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D5F0; +s8 D_8011D5F1; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F0C0/func_8005E4C0.s") diff --git a/src/unknown_05F690.c b/src/unknown_05F690.c index 91dfbb81..015eb0fc 100644 --- a/src/unknown_05F690.c +++ b/src/unknown_05F690.c @@ -17,4 +17,11 @@ s16 D_800DCE60[14] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D600; +s8 D_8011D601; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005EA90.s") diff --git a/src/unknown_05FF10.c b/src/unknown_05FF10.c index 679bd6d1..3d08b515 100644 --- a/src/unknown_05FF10.c +++ b/src/unknown_05FF10.c @@ -6,7 +6,6 @@ #include "types.h" #include "macros.h" - /************ .data ************/ s16 D_800DCE80[14] = { @@ -18,4 +17,11 @@ s16 D_800DCE80[14] = { /*******************************/ +/************ .bss ************/ + +s8 D_8011D610; +s8 D_8011D611; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F310.s") \ No newline at end of file diff --git a/src/unknown_060450.c b/src/unknown_060450.c index abb9907f..092094ef 100644 --- a/src/unknown_060450.c +++ b/src/unknown_060450.c @@ -22,6 +22,21 @@ const char D_800E6BE0[] = "MOD Error: Tryed to deallocate non-existent model!!\n /*********************************/ +/************ .bss ************/ + +s32 D_8011D620; +s32 D_8011D624; +s32 D_8011D628; +s32 D_8011D62C; +s32 D_8011D630; +s32 D_8011D634; +s32 D_8011D638; +s32 D_8011D63C; +s32 D_8011D640; +s32 D_8011D644; + +/******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F850.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005F99C.s") GLOBAL_ASM("asm/non_matchings/unknown_05F690/func_8005FCD0.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index 360b2931..273e949e 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,22 +25,23 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_8011D5F0 = 0x8011D5F0; -D_8011D5F1 = 0x8011D5F1; -D_8011D600 = 0x8011D600; -D_8011D601 = 0x8011D601; -D_8011D610 = 0x8011D610; -D_8011D611 = 0x8011D611; -D_8011D620 = 0x8011D620; -D_8011D624 = 0x8011D624; -D_8011D628 = 0x8011D628; -D_8011D62C = 0x8011D62C; -D_8011D630 = 0x8011D630; -D_8011D634 = 0x8011D634; -D_8011D638 = 0x8011D638; -D_8011D63C = 0x8011D63C; -D_8011D640 = 0x8011D640; -D_8011D644 = 0x8011D644; +/D_8011D5F0 = 0x8011D5F0; +/D_8011D5F1 = 0x8011D5F1; +/D_8011D600 = 0x8011D600; +/D_8011D601 = 0x8011D601; +/D_8011D610 = 0x8011D610; +/D_8011D611 = 0x8011D611; +/D_8011D620 = 0x8011D620; +/D_8011D624 = 0x8011D624; +/D_8011D628 = 0x8011D628; +/D_8011D62C = 0x8011D62C; +/D_8011D630 = 0x8011D630; +/D_8011D634 = 0x8011D634; +/D_8011D638 = 0x8011D638; +/D_8011D63C = 0x8011D63C; +/D_8011D640 = 0x8011D640; +/D_8011D644 = 0x8011D644; + D_8011D750 = 0x8011D750; D_8011D758 = 0x8011D758; D_8011F758 = 0x8011F758; From 74b3fdf551645d0d214d6365ac791ac2774e4284 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 8 Jun 2021 20:54:32 -0500 Subject: [PATCH 31/39] Added bss for unknown_060450 & unknown_0667D0 --- .../unknown_00BC20/func_8001A8F4.s | 4 +-- .../unknown_043920/func_80059E40.s | 4 +-- .../unknown_080500/func_8009DB3C.s | 10 +++--- .../unknown_09F8F0/func_800A6254.s | 6 ++-- .../unknown_0AEE70/func_800B653C.s | 36 +++++++++---------- bss.txt | 34 +----------------- src/unknown_060450.c | 1 + src/unknown_0667D0.c | 17 +++++---- undefined_syms.txt | 31 +++------------- 9 files changed, 48 insertions(+), 95 deletions(-) diff --git a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s index b4526871..4f113de3 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s @@ -285,7 +285,7 @@ glabel func_8001A8F4 /* 01B91C 8001AD1C A02BAD50 */ sb $t3, %lo(D_8011AD50)($at) /* 01B920 8001AD20 0C00A3E8 */ jal func_80028FA0 /* 01B924 8001AD24 24040001 */ li $a0, 1 -/* 01B928 8001AD28 3C028012 */ lui $v0, %hi(D_80120010) # $v0, 0x8012 +/* 01B928 8001AD28 3C028012 */ lui $v0, %hi(D_8011AD50) # $v0, 0x8012 /* 01B92C 8001AD2C 8042AD50 */ lb $v0, %lo(D_8011AD50)($v0) /* 01B930 8001AD30 00000000 */ nop .L8001AD34: @@ -326,7 +326,7 @@ glabel func_8001A8F4 /* 01B9B0 8001ADB0 00002025 */ move $a0, $zero /* 01B9B4 8001ADB4 0C01BAA4 */ jal get_settings /* 01B9B8 8001ADB8 30508000 */ andi $s0, $v0, 0x8000 -/* 01B9BC 8001ADBC 8C590010 */ lw $t9, %lo(D_80120010)($v0) +/* 01B9BC 8001ADBC 8C590010 */ lw $t9, 0x10($v0) /* 01B9C0 8001ADC0 00408825 */ move $s1, $v0 /* 01B9C4 8001ADC4 00194B40 */ sll $t1, $t9, 0xd /* 01B9C8 8001ADC8 05200002 */ bltz $t1, .L8001ADD4 diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index e9cbcfb6..c07d262b 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -6,10 +6,10 @@ glabel D_800E6938 .text glabel func_80059E40 -/* 05AA40 80059E40 3C058012 */ lui $a1, %hi(D_80120001) # $a1, 0x8012 +/* 05AA40 80059E40 3C058012 */ lui $a1, %hi(D_8011D59C) # $a1, 0x8012 /* 05AA44 80059E44 80A5D59C */ lb $a1, %lo(D_8011D59C)($a1) /* 05AA48 80059E48 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 05AA4C 80059E4C 24A50001 */ addiu $a1, %lo(D_80120001) # addiu $a1, $a1, 1 +/* 05AA4C 80059E4C 24A50001 */ addiu $a1, $a1, 1 /* 05AA50 80059E50 AFBF001C */ sw $ra, 0x1c($sp) /* 05AA54 80059E54 AFB00018 */ sw $s0, 0x18($sp) /* 05AA58 80059E58 30AE0001 */ andi $t6, $a1, 1 diff --git a/asm/non_matchings/unknown_080500/func_8009DB3C.s b/asm/non_matchings/unknown_080500/func_8009DB3C.s index 73fe2f46..41c90d02 100644 --- a/asm/non_matchings/unknown_080500/func_8009DB3C.s +++ b/asm/non_matchings/unknown_080500/func_8009DB3C.s @@ -145,7 +145,7 @@ glabel L8009DC60 /* 09E938 8009DD38 00000000 */ nop /* 09E93C 8009DD3C 3C0F8012 */ lui $t7, %hi(D_80126516) # $t7, 0x8012 /* 09E940 8009DD40 81EF6516 */ lb $t7, %lo(D_80126516)($t7) -/* 09E944 8009DD44 3C028012 */ lui $v0, %hi(D_80120004) # $v0, 0x8012 +/* 09E944 8009DD44 3C028012 */ lui $v0, %hi(D_8012645C) # $v0, 0x8012 /* 09E948 8009DD48 15E0001B */ bnez $t7, .L8009DDB8 /* 09E94C 8009DD4C 8FB80040 */ lw $t8, 0x40($sp) /* 09E950 8009DD50 8042645C */ lb $v0, %lo(D_8012645C)($v0) @@ -244,7 +244,7 @@ glabel L8009DC60 /* 09EAA0 8009DEA0 24180003 */ li $t8, 3 /* 09EAA4 8009DEA4 AFB80044 */ sw $t8, 0x44($sp) .L8009DEA8: -/* 09EAA8 8009DEA8 3C038012 */ lui $v1, %hi(D_80120001) # $v1, 0x8012 +/* 09EAA8 8009DEA8 3C038012 */ lui $v1, %hi(D_801264E2) /* 09EAAC 8009DEAC 806364E2 */ lb $v1, %lo(D_801264E2)($v1) /* 09EAB0 8009DEB0 24010004 */ li $at, 4 /* 09EAB4 8009DEB4 14610002 */ bne $v1, $at, .L8009DEC0 @@ -273,10 +273,10 @@ glabel L8009DEF0 /* 09EB04 8009DF04 10A00005 */ beqz $a1, .L8009DF1C /* 09EB08 8009DF08 00801025 */ move $v0, $a0 .L8009DF0C: -/* 09EB0C 8009DF0C 8C4B0004 */ lw $t3, %lo(D_80120004)($v0) -/* 09EB10 8009DF10 24630001 */ addiu $v1, %lo(D_80120001) # addiu $v1, $v1, 1 +/* 09EB0C 8009DF0C 8C4B0004 */ lw $t3, 4($v0) +/* 09EB10 8009DF10 24630001 */ addiu $v1, $v1, 1 /* 09EB14 8009DF14 1560FFFD */ bnez $t3, .L8009DF0C -/* 09EB18 8009DF18 24420004 */ addiu $v0, %lo(D_80120004) # addiu $v0, $v0, 4 +/* 09EB18 8009DF18 24420004 */ addiu $v0, $v0, 4 .L8009DF1C: /* 09EB1C 8009DF1C 1860001B */ blez $v1, .L8009DF8C /* 09EB20 8009DF20 246CFFFF */ addiu $t4, $v1, -1 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 536068ce..b7450383 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -392,7 +392,7 @@ glabel L800A63D8 /* 0A73EC 800A67EC 46101081 */ sub.s $f2, $f2, $f16 .L800A67F0: /* 0A73F0 800A67F0 8D2C0000 */ lw $t4, ($t1) -/* 0A73F4 800A67F4 3C028012 */ lui $v0, %hi(D_8012004B) # $v0, 0x8012 +/* 0A73F4 800A67F4 3C028012 */ lui $v0, %hi(D_80126D37) # $v0, 0x8012 /* 0A73F8 800A67F8 E58C016C */ swc1 $f12, 0x16c($t4) /* 0A73FC 800A67FC 8D2D0000 */ lw $t5, ($t1) /* 0A7400 800A6800 00000000 */ nop @@ -415,11 +415,11 @@ glabel L800A63D8 /* 0A7440 800A6840 8CF80128 */ lw $t8, 0x128($a3) /* 0A7444 800A6844 00001825 */ move $v1, $zero /* 0A7448 800A6848 AFB80044 */ sw $t8, 0x44($sp) -/* 0A744C 800A684C 8059004B */ lb $t9, %lo(D_8012004B)($v0) +/* 0A744C 800A684C 8059004B */ lb $t9, 0x4B($v0) /* 0A7450 800A6850 27A6003C */ addiu $a2, $sp, 0x3c /* 0A7454 800A6854 1B20000E */ blez $t9, .L800A6890 /* 0A7458 800A6858 8FA40044 */ lw $a0, 0x44($sp) -/* 0A745C 800A685C 8045004B */ lb $a1, %lo(D_8012004B)($v0) +/* 0A745C 800A685C 8045004B */ lb $a1, 0x4B($v0) /* 0A7460 800A6860 00E02025 */ move $a0, $a3 .L800A6864: /* 0A7464 800A6864 8C820128 */ lw $v0, 0x128($a0) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B653C.s b/asm/non_matchings/unknown_0AEE70/func_800B653C.s index 1a0e2d90..517dabe1 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B653C.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B653C.s @@ -63,23 +63,23 @@ glabel func_800B653C /* 0B7210 800B6610 02A02025 */ move $a0, $s5 glabel L800B6614 /* 0B7214 800B6614 3C018012 */ lui $at, %hi(D_80127CB4) # $at, 0x8012 -/* 0B7218 800B6618 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7218 800B6618 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B721C 800B661C 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7220 800B6620 AC207CB4 */ sw $zero, %lo(D_80127CB4)($at) /* 0B7224 800B6624 96440000 */ lhu $a0, ($s2) /* 0B7228 800B6628 00001825 */ move $v1, $zero /* 0B722C 800B662C 1000009D */ b .L800B68A4 -/* 0B7230 800B6630 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7230 800B6630 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B6634 /* 0B7234 800B6634 240F0001 */ li $t7, 1 /* 0B7238 800B6638 3C018012 */ lui $at, %hi(D_80127CB4) # $at, 0x8012 -/* 0B723C 800B663C 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B723C 800B663C 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7240 800B6640 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7244 800B6644 AC2F7CB4 */ sw $t7, %lo(D_80127CB4)($at) /* 0B7248 800B6648 96440000 */ lhu $a0, ($s2) /* 0B724C 800B664C 24030001 */ li $v1, 1 /* 0B7250 800B6650 10000094 */ b .L800B68A4 -/* 0B7254 800B6654 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7254 800B6654 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B6658 /* 0B7258 800B6658 8FD80000 */ lw $t8, ($fp) /* 0B725C 800B665C 92040000 */ lbu $a0, ($s0) @@ -104,13 +104,13 @@ glabel L800B6658 /* 0B72A8 800B66A8 03194025 */ or $t0, $t8, $t9 /* 0B72AC 800B66AC AC680004 */ sw $t0, 4($v1) .L800B66B0: -/* 0B72B0 800B66B0 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B72B0 800B66B0 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B72B4 800B66B4 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B72B8 800B66B8 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B72BC 800B66BC 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B72C0 800B66C0 96440000 */ lhu $a0, ($s2) /* 0B72C4 800B66C4 10000077 */ b .L800B68A4 -/* 0B72C8 800B66C8 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B72C8 800B66C8 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B66CC /* 0B72CC 800B66CC 8FC90000 */ lw $t1, ($fp) /* 0B72D0 800B66D0 92040000 */ lbu $a0, ($s0) @@ -135,13 +135,13 @@ glabel L800B66CC /* 0B731C 800B671C 012B5025 */ or $t2, $t1, $t3 /* 0B7320 800B6720 AC6A0004 */ sw $t2, 4($v1) .L800B6724: -/* 0B7324 800B6724 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7324 800B6724 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7328 800B6728 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B732C 800B672C 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7330 800B6730 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B7334 800B6734 96440000 */ lhu $a0, ($s2) /* 0B7338 800B6738 1000005A */ b .L800B68A4 -/* 0B733C 800B673C 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B733C 800B673C 24A5FFF0 */ addiu $a1, $a1, -0x10 glabel L800B6740 /* 0B7340 800B6740 8FCC0000 */ lw $t4, ($fp) /* 0B7344 800B6744 02A02025 */ move $a0, $s5 @@ -156,7 +156,7 @@ glabel L800B6740 /* 0B7368 800B6768 AFAE0010 */ sw $t6, 0x10($sp) .L800B676C: /* 0B736C 800B676C 92190000 */ lbu $t9, ($s0) -/* 0B7370 800B6770 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7370 800B6770 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7374 800B6774 A6590000 */ sh $t9, ($s2) /* 0B7378 800B6778 92180001 */ lbu $t8, 1($s0) /* 0B737C 800B677C 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 @@ -176,15 +176,15 @@ glabel L800B6740 /* 0B73B4 800B67B4 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B73B8 800B67B8 26100004 */ addiu $s0, $s0, 4 /* 0B73BC 800B67BC 10000039 */ b .L800B68A4 -/* 0B73C0 800B67C0 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B73C0 800B67C0 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B67C4: -/* 0B73C4 800B67C4 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B73C4 800B67C4 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B73C8 800B67C8 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B73CC 800B67CC 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B73D0 800B67D0 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B73D4 800B67D4 96440000 */ lhu $a0, ($s2) /* 0B73D8 800B67D8 10000032 */ b .L800B68A4 -/* 0B73DC 800B67DC 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B73DC 800B67DC 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B67E0: /* 0B73E0 800B67E0 8FD80000 */ lw $t8, ($fp) /* 0B73E4 800B67E4 02A02025 */ move $a0, $s5 @@ -202,17 +202,17 @@ glabel L800B6740 /* 0B7410 800B6810 00000000 */ nop /* 0B7414 800B6814 96440000 */ lhu $a0, ($s2) /* 0B7418 800B6818 96890000 */ lhu $t1, ($s4) -/* 0B741C 800B681C 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B741C 800B681C 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7420 800B6820 A6C40000 */ sh $a0, ($s6) /* 0B7424 800B6824 A6E90000 */ sh $t1, ($s7) /* 0B7428 800B6828 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B742C 800B682C 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7430 800B6830 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B7434 800B6834 1000001B */ b .L800B68A4 -/* 0B7438 800B6838 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7438 800B6838 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B683C: /* 0B743C 800B683C 96440000 */ lhu $a0, ($s2) -/* 0B7440 800B6840 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7440 800B6840 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B7444 800B6844 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7448 800B6848 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B744C 800B684C 04810004 */ bgez $a0, .L800B6860 @@ -222,7 +222,7 @@ glabel L800B6740 /* 0B745C 800B685C 2442FFE0 */ addiu $v0, $v0, -0x20 .L800B6860: /* 0B7460 800B6860 14400003 */ bnez $v0, .L800B6870 -/* 0B7464 800B6864 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B7464 800B6864 24A5FFF0 */ addiu $a1, $a1, -0x10 /* 0B7468 800B6868 1000000E */ b .L800B68A4 /* 0B746C 800B686C 24130020 */ li $s3, 32 .L800B6870: @@ -234,13 +234,13 @@ glabel L800B6740 .L800B6880: /* 0B7480 800B6880 0C02DA7F */ jal func_800B69FC /* 0B7484 800B6884 02202825 */ move $a1, $s1 -/* 0B7488 800B6888 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 +/* 0B7488 800B6888 3C058012 */ lui $a1, %hi(D_80127CD0) # $a1, 0x8012 /* 0B748C 800B688C 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) /* 0B7490 800B6890 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7494 800B6894 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B7498 800B6898 96440000 */ lhu $a0, ($s2) /* 0B749C 800B689C 00409825 */ move $s3, $v0 -/* 0B74A0 800B68A0 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +/* 0B74A0 800B68A0 24A5FFF0 */ addiu $a1, $a1, -0x10 .L800B68A4: /* 0B74A4 800B68A4 10600006 */ beqz $v1, .L800B68C0 /* 0B74A8 800B68A8 2A210020 */ slti $at, $s1, 0x20 diff --git a/bss.txt b/bss.txt index 7ae3dcaf..4d9273df 100644 --- a/bss.txt +++ b/bss.txt @@ -1,63 +1,31 @@ unknown_001050 - unknown_003260 - unknown_005740 - unknown_00BC20 - unknown_0255E0 - unknown_032760 - unknown_0348C0 - unknown_043920 - unknown_05CEF0 - unknown_05DCD0 - unknown_05F0C0 - unknown_05F690 - unknown_0667D0 -D_8011D750; -D_8011D758; -D_8011F758; -D_8011F760; -D_8011F910; -D_8011FFF0; -D_80120001; - - -unknown_080500 -D_80120004; - - -unknown_00BC20 -D_80120010; - - -unknown_09F8F0 -D_8012004B; -D_80120AC0; - unknown_066AA0 +D_80120AC0; D_80120AC4; D_80120AF4; D_80120BD0; diff --git a/src/unknown_060450.c b/src/unknown_060450.c index 092094ef..e73232bf 100644 --- a/src/unknown_060450.c +++ b/src/unknown_060450.c @@ -34,6 +34,7 @@ s32 D_8011D638; s32 D_8011D63C; s32 D_8011D640; s32 D_8011D644; +s32 D_8011D648[66]; /******************************/ diff --git a/src/unknown_0667D0.c b/src/unknown_0667D0.c index 88553fa0..be88af19 100644 --- a/src/unknown_0667D0.c +++ b/src/unknown_0667D0.c @@ -5,6 +5,7 @@ #include "types.h" #include "macros.h" +#include "libultra_internal.h" /************ .data ************/ @@ -12,7 +13,7 @@ s16 D_800DD050 = 0; /*******************************/ -extern s32* D_80065D98; +extern s32* D_80065D98; // func_80065D98 is the entry function for thread 1 /************ .rodata ************/ @@ -21,13 +22,17 @@ const char D_800E6ED0[] = "WARNING: Stack overflow/underflow!!!\n"; /*********************************/ - /************ .bss ************/ -extern s32* D_8011D750; -extern s32* D_8011F758; -extern s32* D_8011F760; -extern s32* D_8011F910; +s32 *D_8011D750; // stack pointer for thread 1 +s32 D_8011D754; +s32 D_8011D758[2048]; +s32 *D_8011F758; +s32 D_8011F75C; +OSThread *D_8011F760; // OSThread for thread 1 +s32 D_8011F764; +s32 D_8011F768[106]; +s32 *D_8011F910; /******************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 273e949e..043adce3 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,33 +25,12 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/D_8011D5F0 = 0x8011D5F0; -/D_8011D5F1 = 0x8011D5F1; -/D_8011D600 = 0x8011D600; -/D_8011D601 = 0x8011D601; -/D_8011D610 = 0x8011D610; -/D_8011D611 = 0x8011D611; -/D_8011D620 = 0x8011D620; -/D_8011D624 = 0x8011D624; -/D_8011D628 = 0x8011D628; -/D_8011D62C = 0x8011D62C; -/D_8011D630 = 0x8011D630; -/D_8011D634 = 0x8011D634; -/D_8011D638 = 0x8011D638; -/D_8011D63C = 0x8011D63C; -/D_8011D640 = 0x8011D640; -/D_8011D644 = 0x8011D644; +/D_8011D750 = 0x8011D750; +/D_8011D758 = 0x8011D758; +/D_8011F758 = 0x8011F758; +/D_8011F760 = 0x8011F760; +/D_8011F910 = 0x8011F910; -D_8011D750 = 0x8011D750; -D_8011D758 = 0x8011D758; -D_8011F758 = 0x8011F758; -D_8011F760 = 0x8011F760; -D_8011F910 = 0x8011F910; -D_8011FFF0 = 0x8011FFF0; -D_80120001 = 0x80120001; -D_80120004 = 0x80120004; -D_80120010 = 0x80120010; -D_8012004B = 0x8012004B; D_80120AC0 = 0x80120AC0; D_80120AC4 = 0x80120AC4; D_80120AF4 = 0x80120AF4; From ee0c57f5b8b970b226384630c2a32eba57eedfa4 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 01:14:31 -0500 Subject: [PATCH 32/39] Added bss for unknown_066AA0 & part of unknown_06B2B0 --- .../unknown_066AA0/func_80065EA0.s | 4 +- .../unknown_066AA0/func_80067D3C.s | 4 +- .../unknown_066AA0/func_80068514.s | 8 +- .../unknown_066AA0/func_80068BF4.s | 4 +- .../unknown_066AA0/func_80069484.s | 4 +- .../unknown_066AA0/func_80069A40.s | 4 +- .../unknown_066AA0/func_8006A10C.s | 4 +- .../unknown_066AA0/func_8006A1C4.s | 12 +- .../unknown_066AA0/func_8006A434.s | 8 +- .../unknown_066AA0/func_8006A6B0.s | 60 +- bss.txt | 58 +- src/unknown_0667D0.c | 2 +- src/unknown_066AA0.c | 1925 +++++++++-------- src/unknown_06B2B0.c | 51 +- undefined_syms.txt | 61 - 15 files changed, 1053 insertions(+), 1156 deletions(-) diff --git a/asm/non_matchings/unknown_066AA0/func_80065EA0.s b/asm/non_matchings/unknown_066AA0/func_80065EA0.s index bbd88892..802fbf6c 100644 --- a/asm/non_matchings/unknown_066AA0/func_80065EA0.s +++ b/asm/non_matchings/unknown_066AA0/func_80065EA0.s @@ -96,10 +96,10 @@ glabel func_80065EA0 /* 066BF4 80065FF4 C426709C */ lwc1 $f6, %lo(D_800E709C)($at) /* 066BF8 80065FF8 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 066BFC 80065FFC 44814000 */ mtc1 $at, $f8 -/* 066C00 80066000 3C058012 */ lui $a1, %hi(D_80120D6C) # $a1, 0x8012 +/* 066C00 80066000 3C058012 */ lui $a1, %hi(D_80120D58+20) # $a1, 0x8012 /* 066C04 80066004 3C073FAA */ lui $a3, (0x3FAAAAAB >> 16) # lui $a3, 0x3faa /* 066C08 80066008 34E7AAAB */ ori $a3, (0x3FAAAAAB & 0xFFFF) # ori $a3, $a3, 0xaaab -/* 066C0C 8006600C 24A50D6C */ addiu $a1, %lo(D_80120D6C) # addiu $a1, $a1, 0xd6c +/* 066C0C 8006600C 24A50D6C */ addiu $a1, %lo(D_80120D58+20) # addiu $a1, $a1, 0xd6c /* 066C10 80066010 02002025 */ move $a0, $s0 /* 066C14 80066014 3C064270 */ lui $a2, 0x4270 /* 066C18 80066018 E7A40010 */ swc1 $f4, 0x10($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_80067D3C.s b/asm/non_matchings/unknown_066AA0/func_80067D3C.s index 07431a5c..8166b733 100644 --- a/asm/non_matchings/unknown_066AA0/func_80067D3C.s +++ b/asm/non_matchings/unknown_066AA0/func_80067D3C.s @@ -6,9 +6,9 @@ glabel func_80067D3C /* 06894C 80067D4C 3C0FB400 */ lui $t7, 0xb400 /* 068950 80067D50 246E0008 */ addiu $t6, $v1, 8 /* 068954 80067D54 AC8E0000 */ sw $t6, ($a0) -/* 068958 80067D58 3C188012 */ lui $t8, %hi(D_80120D6C) # $t8, 0x8012 +/* 068958 80067D58 3C188012 */ lui $t8, %hi(D_80120D58+20) # $t8, 0x8012 /* 06895C 80067D5C AC6F0000 */ sw $t7, ($v1) -/* 068960 80067D60 97180D6C */ lhu $t8, %lo(D_80120D6C)($t8) +/* 068960 80067D60 97180D6C */ lhu $t8, %lo(D_80120D58+20)($t8) /* 068964 80067D64 3C068012 */ lui $a2, %hi(D_80120CE4) # $a2, 0x8012 /* 068968 80067D68 AC780004 */ sw $t8, 4($v1) /* 06896C 80067D6C 24C60CE4 */ addiu $a2, %lo(D_80120CE4) # addiu $a2, $a2, 0xce4 diff --git a/asm/non_matchings/unknown_066AA0/func_80068514.s b/asm/non_matchings/unknown_066AA0/func_80068514.s index d35cf94e..9607f8ad 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068514.s +++ b/asm/non_matchings/unknown_066AA0/func_80068514.s @@ -290,12 +290,12 @@ glabel func_80068514 /* 069584 80068984 15E0000D */ bnez $t7, .L800689BC /* 069588 80068988 3C198012 */ lui $t9, %hi(D_80120CE4) # $t9, 0x8012 /* 06958C 8006898C 8F390CE4 */ lw $t9, %lo(D_80120CE4)($t9) -/* 069590 80068990 3C0B8012 */ lui $t3, %hi(D_80120AC4) # $t3, 0x8012 +/* 069590 80068990 3C0B8012 */ lui $t3, %hi(D_80120AC0+4) # $t3, 0x8012 /* 069594 80068994 00195100 */ sll $t2, $t9, 4 /* 069598 80068998 01595021 */ addu $t2, $t2, $t9 /* 06959C 8006899C 000A5080 */ sll $t2, $t2, 2 /* 0695A0 800689A0 016A5821 */ addu $t3, $t3, $t2 -/* 0695A4 800689A4 856B0AC4 */ lh $t3, %lo(D_80120AC4)($t3) +/* 0695A4 800689A4 856B0AC4 */ lh $t3, %lo(D_80120AC0+4)($t3) /* 0695A8 800689A8 860C0004 */ lh $t4, 4($s0) /* 0695AC 800689AC 00000000 */ nop /* 0695B0 800689B0 016C6821 */ addu $t5, $t3, $t4 @@ -304,12 +304,12 @@ glabel func_80068514 .L800689BC: /* 0695BC 800689BC 3C0E8012 */ lui $t6, %hi(D_80120CE4) # $t6, 0x8012 /* 0695C0 800689C0 8DCE0CE4 */ lw $t6, %lo(D_80120CE4)($t6) -/* 0695C4 800689C4 3C0F8012 */ lui $t7, %hi(D_80120BD4) # $t7, 0x8012 +/* 0695C4 800689C4 3C0F8012 */ lui $t7, %hi(D_80120AC0+276) # $t7, 0x8012 /* 0695C8 800689C8 000EC100 */ sll $t8, $t6, 4 /* 0695CC 800689CC 030EC021 */ addu $t8, $t8, $t6 /* 0695D0 800689D0 0018C080 */ sll $t8, $t8, 2 /* 0695D4 800689D4 01F87821 */ addu $t7, $t7, $t8 -/* 0695D8 800689D8 85EF0BD4 */ lh $t7, %lo(D_80120BD4)($t7) +/* 0695D8 800689D8 85EF0BD4 */ lh $t7, %lo(D_80120AC0+276)($t7) /* 0695DC 800689DC 86190004 */ lh $t9, 4($s0) /* 0695E0 800689E0 00000000 */ nop /* 0695E4 800689E4 01F95021 */ addu $t2, $t7, $t9 diff --git a/asm/non_matchings/unknown_066AA0/func_80068BF4.s b/asm/non_matchings/unknown_066AA0/func_80068BF4.s index 1d16b73f..6ce0708b 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068BF4.s +++ b/asm/non_matchings/unknown_066AA0/func_80068BF4.s @@ -72,7 +72,7 @@ glabel func_80068BF4 /* 06990C 80068D0C 25F80001 */ addiu $t8, $t7, 1 /* 069910 80068D10 AE980000 */ sw $t8, ($s4) /* 069914 80068D14 84F90000 */ lh $t9, ($a3) -/* 069918 80068D18 3C0E8012 */ lui $t6, %hi(D_80120AC4) # $t6, 0x8012 +/* 069918 80068D18 3C0E8012 */ lui $t6, %hi(D_80120AC0+4) # $t6, 0x8012 /* 06991C 80068D1C 00194823 */ negu $t1, $t9 /* 069920 80068D20 A6490000 */ sh $t1, ($s2) /* 069924 80068D24 84EA0002 */ lh $t2, 2($a3) @@ -85,7 +85,7 @@ glabel func_80068BF4 /* 069940 80068D40 01AC6821 */ addu $t5, $t5, $t4 /* 069944 80068D44 000D6880 */ sll $t5, $t5, 2 /* 069948 80068D48 01CD7021 */ addu $t6, $t6, $t5 -/* 06994C 80068D4C 85CE0AC4 */ lh $t6, %lo(D_80120AC4)($t6) +/* 06994C 80068D4C 85CE0AC4 */ lh $t6, %lo(D_80120AC0+4)($t6) /* 069950 80068D50 3C198012 */ lui $t9, %hi(D_80120D15) # $t9, 0x8012 /* 069954 80068D54 01CFC021 */ addu $t8, $t6, $t7 /* 069958 80068D58 A6580004 */ sh $t8, 4($s2) diff --git a/asm/non_matchings/unknown_066AA0/func_80069484.s b/asm/non_matchings/unknown_066AA0/func_80069484.s index 1cbe6152..e421c4ac 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069484.s +++ b/asm/non_matchings/unknown_066AA0/func_80069484.s @@ -48,10 +48,10 @@ glabel func_80069484 /* 06A134 80069534 3C088012 */ lui $t0, %hi(D_80120D1C) # $t0, 0x8012 /* 06A138 80069538 25080D1C */ addiu $t0, %lo(D_80120D1C) # addiu $t0, $t0, 0xd1c /* 06A13C 8006953C 8D190000 */ lw $t9, ($t0) -/* 06A140 80069540 3C048012 */ lui $a0, %hi(D_80120D74) # $a0, 0x8012 +/* 06A140 80069540 3C048012 */ lui $a0, %hi(D_80120D70+4) # $a0, 0x8012 /* 06A144 80069544 00195880 */ sll $t3, $t9, 2 /* 06A148 80069548 008B2021 */ addu $a0, $a0, $t3 -/* 06A14C 8006954C 8C840D74 */ lw $a0, %lo(D_80120D74)($a0) +/* 06A14C 8006954C 8C840D74 */ lw $a0, %lo(D_80120D70+4)($a0) /* 06A150 80069550 3C058012 */ lui $a1, %hi(D_80120F20) # $a1, 0x8012 /* 06A154 80069554 3C068012 */ lui $a2, %hi(D_801210A0) # $a2, 0x8012 /* 06A158 80069558 24C610A0 */ addiu $a2, %lo(D_801210A0) # addiu $a2, $a2, 0x10a0 diff --git a/asm/non_matchings/unknown_066AA0/func_80069A40.s b/asm/non_matchings/unknown_066AA0/func_80069A40.s index ca04bd71..8b94d8fa 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069A40.s +++ b/asm/non_matchings/unknown_066AA0/func_80069A40.s @@ -73,9 +73,9 @@ glabel func_80069A40 /* 06A750 80069B50 00194100 */ sll $t0, $t9, 4 /* 06A754 80069B54 01194021 */ addu $t0, $t0, $t9 /* 06A758 80069B58 00084080 */ sll $t0, $t0, 2 -/* 06A75C 80069B5C 3C018012 */ lui $at, %hi(D_80120AF4) # $at, 0x8012 +/* 06A75C 80069B5C 3C018012 */ lui $at, %hi(D_80120AC0+52) # $at, 0x8012 /* 06A760 80069B60 00280821 */ addu $at, $at, $t0 -/* 06A764 80069B64 A4220AF4 */ sh $v0, %lo(D_80120AF4)($at) +/* 06A764 80069B64 A4220AF4 */ sh $v0, %lo(D_80120AC0+52)($at) /* 06A768 80069B68 03E00008 */ jr $ra /* 06A76C 80069B6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/unknown_066AA0/func_8006A10C.s b/asm/non_matchings/unknown_066AA0/func_8006A10C.s index 64615811..0f018759 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A10C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A10C.s @@ -30,8 +30,8 @@ glabel func_8006A10C /* 06AD7C 8006A17C 304E0001 */ andi $t6, $v0, 1 /* 06AD80 8006A180 11C00009 */ beqz $t6, .L8006A1A8 /* 06AD84 8006A184 AC600000 */ sw $zero, ($v1) -/* 06AD88 8006A188 3C0F8012 */ lui $t7, %hi(D_80121103) # $t7, 0x8012 -/* 06AD8C 8006A18C 91EF1103 */ lbu $t7, %lo(D_80121103)($t7) +/* 06AD88 8006A188 3C0F8012 */ lui $t7, %hi(D_80121100+3) # $t7, 0x8012 +/* 06AD8C 8006A18C 91EF1103 */ lbu $t7, %lo(D_80121100+3)($t7) /* 06AD90 8006A190 00000000 */ nop /* 06AD94 8006A194 31F80008 */ andi $t8, $t7, 8 /* 06AD98 8006A198 17000004 */ bnez $t8, .L8006A1AC diff --git a/asm/non_matchings/unknown_066AA0/func_8006A1C4.s b/asm/non_matchings/unknown_066AA0/func_8006A1C4.s index 1f9b2ed8..41925316 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A1C4.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A1C4.s @@ -12,12 +12,12 @@ glabel func_8006A1C4 /* 06ADEC 8006A1EC 0C0322EC */ jal osRecvMesg /* 06ADF0 8006A1F0 00003025 */ move $a2, $zero /* 06ADF4 8006A1F4 1440005D */ bnez $v0, .L8006A36C -/* 06ADF8 8006A1F8 3C068012 */ lui $a2, %hi(D_80121128) # $a2, 0x8012 +/* 06ADF8 8006A1F8 3C068012 */ lui $a2, %hi(D_80121110+24) # $a2, 0x8012 /* 06ADFC 8006A1FC 3C028012 */ lui $v0, %hi(D_80121110) # $v0, 0x8012 -/* 06AE00 8006A200 3C038012 */ lui $v1, %hi(D_80121128) # $v1, 0x8012 -/* 06AE04 8006A204 24631128 */ addiu $v1, %lo(D_80121128) # addiu $v1, $v1, 0x1128 +/* 06AE00 8006A200 3C038012 */ lui $v1, %hi(D_80121110+24) # $v1, 0x8012 +/* 06AE04 8006A204 24631128 */ addiu $v1, %lo(D_80121110+24) # addiu $v1, $v1, 0x1128 /* 06AE08 8006A208 24421110 */ addiu $v0, %lo(D_80121110) # addiu $v0, $v0, 0x1110 -/* 06AE0C 8006A20C 24C61128 */ addiu $a2, %lo(D_80121128) # addiu $a2, $a2, 0x1128 +/* 06AE0C 8006A20C 24C61128 */ addiu $a2, %lo(D_80121110+24) # addiu $a2, $a2, 0x1128 .L8006A210: /* 06AE10 8006A210 88410000 */ lwl $at, ($v0) /* 06AE14 8006A214 98410003 */ lwr $at, 3($v0) @@ -119,7 +119,7 @@ glabel func_8006A1C4 .L8006A36C: /* 06AF6C 8006A36C 3C0A800E */ lui $t2, %hi(D_800DD300) # $t2, 0x800e /* 06AF70 8006A370 3C09800E */ lui $t1, %hi(D_800DD304) # $t1, 0x800e -/* 06AF74 8006A374 3C068012 */ lui $a2, %hi(D_80121128) # $a2, 0x8012 +/* 06AF74 8006A374 3C068012 */ lui $a2, %hi(D_80121110+24) # $a2, 0x8012 /* 06AF78 8006A378 3C028012 */ lui $v0, %hi(D_80121110) # $v0, 0x8012 /* 06AF7C 8006A37C 3C088012 */ lui $t0, %hi(D_80121140) # $t0, 0x8012 /* 06AF80 8006A380 3C078012 */ lui $a3, %hi(D_80121148) # $a3, 0x8012 @@ -130,7 +130,7 @@ glabel func_8006A1C4 /* 06AF94 8006A394 24E71148 */ addiu $a3, %lo(D_80121148) # addiu $a3, $a3, 0x1148 /* 06AF98 8006A398 25081140 */ addiu $t0, %lo(D_80121140) # addiu $t0, $t0, 0x1140 /* 06AF9C 8006A39C 24421110 */ addiu $v0, %lo(D_80121110) # addiu $v0, $v0, 0x1110 -/* 06AFA0 8006A3A0 24C61128 */ addiu $a2, %lo(D_80121128) # addiu $a2, $a2, 0x1128 +/* 06AFA0 8006A3A0 24C61128 */ addiu $a2, %lo(D_80121110+24) # addiu $a2, $a2, 0x1128 .L8006A3A4: /* 06AFA4 8006A3A4 11400002 */ beqz $t2, .L8006A3B0 /* 06AFA8 8006A3A8 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006A434.s b/asm/non_matchings/unknown_066AA0/func_8006A434.s index 89e03eee..ba2fef6a 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A434.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A434.s @@ -1,11 +1,11 @@ glabel func_8006A434 -/* 06B034 8006A434 3C018012 */ lui $at, %hi(D_80121151) # $at, 0x8012 +/* 06B034 8006A434 3C018012 */ lui $at, %hi(D_80121150+1) # $at, 0x8012 /* 06B038 8006A438 240E0001 */ li $t6, 1 /* 06B03C 8006A43C 240F0002 */ li $t7, 2 /* 06B040 8006A440 24180003 */ li $t8, 3 -/* 06B044 8006A444 A0381153 */ sb $t8, %lo(D_80121153)($at) -/* 06B048 8006A448 A02F1152 */ sb $t7, %lo(D_80121152)($at) -/* 06B04C 8006A44C A02E1151 */ sb $t6, %lo(D_80121151)($at) +/* 06B044 8006A444 A0381153 */ sb $t8, %lo(D_80121150+3)($at) +/* 06B048 8006A448 A02F1152 */ sb $t7, %lo(D_80121150+2)($at) +/* 06B04C 8006A44C A02E1151 */ sb $t6, %lo(D_80121150+1)($at) /* 06B050 8006A450 03E00008 */ jr $ra /* 06B054 8006A454 A0201150 */ sb $zero, 0x1150($at) diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s index a2e42e4b..fa2e8561 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s @@ -58,12 +58,12 @@ glabel func_8006A6B0 /* 06B384 8006A784 254A1170 */ addiu $t2, %lo(D_80121170) # addiu $t2, $t2, 0x1170 /* 06B388 8006A788 8FB90044 */ lw $t9, 0x44($sp) /* 06B38C 8006A78C 8D4C0000 */ lw $t4, ($t2) -/* 06B390 8006A790 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B390 8006A790 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B394 8006A794 3C098012 */ lui $t1, %hi(D_80121174) # $t1, 0x8012 /* 06B398 8006A798 3C108012 */ lui $s0, %hi(D_80121168) # $s0, 0x8012 /* 06B39C 8006A79C 26101168 */ addiu $s0, %lo(D_80121168) # addiu $s0, $s0, 0x1168 /* 06B3A0 8006A7A0 25291174 */ addiu $t1, %lo(D_80121174) # addiu $t1, $t1, 0x1174 -/* 06B3A4 8006A7A4 2508117C */ addiu $t0, %lo(D_8012117C) # addiu $t0, $t0, 0x117c +/* 06B3A4 8006A7A4 2508117C */ addiu $t0, %lo(D_80121178+4) # addiu $t0, $t0, 0x117c /* 06B3A8 8006A7A8 240BFFFF */ li $t3, -1 /* 06B3AC 8006A7AC AD020000 */ sw $v0, ($t0) /* 06B3B0 8006A7B0 AD2B0000 */ sw $t3, ($t1) @@ -87,12 +87,12 @@ glabel func_8006A6B0 /* 06B3F4 8006A7F4 8D2F0000 */ lw $t7, ($t1) /* 06B3F8 8006A7F8 80A40000 */ lb $a0, ($a1) /* 06B3FC 8006A7FC 8FA3002C */ lw $v1, 0x2c($sp) -/* 06B400 8006A800 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B400 8006A800 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B404 8006A804 3C0A8012 */ lui $t2, %hi(D_80121170) # $t2, 0x8012 /* 06B408 8006A808 01E4082A */ slt $at, $t7, $a0 /* 06B40C 8006A80C 254A1170 */ addiu $t2, %lo(D_80121170) # addiu $t2, $t2, 0x1170 /* 06B410 8006A810 10200002 */ beqz $at, .L8006A81C -/* 06B414 8006A814 2508117C */ addiu $t0, %lo(D_8012117C) # addiu $t0, $t0, 0x117c +/* 06B414 8006A814 2508117C */ addiu $t0, %lo(D_80121178+4) # addiu $t0, $t0, 0x117c /* 06B418 8006A818 AD240000 */ sw $a0, ($t1) .L8006A81C: /* 06B41C 8006A81C 80A4004C */ lb $a0, 0x4c($a1) @@ -159,10 +159,10 @@ glabel func_8006A6B0 /* 06B508 8006A908 8D2F0000 */ lw $t7, ($t1) /* 06B50C 8006A90C 3C048012 */ lui $a0, %hi(D_80121178) # $a0, 0x8012 /* 06B510 8006A910 24841178 */ addiu $a0, %lo(D_80121178) # addiu $a0, $a0, 0x1178 -/* 06B514 8006A914 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B514 8006A914 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B518 8006A918 3C0A8012 */ lui $t2, %hi(D_80121170) # $t2, 0x8012 /* 06B51C 8006A91C 254A1170 */ addiu $t2, %lo(D_80121170) # addiu $t2, $t2, 0x1170 -/* 06B520 8006A920 2508117C */ addiu $t0, %lo(D_8012117C) # addiu $t0, $t0, 0x117c +/* 06B520 8006A920 2508117C */ addiu $t0, %lo(D_80121178+4) # addiu $t0, $t0, 0x117c /* 06B524 8006A924 AC820000 */ sw $v0, ($a0) /* 06B528 8006A928 19E0000B */ blez $t7, .L8006A958 /* 06B52C 8006A92C 240BFFFF */ li $t3, -1 @@ -349,7 +349,7 @@ glabel func_8006A6B0 .L8006ABC4: /* 06B7C4 8006ABC4 8DCE1170 */ lw $t6, %lo(D_80121170)($t6) -/* 06B7C8 8006ABC8 3C0F8012 */ lui $t7, %hi(D_8012117C) # $t7, 0x8012 +/* 06B7C8 8006ABC8 3C0F8012 */ lui $t7, %hi(D_80121178+4) # $t7, 0x8012 /* 06B7CC 8006ABCC 008E082A */ slt $at, $a0, $t6 /* 06B7D0 8006ABD0 14200003 */ bnez $at, .L8006ABE0 /* 06B7D4 8006ABD4 0004C080 */ sll $t8, $a0, 2 @@ -357,7 +357,7 @@ glabel func_8006A6B0 /* 06B7DC 8006ABDC 24020E10 */ li $v0, 3600 .L8006ABE0: -/* 06B7E0 8006ABE0 8DEF117C */ lw $t7, %lo(D_8012117C)($t7) +/* 06B7E0 8006ABE0 8DEF117C */ lw $t7, %lo(D_80121178+4)($t7) /* 06B7E4 8006ABE4 0304C023 */ subu $t8, $t8, $a0 /* 06B7E8 8006ABE8 0018C040 */ sll $t8, $t8, 1 /* 06B7EC 8006ABEC 01F8C821 */ addu $t9, $t7, $t8 @@ -386,11 +386,11 @@ glabel func_8006A6B0 /* 06B83C 8006AC3C 00000000 */ nop /* 06B840 8006AC40 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B844 8006AC44 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B848 8006AC48 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B848 8006AC48 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B84C 8006AC4C 0082082A */ slt $at, $a0, $v0 /* 06B850 8006AC50 10200073 */ beqz $at, .L8006AE20 /* 06B854 8006AC54 00044880 */ sll $t1, $a0, 2 -/* 06B858 8006AC58 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06B858 8006AC58 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06B85C 8006AC5C 01244823 */ subu $t1, $t1, $a0 /* 06B860 8006AC60 00094840 */ sll $t1, $t1, 1 /* 06B864 8006AC64 01091821 */ addu $v1, $t0, $t1 @@ -413,11 +413,11 @@ glabel func_8006A6B0 /* 06B898 8006AC98 14A20016 */ bne $a1, $v0, .L8006ACF4 /* 06B89C 8006AC9C 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B8A0 8006ACA0 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B8A4 8006ACA4 3C0B8012 */ lui $t3, %hi(D_8012117C) # $t3, 0x8012 +/* 06B8A4 8006ACA4 3C0B8012 */ lui $t3, %hi(D_80121178+4) # $t3, 0x8012 /* 06B8A8 8006ACA8 0082082A */ slt $at, $a0, $v0 /* 06B8AC 8006ACAC 1020005C */ beqz $at, .L8006AE20 /* 06B8B0 8006ACB0 00046080 */ sll $t4, $a0, 2 -/* 06B8B4 8006ACB4 8D6B117C */ lw $t3, %lo(D_8012117C)($t3) +/* 06B8B4 8006ACB4 8D6B117C */ lw $t3, %lo(D_80121178+4)($t3) /* 06B8B8 8006ACB8 01846023 */ subu $t4, $t4, $a0 /* 06B8BC 8006ACBC 000C6040 */ sll $t4, $t4, 1 /* 06B8C0 8006ACC0 016C1821 */ addu $v1, $t3, $t4 @@ -439,11 +439,11 @@ glabel func_8006A6B0 .L8006ACF4: /* 06B8F4 8006ACF4 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B8F8 8006ACF8 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B8FC 8006ACFC 3C0E8012 */ lui $t6, %hi(D_8012117C) # $t6, 0x8012 +/* 06B8FC 8006ACFC 3C0E8012 */ lui $t6, %hi(D_80121178+4) # $t6, 0x8012 /* 06B900 8006AD00 0082082A */ slt $at, $a0, $v0 /* 06B904 8006AD04 10200046 */ beqz $at, .L8006AE20 /* 06B908 8006AD08 00047880 */ sll $t7, $a0, 2 -/* 06B90C 8006AD0C 8DCE117C */ lw $t6, %lo(D_8012117C)($t6) +/* 06B90C 8006AD0C 8DCE117C */ lw $t6, %lo(D_80121178+4)($t6) /* 06B910 8006AD10 01E47823 */ subu $t7, $t7, $a0 /* 06B914 8006AD14 000F7840 */ sll $t7, $t7, 1 /* 06B918 8006AD18 01CF1821 */ addu $v1, $t6, $t7 @@ -470,11 +470,11 @@ glabel func_8006A6B0 /* 06B95C 8006AD5C 14C20017 */ bne $a2, $v0, .L8006ADBC /* 06B960 8006AD60 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B964 8006AD64 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B968 8006AD68 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06B968 8006AD68 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06B96C 8006AD6C 0082082A */ slt $at, $a0, $v0 /* 06B970 8006AD70 1020002B */ beqz $at, .L8006AE20 /* 06B974 8006AD74 00044880 */ sll $t1, $a0, 2 -/* 06B978 8006AD78 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06B978 8006AD78 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06B97C 8006AD7C 01244823 */ subu $t1, $t1, $a0 /* 06B980 8006AD80 00094840 */ sll $t1, $t1, 1 /* 06B984 8006AD84 01091821 */ addu $v1, $t0, $t1 @@ -497,11 +497,11 @@ glabel func_8006A6B0 .L8006ADBC: /* 06B9BC 8006ADBC 3C028012 */ lui $v0, %hi(D_80121170) # $v0, 0x8012 /* 06B9C0 8006ADC0 8C421170 */ lw $v0, %lo(D_80121170)($v0) -/* 06B9C4 8006ADC4 3C0C8012 */ lui $t4, %hi(D_8012117C) # $t4, 0x8012 +/* 06B9C4 8006ADC4 3C0C8012 */ lui $t4, %hi(D_80121178+4) # $t4, 0x8012 /* 06B9C8 8006ADC8 0082082A */ slt $at, $a0, $v0 /* 06B9CC 8006ADCC 10200014 */ beqz $at, .L8006AE20 /* 06B9D0 8006ADD0 00046880 */ sll $t5, $a0, 2 -/* 06B9D4 8006ADD4 8D8C117C */ lw $t4, %lo(D_8012117C)($t4) +/* 06B9D4 8006ADD4 8D8C117C */ lw $t4, %lo(D_80121178+4)($t4) /* 06B9D8 8006ADD8 01A46823 */ subu $t5, $t5, $a0 /* 06B9DC 8006ADDC 000D6840 */ sll $t5, $t5, 1 /* 06B9E0 8006ADE0 018D1821 */ addu $v1, $t4, $t5 @@ -548,9 +548,9 @@ glabel func_8006A6B0 /* 06BA68 8006AE68 14C20013 */ bne $a2, $v0, .L8006AEB8 /* 06BA6C 8006AE6C 00000000 */ nop /* 06BA70 8006AE70 04800066 */ bltz $a0, .L8006B00C -/* 06BA74 8006AE74 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06BA74 8006AE74 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06BA78 8006AE78 00044880 */ sll $t1, $a0, 2 -/* 06BA7C 8006AE7C 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06BA7C 8006AE7C 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06BA80 8006AE80 01244823 */ subu $t1, $t1, $a0 /* 06BA84 8006AE84 00094840 */ sll $t1, $t1, 1 /* 06BA88 8006AE88 01091021 */ addu $v0, $t0, $t1 @@ -572,9 +572,9 @@ glabel func_8006A6B0 /* 06BAB8 8006AEB8 14A20013 */ bne $a1, $v0, .L8006AF08 /* 06BABC 8006AEBC 00000000 */ nop /* 06BAC0 8006AEC0 04800052 */ bltz $a0, .L8006B00C -/* 06BAC4 8006AEC4 3C0B8012 */ lui $t3, %hi(D_8012117C) # $t3, 0x8012 +/* 06BAC4 8006AEC4 3C0B8012 */ lui $t3, %hi(D_80121178+4) # $t3, 0x8012 /* 06BAC8 8006AEC8 00046080 */ sll $t4, $a0, 2 -/* 06BACC 8006AECC 8D6B117C */ lw $t3, %lo(D_8012117C)($t3) +/* 06BACC 8006AECC 8D6B117C */ lw $t3, %lo(D_80121178+4)($t3) /* 06BAD0 8006AED0 01846023 */ subu $t4, $t4, $a0 /* 06BAD4 8006AED4 000C6040 */ sll $t4, $t4, 1 /* 06BAD8 8006AED8 016C1021 */ addu $v0, $t3, $t4 @@ -594,9 +594,9 @@ glabel func_8006A6B0 /* 06BB04 8006AF04 2402FFFF */ li $v0, -1 .L8006AF08: /* 06BB08 8006AF08 04800040 */ bltz $a0, .L8006B00C -/* 06BB0C 8006AF0C 3C0E8012 */ lui $t6, %hi(D_8012117C) # $t6, 0x8012 +/* 06BB0C 8006AF0C 3C0E8012 */ lui $t6, %hi(D_80121178+4) # $t6, 0x8012 /* 06BB10 8006AF10 00047880 */ sll $t7, $a0, 2 -/* 06BB14 8006AF14 8DCE117C */ lw $t6, %lo(D_8012117C)($t6) +/* 06BB14 8006AF14 8DCE117C */ lw $t6, %lo(D_80121178+4)($t6) /* 06BB18 8006AF18 01E47823 */ subu $t7, $t7, $a0 /* 06BB1C 8006AF1C 000F7840 */ sll $t7, $t7, 1 /* 06BB20 8006AF20 01CF1021 */ addu $v0, $t6, $t7 @@ -623,9 +623,9 @@ glabel func_8006A6B0 /* 06BB64 8006AF64 14C20014 */ bne $a2, $v0, .L8006AFB8 /* 06BB68 8006AF68 00000000 */ nop /* 06BB6C 8006AF6C 04800027 */ bltz $a0, .L8006B00C -/* 06BB70 8006AF70 3C088012 */ lui $t0, %hi(D_8012117C) # $t0, 0x8012 +/* 06BB70 8006AF70 3C088012 */ lui $t0, %hi(D_80121178+4) # $t0, 0x8012 /* 06BB74 8006AF74 00044880 */ sll $t1, $a0, 2 -/* 06BB78 8006AF78 8D08117C */ lw $t0, %lo(D_8012117C)($t0) +/* 06BB78 8006AF78 8D08117C */ lw $t0, %lo(D_80121178+4)($t0) /* 06BB7C 8006AF7C 01244823 */ subu $t1, $t1, $a0 /* 06BB80 8006AF80 00094840 */ sll $t1, $t1, 1 /* 06BB84 8006AF84 01091021 */ addu $v0, $t0, $t1 @@ -646,9 +646,9 @@ glabel func_8006A6B0 /* 06BBB4 8006AFB4 2402FFFF */ li $v0, -1 .L8006AFB8: /* 06BBB8 8006AFB8 04800014 */ bltz $a0, .L8006B00C -/* 06BBBC 8006AFBC 3C0C8012 */ lui $t4, %hi(D_8012117C) # $t4, 0x8012 +/* 06BBBC 8006AFBC 3C0C8012 */ lui $t4, %hi(D_80121178+4) # $t4, 0x8012 /* 06BBC0 8006AFC0 00046880 */ sll $t5, $a0, 2 -/* 06BBC4 8006AFC4 8D8C117C */ lw $t4, %lo(D_8012117C)($t4) +/* 06BBC4 8006AFC4 8D8C117C */ lw $t4, %lo(D_80121178+4)($t4) /* 06BBC8 8006AFC8 01A46823 */ subu $t5, $t5, $a0 /* 06BBCC 8006AFCC 000D6840 */ sll $t5, $t5, 1 /* 06BBD0 8006AFD0 018D1021 */ addu $v0, $t4, $t5 @@ -700,10 +700,10 @@ glabel func_8006A6B0 /* 06BC64 8006B064 000E2603 */ sra $a0, $t6, 0x18 /* 06BC68 8006B068 18A0000E */ blez $a1, .L8006B0A4 /* 06BC6C 8006B06C 00001825 */ move $v1, $zero -/* 06BC70 8006B070 3C068012 */ lui $a2, %hi(D_8012117C) # $a2, 0x8012 +/* 06BC70 8006B070 3C068012 */ lui $a2, %hi(D_80121178+4) # $a2, 0x8012 /* 06BC74 8006B074 00053880 */ sll $a3, $a1, 2 /* 06BC78 8006B078 00E53823 */ subu $a3, $a3, $a1 -/* 06BC7C 8006B07C 8CC6117C */ lw $a2, %lo(D_8012117C)($a2) +/* 06BC7C 8006B07C 8CC6117C */ lw $a2, %lo(D_80121178+4)($a2) /* 06BC80 8006B080 00073840 */ sll $a3, $a3, 1 /* 06BC84 8006B084 00001025 */ move $v0, $zero .L8006B088: diff --git a/bss.txt b/bss.txt index 4d9273df..d2152b1a 100644 --- a/bss.txt +++ b/bss.txt @@ -25,65 +25,9 @@ unknown_05F690 unknown_0667D0 unknown_066AA0 -D_80120AC0; -D_80120AC4; -D_80120AF4; -D_80120BD0; -D_80120BD4; -D_80120CE0; -D_80120CE4; -D_80120CE8; -D_80120CF0; -D_80120D08; -D_80120D0C; -D_80120D10; -D_80120D14; -D_80120D15; -D_80120D18; -D_80120D1C; -D_80120D20; -D_80120D28; -D_80120D40; -D_80120D58; -D_80120D6C; -D_80120D70; -D_80120D74; -D_80120D88; -D_80120DA0; -D_80120EE0; -D_80120F20; -D_80120F60; -D_80120FA0; -D_80120FE0; -D_80121020; -D_80121060; -D_801210A0; -D_801210E0; -D_801210F8; -D_801210FC; -D_80121100; -D_80121103; -D_80121110; -D_80121128; -D_80121140; -D_80121148; -D_80121150; -D_80121151; -D_80121152; -D_80121153; -D_80121160; -D_80121164; -D_80121168; -D_8012116C; -D_80121170; -D_80121174; -D_80121178; -D_8012117C; -D_80121180; -D_801211C0; - unknown_06B2B0 +D_801211C0; D_801211C8; D_801211F0; D_801211F8; diff --git a/src/unknown_0667D0.c b/src/unknown_0667D0.c index be88af19..e4aa8899 100644 --- a/src/unknown_0667D0.c +++ b/src/unknown_0667D0.c @@ -32,7 +32,7 @@ s32 D_8011F75C; OSThread *D_8011F760; // OSThread for thread 1 s32 D_8011F764; s32 D_8011F768[106]; -s32 *D_8011F910; +s32 *D_8011F910[1132]; /******************************/ diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index 9e6845bb..53590b5e 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -1,956 +1,969 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x80065EA0 */ - -#include "types.h" -#include "macros.h" -#include "structs.h" -#include "fast3d.h" - -extern u32 osTvType; - -/************ .rodata ************/ - -const char D_800E6F00[] = "Camera Error: Illegal mode!\n"; -const char D_800E6F20[] = "Camera Error: Illegal player no!\n"; -const char D_800E6F34[] = "cameraPushSprMtx: model stack overflow!!\n"; -const char D_800E6F70[] = "\nCam do 2D sprite called with NULL pointer!"; -const char D_800E6F9C[] = "CamDo2DSprite FrameNo Overflow !!!\n"; -const char D_800E6FC0[] = "cameraPushModelMtx: model stack overflow!!\n"; -const char D_800E6FEC[] = "camPushModelMtx: bsp stack overflow!!\n"; -const char D_800E7010[] = "camPopModelMtx: model stack negative overflow!!\n"; -const char D_800E7048[] = "camPopModelMtx: bsp stack negative overflow!!\n"; - -/*********************************/ - -/************ .data ************/ - -s32 D_800DD060 = 0; // Currently unknown, might be a different type. - -/* Size: 0x34 bytes. */ -typedef struct unk800DD064 { - s32 unk0; - s32 unk4; - s32 unk8; - s32 unkC; - s32 unk10; - s32 unk14; - s32 unk18; - s32 unk1C; - s32 unk20; - s32 unk24; - s32 unk28; - s32 unk2C; - s32 unk30; -} unk800DD064; - -unk800DD064 D_800DD064[4] = { - { - 0x00, 0x00, 0x140, 0xF0, - 0xA0, 0x78, 0x140, 0xF0, - 0x00, 0x00, 0x13F, 0xEF, 0x00 - }, - { - 0x00, 0x00, 0x140, 0xF0, - 0xA0, 0x78, 0x140, 0xF0, - 0x00, 0x00, 0x13F, 0xEF, 0x00 - }, - { - 0x00, 0x00, 0x140, 0xF0, - 0xA0, 0x78, 0x140, 0xF0, - 0x00, 0x00, 0x13F, 0xEF, 0x00 - }, - { - 0x00, 0x00, 0x140, 0xF0, - 0xA0, 0x78, 0x140, 0xF0, - 0x00, 0x00, 0x13F, 0xEF, 0x00 - } -}; - -// Not sure about the typing here -s16 D_800DD134[10] = { - 0, 0, 0, 0, - 0, -1, -1, 0, - 0, 0 -}; - -// Not sure about the typing here -u16 D_800DD148[160] = { - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0, - 0, 0, 0x01FF, 0 -}; - -f32 D_800DD288[6] = { - 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -281.0f -}; - -f32 D_800DD2A0[6] = { - 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f -}; - -f32 D_800DD2B8[5] = { - 1.0f, 0.0f, 0.0f, 0.0f, 0.0f -}; - -f32 D_800DD2CC[11] = { - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 160.0f -}; - -u8 D_800DD2F8[8] = { - 0, 0, 0, 0, 0, 0, 0, 0 -}; - -s32 D_800DD300 = 0; // Currently unknown, might be a different type. - -s16 D_800DD304 = -1; - -/*******************************/ - -/* Size: 0x44 bytes */ -typedef struct unk80120AC0 { - s16 unk0; - s16 unk2; - s16 unk4; - u8 pad6[6]; - f32 x_position; - f32 y_position; - f32 z_position; - f32 pad18; - f32 unk1C; - f32 pad20; - f32 unk24; - f32 unk28; - f32 unk2C; - f32 unk30; - s16 unk34; - s16 pad36; - s16 unk38; - s8 pad3A; - s8 unk3B; - u8 pad3C[8]; -} unk80120AC0; - -extern unk80120AC0 D_80120AC0[4]; // Unknown number of entries. -extern unk80120AC0 D_80120AFB[4]; // Unknown number of entries. -extern unk80120AC0 D_80120BD0[4]; // Unknown number of entries. -extern s32 D_80120CE0; -extern s32 D_80120CE4; -extern s32 D_80120CE8; -extern s32 D_80120D08; -extern s32 D_80120D0C; -extern f32 D_80120D10; -extern s8 D_80120D14; -extern u8 D_80120D15; -extern s32 D_80120D18; -extern s32 D_80120D1C; -extern s32 D_80120D6C; -extern s32 D_80120D70[6]; -extern s32 D_80120D88[6]; // Unknown number of entries. -extern s32 D_80120EE0; -extern s32 D_80120F20; -extern s32 D_80120F60; -extern s32 D_80120FE0; -extern s32 D_80120FA0; -extern s32 D_80121060; -extern s32 D_801210A0; -extern s32 D_801210E0; - -/* Size: 5 bytes */ -typedef struct unk80121110 { - u16 unk0; - s8 unk2; - s8 unk3; - s8 unk4; -} unk80121110; -extern unk80121110 D_80121110[2]; // Unknown number of entries -extern u16 D_80121140[2]; // Unknown number of entries. -extern u16 D_80121148[2]; // Unknown number of entries. -extern u8 D_80121150[8]; // Unknown number of entries. - -extern s32 D_A4000000; -extern s32 SP_IMEM; - -unk80120AC0 *func_80069D20(void); -void func_800014BC(f32 arg0); -s8* func_8001E29C(s32 arg0); -s32 func_8006A624(s8 arg0); -void func_8006F64C(s32*, f32, f32, f32, f32*, f32*, f32*); -void guPerspectiveF(s32*, s32*, f32, f32, f32, f32, f32); -void func_8006F870(s32*, s32*); -s16 func_80029F18(f32, f32, f32); -void func_8006A50C(void); -void func_800665E8(s32 arg0); -void func_8006CB58(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -void func_8006C164(void); -void func_8000E194(void); -f32 sqrtf(f32); -void osSetTime(u64); -void func_8001D5E0(f32 arg0, f32 arg1, f32 arg2); -void func_800705F8(s32, f32, f32, f32); -void func_8006ECFC(s32 arg0); - - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80065EA0.s") - -void func_80066060(s32 arg0, s32 arg1) { - if (arg0 >= 0 && arg0 < 4) { - D_800DD2F8[arg0] = arg1; - D_80120AC0[arg0].unk3B = arg1; - } -} - -void func_80066098(s8 arg0) { - s8 temp = (arg0 << 24) >> 24; - if (!osTvType) { - D_80120D15 = temp; - } -} -void func_800660C0(void) { - D_80120D18 = 1; -} -void func_800660D0(void) { - D_80120D18 = 0; -} -/* Unused? */ -f32 func_800660DC(void) { - return D_80120D10; -} - -void func_800660EC(f32 arg0) { - if (0.0f < arg0 && arg0 < 90.0f && arg0 != D_80120D10) { - D_80120D10 = arg0; - guPerspectiveF(&D_80120EE0, &D_80120D6C, arg0, 1.33333333f, 10.0f, 15000.0f, 1.0f); - func_8006F870(&D_80120EE0, &D_80120FE0); - } -} - -void func_80066194(void) { - guPerspectiveF(&D_80120EE0, &D_80120D6C, 60.0f, 1.33333333f, 10.0f, 15000.0f, 1.0f); - func_8006F870(&D_80120EE0, &D_80120FE0); -} - -/* Unused? */ -s32* func_80066204(void) { - return &D_801210A0; -} - -s32 func_80066210(void) { - return D_80120CE0; -} - -s32 func_80066220(void) { - return D_80120CE4; -} - -void func_80066230(s32 arg0, s32 arg1) { - unk80120AC0 *someStruct; - s16 sp2A; - s16 sp28; - s16 sp26; - s16 sp24; - f32 sp20; - f32 sp1C; - f32 sp18; - - func_8006652C(0); - func_800665E8(0); - someStruct = func_80069D20(); - sp2A = someStruct->unk0; - sp28 = someStruct->unk2; - sp26 = someStruct->unk4; - sp20 = someStruct->x_position; - sp1C = someStruct->y_position; - sp18 = someStruct->z_position; - sp24 = someStruct->unk38; - someStruct->unk4 = 0; - someStruct->unk2 = 0; - someStruct->unk0 = -0x8000; - someStruct->unk38 = 0; - someStruct->x_position = 0.0f; - someStruct->y_position = 0.0f; - someStruct->z_position = 0.0f; - func_8001D5E0(0.0f, 0.0f, -1.0f); - func_80066CDC(arg0, arg1); - someStruct->unk38 = sp24; - someStruct->unk0 = sp2A; - someStruct->unk2 = sp28; - someStruct->unk4 = sp26; - someStruct->x_position = sp20; - someStruct->y_position = sp1C; - someStruct->z_position = sp18; -} - -f32 func_80066348(f32 arg0, f32 arg1, f32 arg2) { - s32 phi_v1; - f32 temp_f2, temp_f0, temp_f14; - - phi_v1 = D_80120CE4; - - if (D_80120D14 != 0) { - phi_v1 += 4; - } - - temp_f0 = arg2 - D_80120AC0[phi_v1].z_position; - temp_f2 = arg0 - D_80120AC0[phi_v1].x_position; - temp_f14 = arg1 - D_80120AC0[phi_v1].y_position; - return sqrtf((temp_f0 * temp_f0) + ((temp_f2 * temp_f2) + (temp_f14 * temp_f14))); -} - -void func_800663DC(s32 x_pos, s32 y_pos, s32 z_pos, s32 arg3, s32 arg4, s32 arg5) { - D_80120AC0[D_80120CE4].unk4 = (s16) (arg3 * 0xB6); - D_80120AC0[D_80120CE4].x_position = (f32) x_pos; - D_80120AC0[D_80120CE4].y_position = (f32) y_pos; - D_80120AC0[D_80120CE4].z_position = (f32) z_pos; - D_80120AC0[D_80120CE4].unk2 = (s16) (arg4 * 0xB6); - D_80120AC0[D_80120CE4].unk38 = (u16)0; - D_80120AC0[D_80120CE4].unk24 = 0.0f; - D_80120AC0[D_80120CE4].unk28 = 0.0f; - D_80120AC0[D_80120CE4].unk2C = 0.0f; - D_80120AC0[D_80120CE4].unk30 = 0.0f; - D_80120AC0[D_80120CE4].unk1C = 160.0f; - D_80120AC0[D_80120CE4].unk0 = (s16) (arg5 * 0xB6); - D_80120AC0[D_80120CE4].unk3B = D_800DD2F8[D_80120CE4]; -} - -void func_80066488(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6) { - arg0 += 4; - D_80120AC0[arg0].unk38 = 0; - D_80120AC0[arg0].x_position = arg1; - D_80120AC0[arg0].y_position = arg2; - D_80120AC0[arg0].z_position = arg3; - D_80120AC0[arg0].unk0 = arg4; - D_80120AC0[arg0].unk2 = arg5; - D_80120AC0[arg0].unk4 = arg6; - D_80120AC0[arg0].unk34 = func_80029F18(arg1, arg2, arg3); - D_80120D14 = 1; -} - -s8 func_80066510(void) { - return D_80120D14; -} - -void func_80066520(void) { - D_80120D14 = 0; -} - -s32 func_8006652C(s32 arg0) { - if ((arg0 >= 0) && (arg0 < 4)) { - D_80120CE0 = arg0; - } else { - D_80120CE0 = 0; - } - switch(D_80120CE0) { - case 0: - D_80120CE8 = 1; - break; - case 1: - D_80120CE8 = 2; - break; - case 2: - D_80120CE8 = 3; - break; - case 3: - D_80120CE8 = 4; - break; - } - if (D_80120CE4 >= D_80120CE8) { - D_80120CE4 = 0; - } - return D_80120CE8; -} - -void func_800665E8(s32 arg0) { - if (arg0 >= 0 && arg0 < 4) { - D_80120CE4 = arg0; - } else { - D_80120CE4 = 0; - } -} - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066610.s") - -void func_80066818(s32 arg0, s32 arg1) { - if (arg1 != 0) { - D_800DD064[arg0].unk30 |= 1; - } else { - D_800DD064[arg0].unk30 |= 2; - } - D_800DD064[arg0].unk30 &= -5; -} - -void func_80066894(s32 arg0, s32 arg1) { - if (arg1 != 0) { - D_800DD064[arg0].unk30 &= -2; - } else { - D_800DD064[arg0].unk30 |= 4; - } - D_800DD064[arg0].unk30 &= -3; -} - -s32 func_80066910(s32 arg0) { - return D_800DD064[arg0].unk30 & 0x1; -} - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066940.s") - -void func_80066AA8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { - if (arg1 != 0x8000) { - D_800DD064[arg0].unk10 = arg1; - D_800DD064[arg0].unk30 |= 8; - } else { - D_800DD064[arg0].unk30 &= 0xFFFFFFF7; - } - if (arg2 != 0x8000) { - D_800DD064[arg0].unk10 = arg2; - D_800DD064[arg0].unk30 |= 0x10; - } else { - D_800DD064[arg0].unk30 &= 0xFFFFFFEF; - } - if (arg3 != 0x8000) { - D_800DD064[arg0].unk18 = arg3; - D_800DD064[arg0].unk30 |= 0x20; - } else { - D_800DD064[arg0].unk30 &= 0xFFFFFFDF; - } - if (arg4 != 0x8000) { - D_800DD064[arg0].unk1C = arg4; - D_800DD064[arg0].unk30 |= 0x40; - return; - } - D_800DD064[arg0].unk30 &= 0xFFFFFFBF; -} - -s32 func_80066BA8(s32 arg0, s32 *arg1, s32 *arg2, s32 *arg3, s32 *arg4) { - *arg1 = D_800DD064[arg0].unk20; - *arg3 = D_800DD064[arg0].unk28; - *arg2 = D_800DD064[arg0].unk24; - *arg4 = D_800DD064[arg0].unk2C; - if ((*arg1 | *arg3 | *arg2 | *arg4) == 0) { - return 0; - } - return 1; -} - -void func_80066C2C(s32 arg0, s32 *arg1, s32 *arg2, s32 *arg3, s32 *arg4) { - *arg1 = D_800DD064[arg0].unk0; - *arg2 = D_800DD064[arg0].unk4; - *arg3 = D_800DD064[arg0].unk8; - *arg4 = D_800DD064[arg0].unkC; -} - -// Unused? -void func_80066C80(s32 *arg0, s32 *arg1, s32 *arg2, s32 *arg3) { - u32 temp_v0 = func_8007A520(); - *arg0 = 0; - *arg1 = 0; - *arg2 = temp_v0 & 0xFFFF; - *arg3 = (u32) (temp_v0 >> 0x10); -} - - -#if 1 -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066CDC.s") -#else -// Work in progress! - -void func_80066CDC(Gfx **dlist, s32 *arg1) { - u32 sp58; - u32 sp54; - u32 sp50; - u32 sp4C; - s32 sp34; - s32 sp2C; - u32 temp_a0; - u32 temp_a0_3; - u32 temp_a0_4; - u32 temp_a2; - u32 temp_a3; - u32 temp_a3_2; - u32 temp_t0; - u32 temp_t1_2; - u32 temp_v0; - u32 temp_v0_3; - u32 temp_v0_4; - u32 temp_v1_10; - u32 temp_v1_3; - u32 temp_v1_4; - s32 phi_t1; - s32 phi_v1; - f32 phi_f6; - f32 phi_f18; - f32 phi_f16; - f32 phi_f8; - f32 phi_f6_2; - f32 phi_f18_2; - f32 phi_f8_2; - f32 phi_f16_2; - u32 phi_a1; - f32 phi_f8_3; - f32 phi_f16_3; - f32 phi_f16_4; - u32 phi_t3; - u32 phi_a3_2; - u32 phi_t5; - u32 phi_t4; - - sp34 = D_80120CE4; - phi_t1 = D_80120CE4; - if (func_8000E184() && D_80120CE0 == 0) { - D_80120CE4 = 1; - phi_t1 = 0; - } - temp_v0 = func_8007A520(); - temp_t0 = temp_v0 >> 0x10; - temp_a3 = temp_t0 >> 1; - - if (D_800DD064[phi_t1].unk30 & 1) { - sp2C = D_80120CE4; - D_80120CE4 = phi_t1; - fast3d_cmd( - (*dlist)++, - ((((s32)(D_800DD064[D_80120CE4].unk24 * 4.0f)) & 0xFFF) | 0xED000000) | (((s32)(D_800DD064[D_80120CE4].unk20 * 4.0f)) & 0xFFF) << 0xC, - (((s32)(D_800DD064[D_80120CE4].unk2C * 4.0f)) & 0xFFF) | (((s32)(D_800DD064[D_80120CE4].unk28 * 4.0f)) & 0xFFF) << 0xC - ) - func_80068158(dlist, 0, 0, 0, 0); - D_80120CE4 = sp2C; - if (arg1 != 0) { - func_80067D3C(dlist, arg1); - } - D_80120CE4 = sp34; - return; - } - temp_t1_2 = temp_v0 & 0xFFFF; - phi_v1 = D_80120CE0; - if (D_80120CE0 == 2) { - phi_v1 = 3; - } - temp_a2 = temp_t1_2 >> 1; - sp54 = temp_a2; - sp58 = temp_a3; - if (osTvType == 0) { - sp58 = 0x91; - } - - switch(phi_v1) { - case 0: - phi_t3 = sp58; - if (osTvType == 0) { - phi_t3 = sp58 - 0x12; - } - phi_f16_4 = temp_t0; - if (temp_t0 < 0) { - phi_f16_4 = temp_t0 + 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - 0xED000000, - ((((s32)(temp_t1_2 * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f16_4 * 4.0f)) & 0xFFF) - ) - sp4C = temp_a2; - phi_a3_2 = temp_a2; - break; - case 1: - if (D_80120CE4 == 0) { - temp_v0_4 = temp_t0 >> 2; - phi_t3 = temp_v0_4; - if (osTvType == 0) { - phi_t3 = temp_v0_4 - 0xC; - } - phi_f8_3 = temp_a3 - (temp_t0 >> 7); - if (phi_f8_3 < 0) { - phi_f8_3 += 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - 0xED000000, - ((((s32)(temp_t1_2 * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f8_3 * 4.0f)) & 0xFFF) - ) - } else { - temp_v1_10 = temp_t0 >> 7; - phi_f16_3 = temp_t0 - temp_v1_10; - if (phi_f16_3 < 0) { - phi_f16_3 += 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - (((s32)((temp_a3 + temp_v1_10) * 4.0f)) & 0xFFF) | 0xED000000, - ((((s32)(temp_t1_2 * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f16_3 * 4.0f)) & 0xFFF) - ) - phi_t3 = temp_a3 + (temp_t0 >> 2); - } - sp4C = temp_a2; - phi_a3_2 = temp_a2; - break; - case 2: - if (D_80120CE4 == 0) { - phi_f8_2 = temp_t0; - if (temp_t0 < 0) { - phi_f8_2 = temp_t0 + 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - 0xED000000, - ((((s32)((temp_a2 - (temp_t1_2 >> 8)) * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f8_2 * 4.0f)) & 0xFFF) - ) - phi_a1 = temp_t1_2 >> 2; - } else { - temp_a0_4 = temp_t1_2 >> 8; - phi_f16_2 = temp_t0; - if (temp_t0 < 0) { - phi_f16_2 = temp_t0 + 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - (((s32)((temp_a2 + temp_a0_4) * 4.0f) & 0xFFF) << 0xC) | 0xED000000, - (((s32)((temp_t1_2 - temp_a0_4) * 4.0f) & 0xFFF) << 0xC) | (((s32)(phi_f16_2 * 4.0f)) & 0xFFF) - ) - phi_a1 = temp_a2 + (temp_t1_2 >> 2); - } - sp4C = phi_a1; - phi_t3 = sp58; - phi_a3_2 = phi_a1; - break; - case 3: - switch(D_80120CE4) { - case 0: - phi_f6_2 = temp_a2 - (temp_t1_2 >> 8); - if (phi_f6_2 < 0) { - phi_f6_2 += 4294967296.0f; - } - phi_f18_2 = temp_a3 - (temp_t0 >> 7); - if (phi_f18_2 < 0) { - phi_f18_2 += 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - ((((s32)(0U * 4.0f) & 0xFFF) << 0xC) | 0xED000000) | (((s32)(0U * 4.0f)) & 0xFFF), - (((s32)(phi_f6_2 * 4.0f) & 0xFFF) << 0xC) | (((s32)(phi_f18_2 * 4.0f)) & 0xFFF) - ) - phi_t5 = 0U; - phi_t4 = 0U; - break; - case 1: - temp_a0_3 = temp_t1_2 >> 8; - phi_f8 = temp_a3 - (temp_t0 >> 7); - if (phi_f8 < 0) { - phi_f8 += 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - ((((s32)((temp_a2 + temp_a0_3) * 4.0f)) & 0xFFF) << 0xC) | 0xED000000, - ((((s32)(((temp_a2 * 2) - temp_a0_3) * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f8 * 4.0f)) & 0xFFF) - ) - phi_t5 = 0U; - phi_t4 = temp_a2; - break; - case 2: - temp_v1_4 = temp_t0 >> 7; - phi_f16 = (temp_a3 * 2) - temp_v1_4; - if (phi_f16 < 0) { - phi_f16 += 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - (((s32)((temp_a3 + temp_v1_4) * 4.0f)) & 0xFFF) | 0xED000000, - ((((s32)((temp_a2 - (temp_t1_2 >> 8)) * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f16 * 4.0f)) & 0xFFF) - ) - phi_t5 = temp_a3; - phi_t4 = 0U; - break; - case 3: - temp_a0 = temp_t1_2 >> 8; - temp_v1_3 = temp_t0 >> 7; - phi_f6 = (temp_a2 * 2) - temp_a0; - if (phi_f6 < 0) { - phi_f6 += 4294967296.0f; - } - phi_f18 = (temp_a3 * 2) - temp_v1_3; - if (phi_f18 < 0) { - phi_f18 += 4294967296.0f; - } - fast3d_cmd( - (*dlist)++, - (((((s32)((temp_a2 + temp_a0) * 4.0f)) & 0xFFF) << 0xC) | 0xED000000) | (((s32)((temp_a3 + temp_v1_3) * 4.0f)) & 0xFFF), - ((((s32)(phi_f6 * 4.0f) & 0xFFF)) << 0xC) | (((s32)(phi_f18 * 4.0f)) & 0xFFF) - ) - phi_t5 = temp_a3; - phi_t4 = temp_a2; - break; - default: - phi_t5 = 0; - phi_t4 = 0; - break; - } - temp_v0_3 = phi_t5 + sp58; - temp_a3_2 = phi_t4 + sp54; - phi_t3 = temp_v0_3; - phi_a3_2 = temp_a3_2; - if (osTvType == 0) { - phi_t3 = temp_v0_3 - 6; - phi_a3_2 = temp_a3_2; - if (D_80120CE4 < 2) { - phi_t3 = temp_v0_3 - 0x14; - phi_a3_2 = temp_a3_2; - } - } - break; - default: - phi_t3 = sp50; - phi_a3_2 = sp4C; - break; - } - - if (osTvType == 0) { - phi_a3_2 -= 4; - } - func_80068158(dlist, sp54, sp58, phi_a3_2, phi_t3); - if (arg1 != 0) { - func_80067D3C(dlist, arg1); - } - D_80120CE4 = sp34; -} -#endif - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067A3C.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067D3C.s") - -void func_80067F20(f32 arg0) { - D_800DD2CC[0] = arg0; -} - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067F2C.s") - -void func_8006807C(Gfx **dlist, s32 *arg1) { - func_8006FE74(&D_80121060, &D_800DD288); - func_8006F768(&D_80121060, &D_80120EE0, &D_80120F20); - func_8006FE74(D_80120D70[0], &D_800DD2A0); - func_8006F768(D_80120D70[0], &D_80120F20, &D_80121060); - func_8006F870(&D_80121060, (s32*)*arg1); // This doesn't look right. Need to check this! - fast3d_cmd((*dlist)++, 0x1000040, (u32)(*arg1 + 0x80000000)) - *arg1 += 0x40; - D_80120D1C = 0; - D_80120D08 = 0; -} - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068158.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_800682AC.s") - -void func_80068408(Gfx **dlist, s32 *arg1) { - func_800705F8(D_80120D70[D_80120D1C], 0.0f, 0.0f, 0.0f); - func_8006F768(D_80120D70[D_80120D1C], &D_80120F20, &D_80121060); - func_8006F870(&D_80121060, (s32*)*arg1); // This doesn't look right. Need to check this! - D_80120D88[D_80120D1C] = *arg1; - - fast3d_cmd((*dlist)++, ((((D_80120D08 << 6) & 0xFF) << 0x10) | 0x1000000) | 0x40, (u32)(*arg1 + 0x80000000)) - - *arg1 += 0x40; -} - -void func_80068508(s32 arg0) { - D_80120D0C = arg0; -} - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068514.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068BF4.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068FA8.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069484.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069790.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069A40.s") - -unk80120AC0 *func_80069CFC(void) { - return &D_80120AC0[D_80120CE4]; -} - -unk80120AC0 *func_80069D20(void) { - if (D_80120D14 != 0) { - return &D_80120AC0[D_80120CE4 + 4]; - } - return &D_80120AC0[D_80120CE4]; -} - -unk80120AC0 *func_80069D7C(void) { - if (D_80120D14 != 0) { - return D_80120BD0; - } - return D_80120AC0; -} - -s32* func_80069DA4(void) { - return &D_80120FA0; -} - -s32* func_80069DB0(void) { - return &D_80120FE0; -} - -s32* func_80069DBC(void) { - return &D_80120F60; -} - -f32 func_80069DC8(f32 arg0, f32 arg1, f32 arg2) { - f32 sp34; - f32 sp30; - f32 returnVal; - func_8006F64C(&D_80120F60, arg0, arg1, arg2, &sp34, &sp30, &returnVal); - return returnVal; -} - -void func_80069E14(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f14; - f32 temp_f2; - s32 i; - - for (i = 0; i <= D_80120CE0; i++) { - temp_f0 = arg0 - D_80120AC0[i].x_position; - temp_f2 = arg1 - D_80120AC0[i].y_position; - temp_f14 = arg2 - D_80120AC0[i].z_position; - temp_f0_2 = sqrtf(((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) + (temp_f14 * temp_f14)); - if (temp_f0_2 < arg3) { - D_80120AC0[i].unk30 = ((arg3 - temp_f0_2) * arg4) / arg3; - } - } -} - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069F28.s") - -s32* func_8006A100(void) { - return &D_801210E0; -} - -#if 1 -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A10C.s") -#else - -extern s32 D_800DD300; -extern s32 D_801210F8; -extern s32 D_801210FC; -extern s8 D_80121100; -extern u8 D_80121103; - -// Has regalloc & stack issues. -s32 func_8006A10C(void) { - u8 sp23; - osCreateMesgQueue(&D_801210E0, &D_801210F8, 1); - osSetEventMesg(5, &D_801210E0, D_801210FC); - func_800CCC20(&D_801210E0, &sp23, &D_80121100); - func_800CCFE0(&D_801210E0); - func_8006A434(); - D_800DD300 = 0; - if ((sp23 & 1) && !(D_80121103 & 8)) { - return 0; - } - D_800DD300 = 1; - return -1; -} -#endif - -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A1C4.s") -GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A434.s") - -void func_8006A458(s8 *activePlayers) { - s32 i; - s32 temp = 0; - for(i = 0; i < 4; i++) { - if (activePlayers[i]) { - D_80121150[temp++] = i; - } - } - for(i = 0; i < 4; i++) { - if (!activePlayers[i]) { - D_80121150[temp++] = i; - } - } -} - -u8 func_8006A4F8(s32 arg0) { - return D_80121150[arg0]; -} - -void func_8006A50C(void) { - u8 temp = D_80121150[0]; - D_80121150[0] = D_80121150[1]; - D_80121150[1] = temp; -} - -u16 func_8006A528(s32 arg0) { - return D_80121110[D_80121150[arg0]].unk0; -} - -u16 func_8006A554(s32 arg0) { - return D_80121140[D_80121150[arg0]]; -} - -u16 func_8006A578(s32 arg0) { - return D_80121148[D_80121150[arg0]]; -} - -s32 func_8006A59C(s32 arg0) { - func_8006A624(D_80121110[D_80121150[arg0]].unk2); -} - -s32 func_8006A5E0(s32 arg0) { - func_8006A624(D_80121110[D_80121150[arg0]].unk3); -} - -s32 func_8006A624(s8 arg0) { - if (arg0 < 8 && arg0 >= -7) { - return 0; - } - if (arg0 > 0) { - arg0 -= 8; - if (arg0 >= 0x47) { - arg0 = 0x46; - } - } else { - arg0 += 8; - if (arg0 < -0x46) { - arg0 = -0x46; - } - } - return arg0; -} - -void func_8006A6A0(void) { - D_800DD304 = 0; -} +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x80065EA0 */ + +#include "types.h" +#include "macros.h" +#include "structs.h" +#include "fast3d.h" + +extern u32 osTvType; + +/************ .rodata ************/ + +const char D_800E6F00[] = "Camera Error: Illegal mode!\n"; +const char D_800E6F20[] = "Camera Error: Illegal player no!\n"; +const char D_800E6F34[] = "cameraPushSprMtx: model stack overflow!!\n"; +const char D_800E6F70[] = "\nCam do 2D sprite called with NULL pointer!"; +const char D_800E6F9C[] = "CamDo2DSprite FrameNo Overflow !!!\n"; +const char D_800E6FC0[] = "cameraPushModelMtx: model stack overflow!!\n"; +const char D_800E6FEC[] = "camPushModelMtx: bsp stack overflow!!\n"; +const char D_800E7010[] = "camPopModelMtx: model stack negative overflow!!\n"; +const char D_800E7048[] = "camPopModelMtx: bsp stack negative overflow!!\n"; + +/*********************************/ + +/************ .data ************/ + +s32 D_800DD060 = 0; // Currently unknown, might be a different type. + +/* Size: 0x34 bytes. */ +typedef struct unk800DD064 { + s32 unk0; + s32 unk4; + s32 unk8; + s32 unkC; + s32 unk10; + s32 unk14; + s32 unk18; + s32 unk1C; + s32 unk20; + s32 unk24; + s32 unk28; + s32 unk2C; + s32 unk30; +} unk800DD064; + +unk800DD064 D_800DD064[4] = { + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + }, + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + }, + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + }, + { + 0x00, 0x00, 0x140, 0xF0, + 0xA0, 0x78, 0x140, 0xF0, + 0x00, 0x00, 0x13F, 0xEF, 0x00 + } +}; + +// Not sure about the typing here +s16 D_800DD134[10] = { + 0, 0, 0, 0, + 0, -1, -1, 0, + 0, 0 +}; + +// Not sure about the typing here +u16 D_800DD148[160] = { + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0, + 0, 0, 0x01FF, 0 +}; + +f32 D_800DD288[6] = { + 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -281.0f +}; + +f32 D_800DD2A0[6] = { + 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f +}; + +f32 D_800DD2B8[5] = { + 1.0f, 0.0f, 0.0f, 0.0f, 0.0f +}; + +f32 D_800DD2CC[11] = { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 160.0f +}; + +u8 D_800DD2F8[8] = { + 0, 0, 0, 0, 0, 0, 0, 0 +}; + +s32 D_800DD300 = 0; // Currently unknown, might be a different type. + +s16 D_800DD304 = -1; + +/*******************************/ + +/************ .bss ************/ + +/* Size: 0x44 bytes, might just be Player? */ +typedef struct unk80120AC0 { + s16 unk0; + s16 unk2; + s16 unk4; + u8 pad6[6]; + f32 x_position; + f32 y_position; + f32 z_position; + f32 pad18; + f32 unk1C; + f32 pad20; + f32 unk24; + f32 unk28; + f32 unk2C; + f32 unk30; + s16 unk34; + s16 pad36; + s16 unk38; + s8 pad3A; + s8 unk3B; + u8 pad3C[8]; +} unk80120AC0; + +unk80120AC0 D_80120AC0[8]; +s32 D_80120CE0; +s32 D_80120CE4; +s32 D_80120CE8; +s32 D_80120CEC; +s32 D_80120CF0[6]; +s32 D_80120D08; +s32 D_80120D0C; +f32 D_80120D10; +s8 D_80120D14; +u8 D_80120D15; +s32 D_80120D18; +s32 D_80120D1C; +s32 D_80120D20[2]; +s32 D_80120D28[6]; +s32 D_80120D40[6]; +s32 D_80120D58[6]; +s32 D_80120D70[6]; +s32 D_80120D88[6]; +s32 D_80120DA0[80]; +s32 D_80120EE0[16]; +s32 D_80120F20[16]; +s32 D_80120F60[16]; +s32 D_80120FA0[16]; +s32 D_80120FE0[16]; +s32 D_80121020[16]; +s32 D_80121060[16]; +s32 D_801210A0[16]; +s32 D_801210E0[6]; +s32 D_801210F8; +s32 D_801210FC; +u8 D_80121100[16]; + +/* Size: 6 bytes */ +typedef struct unk80121110 { + u16 unk0; + s8 unk2; + s8 unk3; + s8 unk4; + s8 unk6; +} unk80121110; +unk80121110 D_80121110[8]; +u16 D_80121140[4]; +u16 D_80121148[4]; +u8 D_80121150[16]; + +/******************************/ + +extern s32 D_A4000000; +extern s32 SP_IMEM; + +unk80120AC0 *func_80069D20(void); +void func_800014BC(f32 arg0); +s8* func_8001E29C(s32 arg0); +s32 func_8006A624(s8 arg0); +void func_8006F64C(s32*, f32, f32, f32, f32*, f32*, f32*); +void guPerspectiveF(s32*, s32*, f32, f32, f32, f32, f32); +void func_8006F870(s32*, s32*); +s16 func_80029F18(f32, f32, f32); +void func_8006A50C(void); +void func_800665E8(s32 arg0); +void func_8006CB58(s32 arg0, s32 arg1, s32 arg2, s32 arg3); +void func_8006C164(void); +void func_8000E194(void); +f32 sqrtf(f32); +void osSetTime(u64); +void func_8001D5E0(f32 arg0, f32 arg1, f32 arg2); +void func_800705F8(s32, f32, f32, f32); +void func_8006ECFC(s32 arg0); + + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80065EA0.s") + +void func_80066060(s32 arg0, s32 arg1) { + if (arg0 >= 0 && arg0 < 4) { + D_800DD2F8[arg0] = arg1; + D_80120AC0[arg0].unk3B = arg1; + } +} + +void func_80066098(s8 arg0) { + s8 temp = (arg0 << 24) >> 24; + if (!osTvType) { + D_80120D15 = temp; + } +} +void func_800660C0(void) { + D_80120D18 = 1; +} +void func_800660D0(void) { + D_80120D18 = 0; +} +/* Unused? */ +f32 func_800660DC(void) { + return D_80120D10; +} + +void func_800660EC(f32 arg0) { + if (0.0f < arg0 && arg0 < 90.0f && arg0 != D_80120D10) { + D_80120D10 = arg0; + guPerspectiveF(&D_80120EE0, &D_80120D58[5], arg0, 1.33333333f, 10.0f, 15000.0f, 1.0f); + func_8006F870(&D_80120EE0, &D_80120FE0); + } +} + +void func_80066194(void) { + guPerspectiveF(&D_80120EE0, &D_80120D58[5], 60.0f, 1.33333333f, 10.0f, 15000.0f, 1.0f); + func_8006F870(&D_80120EE0, &D_80120FE0); +} + +/* Unused? */ +s32* func_80066204(void) { + return &D_801210A0; +} + +s32 func_80066210(void) { + return D_80120CE0; +} + +s32 func_80066220(void) { + return D_80120CE4; +} + +void func_80066230(s32 arg0, s32 arg1) { + unk80120AC0 *someStruct; + s16 sp2A; + s16 sp28; + s16 sp26; + s16 sp24; + f32 sp20; + f32 sp1C; + f32 sp18; + + func_8006652C(0); + func_800665E8(0); + someStruct = func_80069D20(); + sp2A = someStruct->unk0; + sp28 = someStruct->unk2; + sp26 = someStruct->unk4; + sp20 = someStruct->x_position; + sp1C = someStruct->y_position; + sp18 = someStruct->z_position; + sp24 = someStruct->unk38; + someStruct->unk4 = 0; + someStruct->unk2 = 0; + someStruct->unk0 = -0x8000; + someStruct->unk38 = 0; + someStruct->x_position = 0.0f; + someStruct->y_position = 0.0f; + someStruct->z_position = 0.0f; + func_8001D5E0(0.0f, 0.0f, -1.0f); + func_80066CDC(arg0, arg1); + someStruct->unk38 = sp24; + someStruct->unk0 = sp2A; + someStruct->unk2 = sp28; + someStruct->unk4 = sp26; + someStruct->x_position = sp20; + someStruct->y_position = sp1C; + someStruct->z_position = sp18; +} + +f32 func_80066348(f32 arg0, f32 arg1, f32 arg2) { + s32 phi_v1; + f32 temp_f2, temp_f0, temp_f14; + + phi_v1 = D_80120CE4; + + if (D_80120D14 != 0) { + phi_v1 += 4; + } + + temp_f0 = arg2 - D_80120AC0[phi_v1].z_position; + temp_f2 = arg0 - D_80120AC0[phi_v1].x_position; + temp_f14 = arg1 - D_80120AC0[phi_v1].y_position; + return sqrtf((temp_f0 * temp_f0) + ((temp_f2 * temp_f2) + (temp_f14 * temp_f14))); +} + +void func_800663DC(s32 x_pos, s32 y_pos, s32 z_pos, s32 arg3, s32 arg4, s32 arg5) { + D_80120AC0[D_80120CE4].unk4 = (s16) (arg3 * 0xB6); + D_80120AC0[D_80120CE4].x_position = (f32) x_pos; + D_80120AC0[D_80120CE4].y_position = (f32) y_pos; + D_80120AC0[D_80120CE4].z_position = (f32) z_pos; + D_80120AC0[D_80120CE4].unk2 = (s16) (arg4 * 0xB6); + D_80120AC0[D_80120CE4].unk38 = (u16)0; + D_80120AC0[D_80120CE4].unk24 = 0.0f; + D_80120AC0[D_80120CE4].unk28 = 0.0f; + D_80120AC0[D_80120CE4].unk2C = 0.0f; + D_80120AC0[D_80120CE4].unk30 = 0.0f; + D_80120AC0[D_80120CE4].unk1C = 160.0f; + D_80120AC0[D_80120CE4].unk0 = (s16) (arg5 * 0xB6); + D_80120AC0[D_80120CE4].unk3B = D_800DD2F8[D_80120CE4]; +} + +void func_80066488(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6) { + arg0 += 4; + D_80120AC0[arg0].unk38 = 0; + D_80120AC0[arg0].x_position = arg1; + D_80120AC0[arg0].y_position = arg2; + D_80120AC0[arg0].z_position = arg3; + D_80120AC0[arg0].unk0 = arg4; + D_80120AC0[arg0].unk2 = arg5; + D_80120AC0[arg0].unk4 = arg6; + D_80120AC0[arg0].unk34 = func_80029F18(arg1, arg2, arg3); + D_80120D14 = 1; +} + +s8 func_80066510(void) { + return D_80120D14; +} + +void func_80066520(void) { + D_80120D14 = 0; +} + +s32 func_8006652C(s32 arg0) { + if ((arg0 >= 0) && (arg0 < 4)) { + D_80120CE0 = arg0; + } else { + D_80120CE0 = 0; + } + switch(D_80120CE0) { + case 0: + D_80120CE8 = 1; + break; + case 1: + D_80120CE8 = 2; + break; + case 2: + D_80120CE8 = 3; + break; + case 3: + D_80120CE8 = 4; + break; + } + if (D_80120CE4 >= D_80120CE8) { + D_80120CE4 = 0; + } + return D_80120CE8; +} + +void func_800665E8(s32 arg0) { + if (arg0 >= 0 && arg0 < 4) { + D_80120CE4 = arg0; + } else { + D_80120CE4 = 0; + } +} + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066610.s") + +void func_80066818(s32 arg0, s32 arg1) { + if (arg1 != 0) { + D_800DD064[arg0].unk30 |= 1; + } else { + D_800DD064[arg0].unk30 |= 2; + } + D_800DD064[arg0].unk30 &= -5; +} + +void func_80066894(s32 arg0, s32 arg1) { + if (arg1 != 0) { + D_800DD064[arg0].unk30 &= -2; + } else { + D_800DD064[arg0].unk30 |= 4; + } + D_800DD064[arg0].unk30 &= -3; +} + +s32 func_80066910(s32 arg0) { + return D_800DD064[arg0].unk30 & 0x1; +} + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066940.s") + +void func_80066AA8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + if (arg1 != 0x8000) { + D_800DD064[arg0].unk10 = arg1; + D_800DD064[arg0].unk30 |= 8; + } else { + D_800DD064[arg0].unk30 &= 0xFFFFFFF7; + } + if (arg2 != 0x8000) { + D_800DD064[arg0].unk10 = arg2; + D_800DD064[arg0].unk30 |= 0x10; + } else { + D_800DD064[arg0].unk30 &= 0xFFFFFFEF; + } + if (arg3 != 0x8000) { + D_800DD064[arg0].unk18 = arg3; + D_800DD064[arg0].unk30 |= 0x20; + } else { + D_800DD064[arg0].unk30 &= 0xFFFFFFDF; + } + if (arg4 != 0x8000) { + D_800DD064[arg0].unk1C = arg4; + D_800DD064[arg0].unk30 |= 0x40; + return; + } + D_800DD064[arg0].unk30 &= 0xFFFFFFBF; +} + +s32 func_80066BA8(s32 arg0, s32 *arg1, s32 *arg2, s32 *arg3, s32 *arg4) { + *arg1 = D_800DD064[arg0].unk20; + *arg3 = D_800DD064[arg0].unk28; + *arg2 = D_800DD064[arg0].unk24; + *arg4 = D_800DD064[arg0].unk2C; + if ((*arg1 | *arg3 | *arg2 | *arg4) == 0) { + return 0; + } + return 1; +} + +void func_80066C2C(s32 arg0, s32 *arg1, s32 *arg2, s32 *arg3, s32 *arg4) { + *arg1 = D_800DD064[arg0].unk0; + *arg2 = D_800DD064[arg0].unk4; + *arg3 = D_800DD064[arg0].unk8; + *arg4 = D_800DD064[arg0].unkC; +} + +// Unused? +void func_80066C80(s32 *arg0, s32 *arg1, s32 *arg2, s32 *arg3) { + u32 temp_v0 = func_8007A520(); + *arg0 = 0; + *arg1 = 0; + *arg2 = temp_v0 & 0xFFFF; + *arg3 = (u32) (temp_v0 >> 0x10); +} + + +#if 1 +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80066CDC.s") +#else +// Work in progress! + +void func_80066CDC(Gfx **dlist, s32 *arg1) { + u32 sp58; + u32 sp54; + u32 sp50; + u32 sp4C; + s32 sp34; + s32 sp2C; + u32 temp_a0; + u32 temp_a0_3; + u32 temp_a0_4; + u32 temp_a2; + u32 temp_a3; + u32 temp_a3_2; + u32 temp_t0; + u32 temp_t1_2; + u32 temp_v0; + u32 temp_v0_3; + u32 temp_v0_4; + u32 temp_v1_10; + u32 temp_v1_3; + u32 temp_v1_4; + s32 phi_t1; + s32 phi_v1; + f32 phi_f6; + f32 phi_f18; + f32 phi_f16; + f32 phi_f8; + f32 phi_f6_2; + f32 phi_f18_2; + f32 phi_f8_2; + f32 phi_f16_2; + u32 phi_a1; + f32 phi_f8_3; + f32 phi_f16_3; + f32 phi_f16_4; + u32 phi_t3; + u32 phi_a3_2; + u32 phi_t5; + u32 phi_t4; + + sp34 = D_80120CE4; + phi_t1 = D_80120CE4; + if (func_8000E184() && D_80120CE0 == 0) { + D_80120CE4 = 1; + phi_t1 = 0; + } + temp_v0 = func_8007A520(); + temp_t0 = temp_v0 >> 0x10; + temp_a3 = temp_t0 >> 1; + + if (D_800DD064[phi_t1].unk30 & 1) { + sp2C = D_80120CE4; + D_80120CE4 = phi_t1; + fast3d_cmd( + (*dlist)++, + ((((s32)(D_800DD064[D_80120CE4].unk24 * 4.0f)) & 0xFFF) | 0xED000000) | (((s32)(D_800DD064[D_80120CE4].unk20 * 4.0f)) & 0xFFF) << 0xC, + (((s32)(D_800DD064[D_80120CE4].unk2C * 4.0f)) & 0xFFF) | (((s32)(D_800DD064[D_80120CE4].unk28 * 4.0f)) & 0xFFF) << 0xC + ) + func_80068158(dlist, 0, 0, 0, 0); + D_80120CE4 = sp2C; + if (arg1 != 0) { + func_80067D3C(dlist, arg1); + } + D_80120CE4 = sp34; + return; + } + temp_t1_2 = temp_v0 & 0xFFFF; + phi_v1 = D_80120CE0; + if (D_80120CE0 == 2) { + phi_v1 = 3; + } + temp_a2 = temp_t1_2 >> 1; + sp54 = temp_a2; + sp58 = temp_a3; + if (osTvType == 0) { + sp58 = 0x91; + } + + switch(phi_v1) { + case 0: + phi_t3 = sp58; + if (osTvType == 0) { + phi_t3 = sp58 - 0x12; + } + phi_f16_4 = temp_t0; + if (temp_t0 < 0) { + phi_f16_4 = temp_t0 + 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + 0xED000000, + ((((s32)(temp_t1_2 * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f16_4 * 4.0f)) & 0xFFF) + ) + sp4C = temp_a2; + phi_a3_2 = temp_a2; + break; + case 1: + if (D_80120CE4 == 0) { + temp_v0_4 = temp_t0 >> 2; + phi_t3 = temp_v0_4; + if (osTvType == 0) { + phi_t3 = temp_v0_4 - 0xC; + } + phi_f8_3 = temp_a3 - (temp_t0 >> 7); + if (phi_f8_3 < 0) { + phi_f8_3 += 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + 0xED000000, + ((((s32)(temp_t1_2 * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f8_3 * 4.0f)) & 0xFFF) + ) + } else { + temp_v1_10 = temp_t0 >> 7; + phi_f16_3 = temp_t0 - temp_v1_10; + if (phi_f16_3 < 0) { + phi_f16_3 += 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + (((s32)((temp_a3 + temp_v1_10) * 4.0f)) & 0xFFF) | 0xED000000, + ((((s32)(temp_t1_2 * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f16_3 * 4.0f)) & 0xFFF) + ) + phi_t3 = temp_a3 + (temp_t0 >> 2); + } + sp4C = temp_a2; + phi_a3_2 = temp_a2; + break; + case 2: + if (D_80120CE4 == 0) { + phi_f8_2 = temp_t0; + if (temp_t0 < 0) { + phi_f8_2 = temp_t0 + 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + 0xED000000, + ((((s32)((temp_a2 - (temp_t1_2 >> 8)) * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f8_2 * 4.0f)) & 0xFFF) + ) + phi_a1 = temp_t1_2 >> 2; + } else { + temp_a0_4 = temp_t1_2 >> 8; + phi_f16_2 = temp_t0; + if (temp_t0 < 0) { + phi_f16_2 = temp_t0 + 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + (((s32)((temp_a2 + temp_a0_4) * 4.0f) & 0xFFF) << 0xC) | 0xED000000, + (((s32)((temp_t1_2 - temp_a0_4) * 4.0f) & 0xFFF) << 0xC) | (((s32)(phi_f16_2 * 4.0f)) & 0xFFF) + ) + phi_a1 = temp_a2 + (temp_t1_2 >> 2); + } + sp4C = phi_a1; + phi_t3 = sp58; + phi_a3_2 = phi_a1; + break; + case 3: + switch(D_80120CE4) { + case 0: + phi_f6_2 = temp_a2 - (temp_t1_2 >> 8); + if (phi_f6_2 < 0) { + phi_f6_2 += 4294967296.0f; + } + phi_f18_2 = temp_a3 - (temp_t0 >> 7); + if (phi_f18_2 < 0) { + phi_f18_2 += 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + ((((s32)(0U * 4.0f) & 0xFFF) << 0xC) | 0xED000000) | (((s32)(0U * 4.0f)) & 0xFFF), + (((s32)(phi_f6_2 * 4.0f) & 0xFFF) << 0xC) | (((s32)(phi_f18_2 * 4.0f)) & 0xFFF) + ) + phi_t5 = 0U; + phi_t4 = 0U; + break; + case 1: + temp_a0_3 = temp_t1_2 >> 8; + phi_f8 = temp_a3 - (temp_t0 >> 7); + if (phi_f8 < 0) { + phi_f8 += 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + ((((s32)((temp_a2 + temp_a0_3) * 4.0f)) & 0xFFF) << 0xC) | 0xED000000, + ((((s32)(((temp_a2 * 2) - temp_a0_3) * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f8 * 4.0f)) & 0xFFF) + ) + phi_t5 = 0U; + phi_t4 = temp_a2; + break; + case 2: + temp_v1_4 = temp_t0 >> 7; + phi_f16 = (temp_a3 * 2) - temp_v1_4; + if (phi_f16 < 0) { + phi_f16 += 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + (((s32)((temp_a3 + temp_v1_4) * 4.0f)) & 0xFFF) | 0xED000000, + ((((s32)((temp_a2 - (temp_t1_2 >> 8)) * 4.0f)) & 0xFFF) << 0xC) | (((s32)(phi_f16 * 4.0f)) & 0xFFF) + ) + phi_t5 = temp_a3; + phi_t4 = 0U; + break; + case 3: + temp_a0 = temp_t1_2 >> 8; + temp_v1_3 = temp_t0 >> 7; + phi_f6 = (temp_a2 * 2) - temp_a0; + if (phi_f6 < 0) { + phi_f6 += 4294967296.0f; + } + phi_f18 = (temp_a3 * 2) - temp_v1_3; + if (phi_f18 < 0) { + phi_f18 += 4294967296.0f; + } + fast3d_cmd( + (*dlist)++, + (((((s32)((temp_a2 + temp_a0) * 4.0f)) & 0xFFF) << 0xC) | 0xED000000) | (((s32)((temp_a3 + temp_v1_3) * 4.0f)) & 0xFFF), + ((((s32)(phi_f6 * 4.0f) & 0xFFF)) << 0xC) | (((s32)(phi_f18 * 4.0f)) & 0xFFF) + ) + phi_t5 = temp_a3; + phi_t4 = temp_a2; + break; + default: + phi_t5 = 0; + phi_t4 = 0; + break; + } + temp_v0_3 = phi_t5 + sp58; + temp_a3_2 = phi_t4 + sp54; + phi_t3 = temp_v0_3; + phi_a3_2 = temp_a3_2; + if (osTvType == 0) { + phi_t3 = temp_v0_3 - 6; + phi_a3_2 = temp_a3_2; + if (D_80120CE4 < 2) { + phi_t3 = temp_v0_3 - 0x14; + phi_a3_2 = temp_a3_2; + } + } + break; + default: + phi_t3 = sp50; + phi_a3_2 = sp4C; + break; + } + + if (osTvType == 0) { + phi_a3_2 -= 4; + } + func_80068158(dlist, sp54, sp58, phi_a3_2, phi_t3); + if (arg1 != 0) { + func_80067D3C(dlist, arg1); + } + D_80120CE4 = sp34; +} +#endif + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067A3C.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067D3C.s") + +void func_80067F20(f32 arg0) { + D_800DD2CC[0] = arg0; +} + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80067F2C.s") + +void func_8006807C(Gfx **dlist, s32 *arg1) { + func_8006FE74(&D_80121060, &D_800DD288); + func_8006F768(&D_80121060, &D_80120EE0, &D_80120F20); + func_8006FE74(D_80120D70[0], &D_800DD2A0); + func_8006F768(D_80120D70[0], &D_80120F20, &D_80121060); + func_8006F870(&D_80121060, (s32*)*arg1); // This doesn't look right. Need to check this! + fast3d_cmd((*dlist)++, 0x1000040, (u32)(*arg1 + 0x80000000)) + *arg1 += 0x40; + D_80120D1C = 0; + D_80120D08 = 0; +} + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068158.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_800682AC.s") + +void func_80068408(Gfx **dlist, s32 *arg1) { + func_800705F8(D_80120D70[D_80120D1C], 0.0f, 0.0f, 0.0f); + func_8006F768(D_80120D70[D_80120D1C], &D_80120F20, &D_80121060); + func_8006F870(&D_80121060, (s32*)*arg1); // This doesn't look right. Need to check this! + D_80120D88[D_80120D1C] = *arg1; + + fast3d_cmd((*dlist)++, ((((D_80120D08 << 6) & 0xFF) << 0x10) | 0x1000000) | 0x40, (u32)(*arg1 + 0x80000000)) + + *arg1 += 0x40; +} + +void func_80068508(s32 arg0) { + D_80120D0C = arg0; +} + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068514.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068BF4.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80068FA8.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069484.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069790.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069A40.s") + +unk80120AC0 *func_80069CFC(void) { + return &D_80120AC0[D_80120CE4]; +} + +unk80120AC0 *func_80069D20(void) { + if (D_80120D14 != 0) { + return &D_80120AC0[D_80120CE4 + 4]; + } + return &D_80120AC0[D_80120CE4]; +} + +unk80120AC0 *func_80069D7C(void) { + if (D_80120D14 != 0) { + return &D_80120AC0[4]; + } + return &D_80120AC0[0]; +} + +s32* func_80069DA4(void) { + return &D_80120FA0; +} + +s32* func_80069DB0(void) { + return &D_80120FE0; +} + +s32* func_80069DBC(void) { + return &D_80120F60; +} + +f32 func_80069DC8(f32 arg0, f32 arg1, f32 arg2) { + f32 sp34; + f32 sp30; + f32 returnVal; + func_8006F64C(&D_80120F60, arg0, arg1, arg2, &sp34, &sp30, &returnVal); + return returnVal; +} + +void func_80069E14(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f14; + f32 temp_f2; + s32 i; + + for (i = 0; i <= D_80120CE0; i++) { + temp_f0 = arg0 - D_80120AC0[i].x_position; + temp_f2 = arg1 - D_80120AC0[i].y_position; + temp_f14 = arg2 - D_80120AC0[i].z_position; + temp_f0_2 = sqrtf(((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) + (temp_f14 * temp_f14)); + if (temp_f0_2 < arg3) { + D_80120AC0[i].unk30 = ((arg3 - temp_f0_2) * arg4) / arg3; + } + } +} + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_80069F28.s") + +s32* func_8006A100(void) { + return &D_801210E0; +} + +#if 1 +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A10C.s") +#else + +extern s32 D_800DD300; +extern s32 D_801210F8; +extern s32 D_801210FC; +extern s8 D_80121100; +extern u8 D_80121100+3; + +// Has regalloc & stack issues. +s32 func_8006A10C(void) { + u8 sp23; + osCreateMesgQueue(&D_801210E0, &D_801210F8, 1); + osSetEventMesg(5, &D_801210E0, D_801210FC); + func_800CCC20(&D_801210E0, &sp23, &D_80121100); + func_800CCFE0(&D_801210E0); + func_8006A434(); + D_800DD300 = 0; + if ((sp23 & 1) && !(D_80121100+3 & 8)) { + return 0; + } + D_800DD300 = 1; + return -1; +} +#endif + +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A1C4.s") +GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A434.s") + +void func_8006A458(s8 *activePlayers) { + s32 i; + s32 temp = 0; + for(i = 0; i < 4; i++) { + if (activePlayers[i]) { + D_80121150[temp++] = i; + } + } + for(i = 0; i < 4; i++) { + if (!activePlayers[i]) { + D_80121150[temp++] = i; + } + } +} + +u8 func_8006A4F8(s32 arg0) { + return D_80121150[arg0]; +} + +void func_8006A50C(void) { + u8 temp = D_80121150[0]; + D_80121150[0] = D_80121150[1]; + D_80121150[1] = temp; +} + +u16 func_8006A528(s32 arg0) { + return D_80121110[D_80121150[arg0]].unk0; +} + +u16 func_8006A554(s32 arg0) { + return D_80121140[D_80121150[arg0]]; +} + +u16 func_8006A578(s32 arg0) { + return D_80121148[D_80121150[arg0]]; +} + +s32 func_8006A59C(s32 arg0) { + func_8006A624(D_80121110[D_80121150[arg0]].unk2); +} + +s32 func_8006A5E0(s32 arg0) { + func_8006A624(D_80121110[D_80121150[arg0]].unk3); +} + +s32 func_8006A624(s8 arg0) { + if (arg0 < 8 && arg0 >= -7) { + return 0; + } + if (arg0 > 0) { + arg0 -= 8; + if (arg0 >= 0x47) { + arg0 = 0x46; + } + } else { + arg0 += 8; + if (arg0 < -0x46) { + arg0 = -0x46; + } + } + return arg0; +} + +void func_8006A6A0(void) { + D_800DD304 = 0; +} diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index 37ff8f82..94e2caaa 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -115,32 +115,35 @@ s32 D_800DD424[2] = { /*******************************/ - extern s32 D_800DFD94; -extern s32 D_80121164; -extern LevelHeader* D_80121168; +/************ .bss ************/ -extern s32 D_80121170; -extern s32 D_80121174; +s32 D_80121160; +s32 D_80121164; +LevelHeader* D_80121168; +s32 D_8012116C; +s32 D_80121170; +s32 D_80121174; -// Size: 6 bytes -typedef struct unk8012117C { +// Unknown size +typedef struct unk80121178 { s8 unk0; s8 unk1; s8 unk2; s8 pad3[3]; -} unk8012117C; -extern unk8012117C *D_8012117C[2]; // Unknown number of entries +} unk80121178; +unk80121178 *D_80121178[2]; +s32 D_80121180; -extern s32 D_801211C0; -extern s16 D_801211C8[8]; // Unknown number of entries -extern Gfx *D_801211F0[3]; // Unknown number of entries. +extern s32 D_801211C0[2]; +extern s16 D_801211C8[8]; +extern Gfx *D_801211F0[3]; extern Gfx *D_801211F8; extern s32 D_80121208; extern s32 D_80121218; extern s32 D_80121228; -extern s8 D_80121250[16]; // Unknown number of entries +extern s8 D_80121250[16]; extern s32 D_801234E8; extern s32 D_801234EC; extern s32 D_801234F0; @@ -163,6 +166,8 @@ extern u8 D_80123526; extern s32* D_80123548; // This is actually an OSMesgQueue pointer. extern s32 D_80123560; +/******************************/ + void func_800014BC(f32 arg0); s8* func_8001E29C(s32 arg0); s32 func_8006A624(s8 arg0); @@ -186,14 +191,14 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006A6B0.s") s32 func_8006B0AC(s32 arg0) { if (arg0 > 0 && arg0 < D_80121170) { - return (*D_8012117C)[arg0].unk2 & 0xF; + return D_80121178[1][arg0].unk2 & 0xF; } return 0; } s32 func_8006B0F8(s32 arg0) { if (arg0 > 0 && arg0 < D_80121170) { - s32 temp = (*D_8012117C)[arg0].unk2; + s32 temp = D_80121178[1][arg0].unk2; if(temp != 0) { return (temp >> 4) & 0xF; } @@ -203,14 +208,14 @@ s32 func_8006B0F8(s32 arg0) { s8 func_8006B14C(s32 arg0) { if (arg0 >= 0 && arg0 < D_80121170) { - return (*D_8012117C)[arg0].unk1; + return D_80121178[1][arg0].unk1; } return -1; } s8 func_8006B190(s32 arg0) { if (arg0 >= 0 && arg0 < D_80121170) { - return (*D_8012117C)[arg0].unk0; + return D_80121178[1][arg0].unk0; } return 0; } @@ -240,9 +245,6 @@ s32 func_8006B240(void) { GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006B250.s") #else -extern s32 *D_80121160; -extern s32 D_800DD314; - Settings *get_settings(void); s32 *func_80076C58(s32); LevelHeader *func_80070C9C(s32, s32); @@ -556,7 +558,6 @@ void func_8006BEFC(void) { } } -extern s32 *D_80121160; Settings *get_settings(void); s32 *func_80076C58(s32); @@ -609,18 +610,18 @@ void func_8006BFC8(s8 *arg0) { } temp2 = D_80121160[phi_s0]; temp = D_80121160[phi_s0 + 1] - temp2; - D_801211C0 = func_80070C9C(temp, 0xFFFF00FF, D_80121160); - func_80076E68(0, D_801211C0, temp2, temp); + D_801211C0[0] = func_80070C9C(temp, 0xFFFF00FF, D_80121160); + func_80076E68(0, D_801211C0[0], temp2, temp); func_80071140(D_80121160); } #endif void func_8006C164(void) { - func_80071140(D_801211C0); + func_80071140(D_801211C0[0]); } s32 func_8006C18C(void) { - return D_801211C0; + return D_801211C0[0]; } s8 func_8006C19C(void) { diff --git a/undefined_syms.txt b/undefined_syms.txt index 043adce3..b806f1ac 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,67 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/D_8011D750 = 0x8011D750; -/D_8011D758 = 0x8011D758; -/D_8011F758 = 0x8011F758; -/D_8011F760 = 0x8011F760; -/D_8011F910 = 0x8011F910; - -D_80120AC0 = 0x80120AC0; -D_80120AC4 = 0x80120AC4; -D_80120AF4 = 0x80120AF4; -D_80120BD0 = 0x80120BD0; -D_80120BD4 = 0x80120BD4; -D_80120CE0 = 0x80120CE0; -D_80120CE4 = 0x80120CE4; -D_80120CE8 = 0x80120CE8; -D_80120CF0 = 0x80120CF0; -D_80120D08 = 0x80120D08; -D_80120D0C = 0x80120D0C; -D_80120D10 = 0x80120D10; -D_80120D14 = 0x80120D14; -D_80120D15 = 0x80120D15; -D_80120D18 = 0x80120D18; -D_80120D1C = 0x80120D1C; -D_80120D20 = 0x80120D20; -D_80120D28 = 0x80120D28; -D_80120D40 = 0x80120D40; -D_80120D58 = 0x80120D58; -D_80120D6C = 0x80120D6C; -D_80120D70 = 0x80120D70; -D_80120D74 = 0x80120D74; -D_80120D88 = 0x80120D88; -D_80120DA0 = 0x80120DA0; -D_80120EE0 = 0x80120EE0; -D_80120F20 = 0x80120F20; -D_80120F60 = 0x80120F60; -D_80120FA0 = 0x80120FA0; -D_80120FE0 = 0x80120FE0; -D_80121020 = 0x80121020; -D_80121060 = 0x80121060; -D_801210A0 = 0x801210A0; -D_801210E0 = 0x801210E0; -D_801210F8 = 0x801210F8; -D_801210FC = 0x801210FC; -D_80121100 = 0x80121100; -D_80121103 = 0x80121103; -D_80121110 = 0x80121110; -D_80121128 = 0x80121128; -D_80121140 = 0x80121140; -D_80121148 = 0x80121148; -D_80121150 = 0x80121150; -D_80121151 = 0x80121151; -D_80121152 = 0x80121152; -D_80121153 = 0x80121153; -D_80121160 = 0x80121160; -D_80121164 = 0x80121164; -D_80121168 = 0x80121168; -D_8012116C = 0x8012116C; -D_80121170 = 0x80121170; -D_80121174 = 0x80121174; -D_80121178 = 0x80121178; -D_8012117C = 0x8012117C; -D_80121180 = 0x80121180; D_801211C0 = 0x801211C0; D_801211C8 = 0x801211C8; D_801211F0 = 0x801211F0; From 46f771bc3ffa686e4affa97b2e9d5b76b087ae64 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 11:34:09 -0500 Subject: [PATCH 33/39] Added bss for unknown_06B2B0, _071730, _072E50 --- .../unknown_071730/func_80071278.s | 4 +- .../unknown_071730/func_80071478.s | 4 +- .../unknown_071730/func_80071538.s | 4 +- .../unknown_071730/func_8007164C.s | 4 +- .../unknown_071730/func_80071A24.s | 4 +- bss.txt | 68 --------------- src/unknown_06B2B0.c | 85 +++++++++++-------- src/unknown_071730.c | 20 +++-- src/unknown_072E50.c | 14 ++- src/unknown_0777A0.c | 4 + undefined_syms.txt | 66 +------------- 11 files changed, 94 insertions(+), 183 deletions(-) diff --git a/asm/non_matchings/unknown_071730/func_80071278.s b/asm/non_matchings/unknown_071730/func_80071278.s index 8dd66386..33867484 100644 --- a/asm/non_matchings/unknown_071730/func_80071278.s +++ b/asm/non_matchings/unknown_071730/func_80071278.s @@ -4,10 +4,10 @@ glabel func_80071278 /* 071E80 80071280 0C01C57B */ jal func_800715EC /* 071E84 80071284 AFA40020 */ sw $a0, 0x20($sp) /* 071E88 80071288 00027100 */ sll $t6, $v0, 4 -/* 071E8C 8007128C 3C038012 */ lui $v1, %hi(D_80123588) # $v1, 0x8012 +/* 071E8C 8007128C 3C038012 */ lui $v1, %hi(D_80123580+8) # $v1, 0x8012 /* 071E90 80071290 006E1821 */ addu $v1, $v1, $t6 /* 071E94 80071294 8FA40020 */ lw $a0, 0x20($sp) -/* 071E98 80071298 8C633588 */ lw $v1, %lo(D_80123588)($v1) +/* 071E98 80071298 8C633588 */ lw $v1, %lo(D_80123580+8)($v1) /* 071E9C 8007129C AFA20018 */ sw $v0, 0x18($sp) /* 071EA0 800712A0 00002825 */ move $a1, $zero /* 071EA4 800712A4 2407FFFF */ li $a3, -1 diff --git a/asm/non_matchings/unknown_071730/func_80071478.s b/asm/non_matchings/unknown_071730/func_80071478.s index 2fd0193d..db6fb9ea 100644 --- a/asm/non_matchings/unknown_071730/func_80071478.s +++ b/asm/non_matchings/unknown_071730/func_80071478.s @@ -8,9 +8,9 @@ glabel func_80071478 /* 072090 80071490 0C01C57B */ jal func_800715EC /* 072094 80071494 02002025 */ move $a0, $s0 /* 072098 80071498 00027100 */ sll $t6, $v0, 4 -/* 07209C 8007149C 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 +/* 07209C 8007149C 3C048012 */ lui $a0, %hi(D_80123580+8) # $a0, 0x8012 /* 0720A0 800714A0 008E2021 */ addu $a0, $a0, $t6 -/* 0720A4 800714A4 8C843588 */ lw $a0, %lo(D_80123588)($a0) +/* 0720A4 800714A4 8C843588 */ lw $a0, %lo(D_80123580+8)($a0) /* 0720A8 800714A8 00001825 */ move $v1, $zero /* 0720AC 800714AC 2409FFFF */ li $t1, -1 /* 0720B0 800714B0 24080004 */ li $t0, 4 diff --git a/asm/non_matchings/unknown_071730/func_80071538.s b/asm/non_matchings/unknown_071730/func_80071538.s index a5e2e0d1..ac75cf2b 100644 --- a/asm/non_matchings/unknown_071730/func_80071538.s +++ b/asm/non_matchings/unknown_071730/func_80071538.s @@ -7,10 +7,10 @@ glabel func_80071538 /* 07214C 8007154C 0C01C57B */ jal func_800715EC /* 072150 80071550 AFA20018 */ sw $v0, 0x18($sp) /* 072154 80071554 00027100 */ sll $t6, $v0, 4 -/* 072158 80071558 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 +/* 072158 80071558 3C048012 */ lui $a0, %hi(D_80123580+8) # $a0, 0x8012 /* 07215C 8007155C 008E2021 */ addu $a0, $a0, $t6 /* 072160 80071560 8FA70028 */ lw $a3, 0x28($sp) -/* 072164 80071564 8C843588 */ lw $a0, %lo(D_80123588)($a0) +/* 072164 80071564 8C843588 */ lw $a0, %lo(D_80123580+8)($a0) /* 072168 80071568 00001825 */ move $v1, $zero /* 07216C 8007156C 2406FFFF */ li $a2, -1 /* 072170 80071570 24050014 */ li $a1, 20 diff --git a/asm/non_matchings/unknown_071730/func_8007164C.s b/asm/non_matchings/unknown_071730/func_8007164C.s index e3b1ba33..30aa83a6 100644 --- a/asm/non_matchings/unknown_071730/func_8007164C.s +++ b/asm/non_matchings/unknown_071730/func_8007164C.s @@ -79,9 +79,9 @@ glabel func_8007164C /* 072370 80071770 00000000 */ nop /* 072374 80071774 00047100 */ sll $t6, $a0, 4 -/* 072378 80071778 3C028012 */ lui $v0, %hi(D_80123588) # $v0, 0x8012 +/* 072378 80071778 3C028012 */ lui $v0, %hi(D_80123580+8) # $v0, 0x8012 /* 07237C 8007177C 004E1021 */ addu $v0, $v0, $t6 -/* 072380 80071780 8C423588 */ lw $v0, %lo(D_80123588)($v0) +/* 072380 80071780 8C423588 */ lw $v0, %lo(D_80123580+8)($v0) /* 072384 80071784 03E00008 */ jr $ra /* 072388 80071788 00000000 */ nop diff --git a/asm/non_matchings/unknown_071730/func_80071A24.s b/asm/non_matchings/unknown_071730/func_80071A24.s index a7042aa7..3db3c795 100644 --- a/asm/non_matchings/unknown_071730/func_80071A24.s +++ b/asm/non_matchings/unknown_071730/func_80071A24.s @@ -26,8 +26,8 @@ glabel D_800E7584 .text glabel func_80071A24 -/* 072624 80071A24 3C028012 */ lui $v0, %hi(D_80123588) # $v0, 0x8012 -/* 072628 80071A28 8C423588 */ lw $v0, %lo(D_80123588)($v0) +/* 072624 80071A24 3C028012 */ lui $v0, %hi(D_80123580+8) # $v0, 0x8012 +/* 072628 80071A28 8C423588 */ lw $v0, %lo(D_80123580+8)($v0) /* 07262C 80071A2C 00001825 */ move $v1, $zero /* 072630 80071A30 00002825 */ move $a1, $zero /* 072634 80071A34 24060640 */ li $a2, 1600 diff --git a/bss.txt b/bss.txt index d2152b1a..b88d4b4b 100644 --- a/bss.txt +++ b/bss.txt @@ -27,78 +27,10 @@ unknown_0667D0 unknown_066AA0 unknown_06B2B0 -D_801211C0; -D_801211C8; -D_801211F0; -D_801211F8; -D_80121200; -D_80121204; -D_80121208; -D_80121210; -D_80121214; -D_80121218; -D_80121220; -D_80121224; -D_80121228; -D_80121250; -D_80121260; -D_801234E8; -D_801234EC; -D_801234F0; -D_801234F4; -D_801234F8; -D_801234FC; -D_80123500; -D_80123504; -D_80123508; -D_8012350C; -gSettingsPtr; -D_80123514; -gIsPaused; -D_80123516; -D_80123518; -D_8012351C; -D_80123520; -D_80123524; -D_80123525; -D_80123526; -D_80123528; -D_8012352C; -D_80123530; -D_80123534; -D_80123538; -D_80123544; -D_80123548; -D_80123560; - unknown_071730 -D_80123580; -D_80123588; -D_801235C0; -D_801235C8; -D_80123DC8; -D_80123DCC; -D_80123DD0; -D_80123ED0; -D_80123FD0; -D_80123FF0; - unknown_072E50 -D_80124010; -D_80124018; -D_801241B8; -D_801241E0; -D_801241E4; -D_801241E5; -D_801241E6; -D_801241E7; -D_801241E8; -D_801241EC; -D_801241F0; -D_801241F4; - unknown_0777A0 D_80124200; diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index 94e2caaa..62d45cb4 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -134,37 +134,54 @@ typedef struct unk80121178 { s8 pad3[3]; } unk80121178; unk80121178 *D_80121178[2]; -s32 D_80121180; +s32 D_80121180[16]; -extern s32 D_801211C0[2]; -extern s16 D_801211C8[8]; -extern Gfx *D_801211F0[3]; -extern Gfx *D_801211F8; -extern s32 D_80121208; -extern s32 D_80121218; -extern s32 D_80121228; -extern s8 D_80121250[16]; -extern s32 D_801234E8; -extern s32 D_801234EC; -extern s32 D_801234F0; -extern s32 D_801234F4; -extern s32 D_801234F8; -extern s32 D_801234FC; -extern s32 D_80123500; -extern s32 D_80123504; -extern s32 D_80123508; -extern Settings *gSettingsPtr; -extern s8 D_80123514; -extern s8 gIsPaused; -extern s8 D_80123516; -extern s32 D_80123518; -extern s32 D_8012351C; -extern s32 D_80123520; -extern u8 D_80123524; -extern u8 D_80123525; -extern u8 D_80123526; -extern s32* D_80123548; // This is actually an OSMesgQueue pointer. -extern s32 D_80123560; +s32 D_801211C0[2]; +s16 D_801211C8[20]; +Gfx *D_801211F0[2]; +Gfx *D_801211F8; +s32 D_801211FC; +s32 D_80121200; +s32 D_80121204; +s32 D_80121208[2]; +s32 D_80121210; +s32 D_80121214; +s32 D_80121218[2]; +s32 D_80121220; +s32 D_80121224; +s32 D_80121228[10]; +s8 D_80121250[16]; +s32 D_80121260[2210]; +s32 D_801234E8; +s32 D_801234EC; +s32 D_801234F0; +s32 D_801234F4; +s32 D_801234F8; +s32 D_801234FC; +s32 D_80123500; +s32 D_80123504; +s32 D_80123508; +s32 D_8012350C; +Settings *gSettingsPtr; +s8 D_80123514; +s8 gIsPaused; +s8 D_80123516; +s32 D_80123518; +s32 D_8012351C; +s32 D_80123520; +u8 D_80123524; +u8 D_80123525; +u8 D_80123526; +s32 D_80123528; +s32 D_8012352C; +s32 D_80123530; +s32 D_80123534; +s32 D_80123538[3]; +s32 D_80123544; +s32* D_80123548; // This is actually an OSMesgQueue pointer. +s32 D_8012354C; +s32 D_80123550[4]; +s32 D_80123560[8]; /******************************/ @@ -757,7 +774,7 @@ void func_8006C3E0(void) { func_800C7350(); osCreateMesgQueue(&D_80123548, &D_80123544, 1); osScAddClient(&D_80121260, &D_80123538, &D_80123548, 3); - D_80123560 = 0; + D_80123560[0] = 0; D_80123504 = 0; D_80123508 = 0; D_801234E8 = 0; @@ -1059,10 +1076,10 @@ s8 func_8006EAB0(void) { } s32 func_8006EAC0(void) { - if (D_80123560 == 0) { - D_80123560 = (s32) ((osRecvMesg(&D_80123548, NULL, 0) + 1) != 0); + if (D_80123560[0] == 0) { + D_80123560[0] = (s32) ((osRecvMesg(&D_80123548, NULL, 0) + 1) != 0); } - return D_80123560; + return D_80123560[0]; } s32 func_8006EB14(void) { diff --git a/src/unknown_071730.c b/src/unknown_071730.c index 792db3b9..5b9a6504 100644 --- a/src/unknown_071730.c +++ b/src/unknown_071730.c @@ -34,6 +34,8 @@ const char D_800E751C[] = "ORANGE %d\n\n"; /*********************************/ +/************ .bss ************/ + /* Size: 0x8 bytes */ typedef struct unk80070BE4_8_0 { s16 unk0; @@ -60,13 +62,14 @@ typedef struct unk80070BE4 { s32 size; } unk80070BE4; -extern unk80070BE4 D_80123580[12]; // unknown number of entries +unk80070BE4 D_80123580[4]; #ifndef _ALIGN16 #define _ALIGN16(val) ((val) & 0xFFFFFFF0) + 0x10 #endif -extern s32 D_801235C0; +s32 D_801235C0; +s32 D_801235C4; /* Size: 0x8 bytes */ typedef struct unk801235C8 { @@ -75,12 +78,19 @@ typedef struct unk801235C8 { u8 pad5[3]; } unk801235C8; -extern unk801235C8 D_801235C8[8]; +unk801235C8 D_801235C8[256]; + +s32 D_80123DC8; +s32 D_80123DCC; +s32 D_80123DD0[64]; +s32 D_80123ED0[64]; +s32 D_80123FD0[8]; +s32 D_80123FF0[8]; -extern s32 D_80123DC8; -extern s32 D_80123DCC; extern unk80070BE4_8 D_8012D3F0; +/******************************/ + /* Unknown size */ typedef struct unk800B7D10 { u8 pad0[0x14]; diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 3aab02a8..ff4e2601 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -55,7 +55,19 @@ const char D_800E7750[] = "warning: corrupt ghost\n"; /************ .bss ************/ -extern s32 D_80124010; +s32 D_80124010; +s32 D_80124014; +s32 D_80124018[104]; +s32 D_801241B8[10]; +s32 D_801241E0; +s8 D_801241E4; +s8 D_801241E5; +s8 D_801241E6; +s8 D_801241E7; +s32 D_801241E8; +s32 D_801241EC; +s32 D_801241F0; +s32 D_801241F4; /*******************************/ diff --git a/src/unknown_0777A0.c b/src/unknown_0777A0.c index d958a466..e1faf75e 100644 --- a/src/unknown_0777A0.c +++ b/src/unknown_0777A0.c @@ -6,6 +6,8 @@ #include "types.h" #include "macros.h" +/************ .bss ************/ + extern s32 *D_80124200; extern s32 D_80124218; extern s32 D_80124220; @@ -13,6 +15,8 @@ extern s32 D_80124238; extern s32 D_80124278; extern s32 *D_80124290; +/*******************************/ + // These are both defined in the generated dkr.ld file. extern u8 __ASSETS_LUT_START, __ASSETS_LUT_END; // __ASSETS_LUT_START = 0xECB60, _END = 0xECC30 diff --git a/undefined_syms.txt b/undefined_syms.txt index b806f1ac..70093605 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,77 +25,13 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_801211C0 = 0x801211C0; -D_801211C8 = 0x801211C8; -D_801211F0 = 0x801211F0; -D_801211F8 = 0x801211F8; -D_80121200 = 0x80121200; -D_80121204 = 0x80121204; -D_80121208 = 0x80121208; -D_80121210 = 0x80121210; -D_80121214 = 0x80121214; -D_80121218 = 0x80121218; -D_80121220 = 0x80121220; -D_80121224 = 0x80121224; -D_80121228 = 0x80121228; -D_80121250 = 0x80121250; -D_80121260 = 0x80121260; -D_801234E8 = 0x801234E8; -D_801234EC = 0x801234EC; -D_801234F0 = 0x801234F0; -D_801234F4 = 0x801234F4; -D_801234F8 = 0x801234F8; -D_801234FC = 0x801234FC; -D_80123500 = 0x80123500; -D_80123504 = 0x80123504; -D_80123508 = 0x80123508; -D_8012350C = 0x8012350C; -gSettingsPtr = 0x80123510; -D_80123514 = 0x80123514; -gIsPaused = 0x80123515; -D_80123516 = 0x80123516; -D_80123518 = 0x80123518; -D_8012351C = 0x8012351C; -D_80123520 = 0x80123520; -D_80123524 = 0x80123524; -D_80123525 = 0x80123525; -D_80123526 = 0x80123526; -D_80123528 = 0x80123528; -D_8012352C = 0x8012352C; -D_80123530 = 0x80123530; -D_80123534 = 0x80123534; -D_80123538 = 0x80123538; -D_80123544 = 0x80123544; -D_80123548 = 0x80123548; -D_80123560 = 0x80123560; -D_80123580 = 0x80123580; -D_80123588 = 0x80123588; -D_801235C0 = 0x801235C0; -D_801235C8 = 0x801235C8; -D_80123DC8 = 0x80123DC8; -D_80123DCC = 0x80123DCC; -D_80123DD0 = 0x80123DD0; -D_80123ED0 = 0x80123ED0; -D_80123FD0 = 0x80123FD0; -D_80123FF0 = 0x80123FF0; -D_80124010 = 0x80124010; -D_80124018 = 0x80124018; -D_801241B8 = 0x801241B8; -D_801241E0 = 0x801241E0; -D_801241E4 = 0x801241E4; -D_801241E5 = 0x801241E5; -D_801241E6 = 0x801241E6; -D_801241E7 = 0x801241E7; -D_801241E8 = 0x801241E8; -D_801241EC = 0x801241EC; -D_801241F0 = 0x801241F0; -D_801241F4 = 0x801241F4; D_80124200 = 0x80124200; D_80124218 = 0x80124218; D_80124220 = 0x80124220; D_80124238 = 0x80124238; D_80124278 = 0x80124278; D_80124290 = 0x80124290; + D_801242A0 = 0x801242A0; D_801246A0 = 0x801246A0; D_80125EA0 = 0x80125EA0; From cd5a10eda82522541864edacb44885e4de1c5cd3 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 12:56:10 -0500 Subject: [PATCH 34/39] Added bss for unknown_0777A0, _078050, _079F50, _07AF10 --- bss.txt | 37 ------------------------------ src/unknown_0777A0.c | 16 ++++++------- src/unknown_078050.c | 31 ++++++++++++++++++------- src/unknown_079F50.c | 12 +++++++++- src/unknown_07AF10.c | 28 ++++++++++++++++++----- undefined_syms.txt | 54 -------------------------------------------- 6 files changed, 64 insertions(+), 114 deletions(-) diff --git a/bss.txt b/bss.txt index b88d4b4b..096cf296 100644 --- a/bss.txt +++ b/bss.txt @@ -33,47 +33,10 @@ unknown_071730 unknown_072E50 unknown_0777A0 -D_80124200; -D_80124218; -D_80124220; -D_80124238; -D_80124278; -D_80124290; - unknown_078050 -D_801242A0; -D_801246A0; -D_80125EA0; -D_80125EB8; -D_80125EC0; -D_80125ED8; -D_80125EF0; -D_80125F10; -D_80125F30; -D_80125F31; -D_80125F32; -D_80125F33; -D_80125F34; -D_80125F35; -D_80125F36; -D_80125F37; -D_80125F38; -D_80125F3C; -D_80125F40; -D_80126020; -D_80126100; - unknown_079F50 -D_80126110; -D_80126114; -D_80126118; -D_8012611C; -D_80126120; -D_80126124; -D_80126170; -D_80126174; unknown_07AF10 diff --git a/src/unknown_0777A0.c b/src/unknown_0777A0.c index e1faf75e..3bd12be7 100644 --- a/src/unknown_0777A0.c +++ b/src/unknown_0777A0.c @@ -5,23 +5,23 @@ #include "types.h" #include "macros.h" +#include "ultra64.h" /************ .bss ************/ -extern s32 *D_80124200; -extern s32 D_80124218; -extern s32 D_80124220; -extern s32 D_80124238; -extern s32 D_80124278; -extern s32 *D_80124290; +OSIoMesg D_80124200; +OSMesg D_80124218; +OSMesgQueue D_80124220; +OSMesg D_80124238; +s32 D_80124240[14]; +OSMesgQueue D_80124278; +s32 *D_80124290; /*******************************/ // These are both defined in the generated dkr.ld file. extern u8 __ASSETS_LUT_START, __ASSETS_LUT_END; // __ASSETS_LUT_START = 0xECB60, _END = 0xECC30 -void osCreateMesgQueue(s32*, s32*, s32); -void osCreatePiManager(s32, s32*, s32*, s32); void *func_80070C9C(s32, s32); s32 func_80071478(s32*); void dmacopy(u32 romOffset, u8 *ramAddress, s32 numBytes); diff --git a/src/unknown_078050.c b/src/unknown_078050.c index 5f11a911..d22ce328 100644 --- a/src/unknown_078050.c +++ b/src/unknown_078050.c @@ -138,14 +138,29 @@ u32 D_800DE6E8[] = { /************ .bss ************/ -extern OSMesgQueue D_80125EA0; -extern OSMesg D_80125EB8; -extern OSMesgQueue D_80125EC0; -extern OSMesgQueue D_80125ED8; -extern OSMesg D_80125EF0; -extern OSMesg D_80125F10; - -extern u32 D_80126100; +s32 D_801242A0[256]; +s32 D_801246A0[1536]; +OSMesgQueue D_80125EA0; +OSMesg D_80125EB8; +OSMesgQueue D_80125EC0; +OSMesgQueue D_80125ED8; +OSMesg D_80125EF0; +s32 D_80125EF8[6]; +OSMesg D_80125F10; +s32 D_80125F18[6]; +s8 D_80125F30; +s8 D_80125F31; +s8 D_80125F32; +s8 D_80125F33; +s8 D_80125F34; +s8 D_80125F35; +s8 D_80125F36; +s8 D_80125F37; +s32 D_80125F38; +s32 D_80125F3C; +s32 D_80125F40[56]; +s32 D_80126020[56]; +u32 D_80126100; /*******************************/ diff --git a/src/unknown_079F50.c b/src/unknown_079F50.c index c291fca7..aadd1fd2 100644 --- a/src/unknown_079F50.c +++ b/src/unknown_079F50.c @@ -111,7 +111,17 @@ const char D_800E7958[] = "\tdata_size\t\t= %u\n"; extern OSViMode D_800E3900[];//osViModeTable; -extern s32 D_80126120; +/************ .bss ************/ + +s32 D_80126110; +s32 D_80126114; +s32 D_80126118; +s32 D_8012611C; +s32 D_80126120; +s32 D_80126124; +s32 D_80126128[18]; + +/*******************************/ void __scMain(void); void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp); diff --git a/src/unknown_07AF10.c b/src/unknown_07AF10.c index 90b35ade..842b2ed6 100644 --- a/src/unknown_07AF10.c +++ b/src/unknown_07AF10.c @@ -43,12 +43,28 @@ const char D_800E7AC8[] = "640 by 480 Anti-aliased, Interlaced, De-flickered.\n" /************ .bss ************/ -extern s32 D_801262B0[2]; -extern s32 D_801262B8[2]; -extern s32 D_801262C8; -extern s32 D_801262CC; -extern s8 D_80126308; -extern s8 D_80126309; +s32 D_80126170; +s32 D_80126174; +s32 D_80126178[2]; +s32 D_80126180[8]; +s32 D_801261A0[48]; +s32 D_80126260[20]; +s32 D_801262B0[2]; +s32 D_801262B8[2]; +s32 D_801262C0[2]; +s32 D_801262C8; +s32 D_801262CC; +s32 D_801262D0; +s32 D_801262D4; +s32 D_801262D8; +s32 D_801262DC; +s32 D_801262E0; +s32 D_801262E4; +s32 D_801262E8[8]; +s8 D_80126308; +s8 D_80126309; +s32 D_8012630C; +s32 D_80126310; /******************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 70093605..e8afc62c 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,60 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_80124200 = 0x80124200; -D_80124218 = 0x80124218; -D_80124220 = 0x80124220; -D_80124238 = 0x80124238; -D_80124278 = 0x80124278; -D_80124290 = 0x80124290; - -D_801242A0 = 0x801242A0; -D_801246A0 = 0x801246A0; -D_80125EA0 = 0x80125EA0; -D_80125EB8 = 0x80125EB8; -D_80125EC0 = 0x80125EC0; -D_80125ED8 = 0x80125ED8; -D_80125EF0 = 0x80125EF0; -D_80125F10 = 0x80125F10; -D_80125F30 = 0x80125F30; -D_80125F31 = 0x80125F31; -D_80125F32 = 0x80125F32; -D_80125F33 = 0x80125F33; -D_80125F34 = 0x80125F34; -D_80125F35 = 0x80125F35; -D_80125F36 = 0x80125F36; -D_80125F37 = 0x80125F37; -D_80125F38 = 0x80125F38; -D_80125F3C = 0x80125F3C; -D_80125F40 = 0x80125F40; -D_80126020 = 0x80126020; -D_80126100 = 0x80126100; -D_80126110 = 0x80126110; -D_80126114 = 0x80126114; -D_80126118 = 0x80126118; -D_8012611C = 0x8012611C; -D_80126120 = 0x80126120; -D_80126124 = 0x80126124; -D_80126170 = 0x80126170; -D_80126174 = 0x80126174; -D_80126178 = 0x80126178; -D_80126180 = 0x80126180; -D_801261A0 = 0x801261A0; -D_80126260 = 0x80126260; -D_801262B0 = 0x801262B0; -D_801262B8 = 0x801262B8; -D_801262C0 = 0x801262C0; -D_801262C8 = 0x801262C8; -D_801262CC = 0x801262CC; -D_801262D0 = 0x801262D0; -D_801262D4 = 0x801262D4; -D_801262D8 = 0x801262D8; -D_801262DC = 0x801262DC; -D_801262E0 = 0x801262E0; -D_801262E4 = 0x801262E4; -D_80126308 = 0x80126308; -D_80126309 = 0x80126309; -D_80126310 = 0x80126310; D_80126320 = 0x80126320; D_80126328 = 0x80126328; D_8012632C = 0x8012632C; From fe401e8d6955a7ff826750a3cec023d0ac5bea12 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 17:45:44 -0500 Subject: [PATCH 35/39] Added bss for unknown_07B870 & unknown_080500 --- .../unknown_080500/MenuCharacterSelectLoop.s | 12 +- .../unknown_080500/MenuFileSelectLoop.s | 8 +- .../unknown_080500/MenuLoadNewAreaInit.s | 4 +- .../unknown_080500/MenuLoadNewAreaLoop.s | 12 +- .../unknown_080500/MenuOptionsLoop.s | 4 +- .../unknown_080500/MenuTrophyRaceRoundInit.s | 4 +- .../unknown_080500/func_8007F900.s | 4 +- .../unknown_080500/func_80081218.s | 34 +- .../unknown_080500/func_800862C4.s | 4 +- .../unknown_080500/func_8008D5F8.s | 8 +- .../unknown_080500/func_8008D8BC.s | 4 +- .../unknown_080500/func_8008DC7C.s | 4 +- .../unknown_080500/func_8008F00C.s | 4 +- .../unknown_080500/func_8008FF1C.s | 4 +- .../unknown_080500/func_80090F30.s | 32 +- .../unknown_080500/func_80092188.s | 8 +- .../unknown_080500/func_80092E94.s | 24 +- .../unknown_080500/func_80095728.s | 16 +- bss.txt | 46 -- src/unknown_07B870.c | 31 +- src/unknown_080500.c | 378 ++++++++++----- undefined_syms.txt | 453 ++++++++---------- 22 files changed, 592 insertions(+), 506 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s index dd5f6368..e790367d 100644 --- a/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCharacterSelectLoop.s @@ -32,13 +32,13 @@ glabel MenuCharacterSelectLoop /* 08C994 8008BD94 8C620000 */ lw $v0, ($v1) /* 08C998 8008BD98 3C0F8012 */ lui $t7, %hi(D_801263D4) # $t7, 0x8012 /* 08C99C 8008BD9C 1440001B */ bnez $v0, .L8008BE0C -/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(D_801263D5) # $t8, 0x8012 -/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(D_801263D6) # $t9, 0x8012 -/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(D_801263D7) # $t4, 0x8012 -/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(D_801263D7)($t4) -/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(D_801263D6)($t9) +/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(D_801263D4+1) # $t8, 0x8012 +/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(D_801263D4+2) # $t9, 0x8012 +/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(D_801263D4+3) # $t4, 0x8012 +/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(D_801263D4+3)($t4) +/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(D_801263D4+2)($t9) /* 08C9B4 8008BDB4 81EF63D4 */ lb $t7, %lo(D_801263D4)($t7) -/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(D_801263D5)($t8) +/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(D_801263D4+1)($t8) /* 08C9BC 8008BDBC A3AC0023 */ sb $t4, 0x23($sp) /* 08C9C0 8008BDC0 A3B90022 */ sb $t9, 0x22($sp) /* 08C9C4 8008BDC4 A3AF0020 */ sb $t7, 0x20($sp) diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s index 54146090..d4ff9c24 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s @@ -72,9 +72,9 @@ glabel MenuFileSelectLoop /* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(gIsInAdventureTwo)($at) /* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e /* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) -/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 /* 08D4D0 8008C8D0 0C01B6C5 */ jal func_8006DB14 -/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(p1_vehicle)($at) +/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(gPlayerVehicle)($at) /* 08D4D8 8008C8D8 0C0204F4 */ jal MenuInit /* 08D4DC 8008C8DC 24040006 */ li $a0, 6 /* 08D4E0 8008C8E0 10000076 */ b .L8008CABC @@ -134,10 +134,10 @@ glabel MenuFileSelectLoop /* 08D5A8 8008C9A8 AFA20024 */ sw $v0, 0x24($sp) /* 08D5AC 8008C9AC 0C01A955 */ jal func_8006A554 /* 08D5B0 8008C9B0 AFA60020 */ sw $a2, 0x20($sp) -/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(D_80126465) # $t9, 0x8012 +/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(D_80126464+1) # $t9, 0x8012 /* 08D5B8 8008C9B8 8FA30024 */ lw $v1, 0x24($sp) /* 08D5BC 8008C9BC 8FA60020 */ lw $a2, 0x20($sp) -/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(D_80126465)($t9) +/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(D_80126464+1)($t9) /* 08D5C4 8008C9C4 00621825 */ or $v1, $v1, $v0 /* 08D5C8 8008C9C8 00D93021 */ addu $a2, $a2, $t9 .L8008C9CC: diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s index 1a029385..7d6e7857 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s @@ -15,8 +15,8 @@ glabel MenuLoadNewAreaInit /* 0938B8 80092CB8 81D00002 */ lb $s0, 2($t6) /* 0938BC 80092CBC 0C01AC2B */ jal func_8006B0AC /* 0938C0 80092CC0 02002025 */ move $a0, $s0 -/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 -/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) +/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) /* 0938CC 80092CCC 0C01AC53 */ jal func_8006B14C /* 0938D0 80092CD0 02002025 */ move $a0, $s0 /* 0938D4 80092CD4 24010005 */ li $at, 5 diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s index 09750dd8..493aad1a 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s @@ -84,11 +84,11 @@ glabel MenuLoadNewAreaLoop /* 094330 80093730 00000000 */ nop /* 094334 80093734 0C01AC2B */ jal func_8006B0AC /* 094338 80093738 00000000 */ nop -/* 09433C 8009373C 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 -/* 094340 80093740 A02269C0 */ sb $v0, %lo(p1_vehicle)($at) +/* 09433C 8009373C 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 094340 80093740 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) .L80093744: -/* 094344 80093744 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 -/* 094348 80093748 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) +/* 094344 80093744 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 +/* 094348 80093748 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) /* 09434C 8009374C 8FA40024 */ lw $a0, 0x24($sp) /* 094350 80093750 0C01AC3E */ jal func_8006B0F8 /* 094354 80093754 AFA30034 */ sw $v1, 0x34($sp) @@ -238,9 +238,9 @@ glabel MenuLoadNewAreaLoop /* 094558 80093958 0C000741 */ jal func_80001D04 /* 09455C 8009395C AFA30034 */ sw $v1, 0x34($sp) /* 094560 80093960 8FA30034 */ lw $v1, 0x34($sp) -/* 094564 80093964 3C018012 */ lui $at, %hi(p1_vehicle) # $at, 0x8012 +/* 094564 80093964 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 /* 094568 80093968 10000021 */ b .L800939F0 -/* 09456C 8009396C A02369C0 */ sb $v1, %lo(p1_vehicle)($at) +/* 09456C 8009396C A02369C0 */ sb $v1, %lo(gPlayerVehicle)($at) .L80093970: /* 094570 80093970 04410007 */ bgez $v0, .L80093990 /* 094574 80093974 8FAA0038 */ lw $t2, 0x38($sp) diff --git a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s index a71c4304..399f89f0 100644 --- a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s @@ -147,8 +147,8 @@ glabel MenuOptionsLoop /* 085174 80084574 14410028 */ bne $v0, $at, .L80084618 /* 085178 80084578 00000000 */ nop /* 08517C 8008457C 10E00026 */ beqz $a3, .L80084618 -/* 085180 80084580 3C0F8012 */ lui $t7, %hi(D_8012644C) # $t7, 0x8012 -/* 085184 80084584 8DEF644C */ lw $t7, %lo(D_8012644C)($t7) +/* 085180 80084580 3C0F8012 */ lui $t7, %hi(D_80126448+4) # $t7, 0x8012 +/* 085184 80084584 8DEF644C */ lw $t7, %lo(D_80126448+4)($t7) /* 085188 80084588 3C010200 */ lui $at, 0x200 /* 08518C 8008458C 01E1C824 */ and $t9, $t7, $at /* 085190 80084590 1320000F */ beqz $t9, .L800845D0 diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s index 122bcd55..99b68125 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundInit.s @@ -50,8 +50,8 @@ glabel MenuTrophyRaceRoundInit /* 098F1C 8009831C 8E690000 */ lw $t1, ($s3) /* 098F20 80098320 00008825 */ move $s1, $zero /* 098F24 80098324 1920000A */ blez $t1, .L80098350 -/* 098F28 80098328 3C128012 */ lui $s2, %hi(p1_vehicle) # $s2, 0x8012 -/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(p1_vehicle) # addiu $s2, $s2, 0x69c0 +/* 098F28 80098328 3C128012 */ lui $s2, %hi(gPlayerVehicle) # $s2, 0x8012 +/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(gPlayerVehicle) # addiu $s2, $s2, 0x69c0 .L80098330: /* 098F30 80098330 0C01AC2B */ jal func_8006B0AC /* 098F34 80098334 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/unknown_080500/func_8007F900.s b/asm/non_matchings/unknown_080500/func_8007F900.s index 8d6f187b..0ce18a38 100644 --- a/asm/non_matchings/unknown_080500/func_8007F900.s +++ b/asm/non_matchings/unknown_080500/func_8007F900.s @@ -126,7 +126,7 @@ glabel func_8007F900 /* 0806D0 8007FAD0 00000000 */ nop /* 0806D4 8007FAD4 AD2B0114 */ sw $t3, 0x114($t1) /* 0806D8 8007FAD8 8C8C007C */ lw $t4, 0x7c($a0) -/* 0806DC 8007FADC 3C0B8012 */ lui $t3, %hi(D_8012644C) # $t3, 0x8012 +/* 0806DC 8007FADC 3C0B8012 */ lui $t3, %hi(D_80126448+4) # $t3, 0x8012 /* 0806E0 8007FAE0 AD2C0134 */ sw $t4, 0x134($t1) /* 0806E4 8007FAE4 8C8D0080 */ lw $t5, 0x80($a0) /* 0806E8 8007FAE8 00000000 */ nop @@ -143,7 +143,7 @@ glabel func_8007F900 /* 080714 8007FB14 8C990088 */ lw $t9, 0x88($a0) /* 080718 8007FB18 00000000 */ nop /* 08071C 8007FB1C AC590000 */ sw $t9, ($v0) -/* 080720 8007FB20 8D6B644C */ lw $t3, %lo(D_8012644C)($t3) +/* 080720 8007FB20 8D6B644C */ lw $t3, %lo(D_80126448+4)($t3) /* 080724 8007FB24 00000000 */ nop /* 080728 8007FB28 01616824 */ and $t5, $t3, $at /* 08072C 8007FB2C 11A00004 */ beqz $t5, .L8007FB40 diff --git a/asm/non_matchings/unknown_080500/func_80081218.s b/asm/non_matchings/unknown_080500/func_80081218.s index 16bc0f5f..7e12e3cb 100644 --- a/asm/non_matchings/unknown_080500/func_80081218.s +++ b/asm/non_matchings/unknown_080500/func_80081218.s @@ -20,7 +20,7 @@ glabel func_80081218 /* 081E60 80081260 3C048012 */ lui $a0, %hi(D_80126530) # $a0, 0x8012 /* 081E64 80081264 24846530 */ addiu $a0, %lo(D_80126530) # addiu $a0, $a0, 0x6530 /* 081E68 80081268 AC820000 */ sw $v0, ($a0) -/* 081E6C 8008126C 3C018012 */ lui $at, %hi(D_80126534) # $at, 0x8012 +/* 081E6C 8008126C 3C018012 */ lui $at, %hi(D_80126530+4) # $at, 0x8012 /* 081E70 80081270 AC226530 */ sw $v0, %lo(D_80126530)($at) /* 081E74 80081274 3C098012 */ lui $t1, %hi(D_80126530) # $t1, 0x8012 /* 081E78 80081278 8D296530 */ lw $t1, %lo(D_80126530)($t1) @@ -30,35 +30,35 @@ glabel func_80081218 /* 081E88 80081288 3C0B8012 */ lui $t3, %hi(D_80126530) # $t3, 0x8012 /* 081E8C 8008128C AD2A0004 */ sw $t2, 4($t1) /* 081E90 80081290 8D6B6530 */ lw $t3, %lo(D_80126530)($t3) -/* 081E94 80081294 3C188012 */ lui $t8, %hi(D_80126534) # $t8, 0x8012 +/* 081E94 80081294 3C188012 */ lui $t8, %hi(D_80126530+4) # $t8, 0x8012 /* 081E98 80081298 8D6C0004 */ lw $t4, 4($t3) -/* 081E9C 8008129C 3C088012 */ lui $t0, %hi(D_80126534) # $t0, 0x8012 +/* 081E9C 8008129C 3C088012 */ lui $t0, %hi(D_80126530+4) # $t0, 0x8012 /* 081EA0 800812A0 01866821 */ addu $t5, $t4, $a2 /* 081EA4 800812A4 AD6D0000 */ sw $t5, ($t3) /* 081EA8 800812A8 8C8E0000 */ lw $t6, ($a0) /* 081EAC 800812AC 00E71821 */ addu $v1, $a3, $a3 /* 081EB0 800812B0 01C77821 */ addu $t7, $t6, $a3 -/* 081EB4 800812B4 AC2F6534 */ sw $t7, %lo(D_80126534)($at) -/* 081EB8 800812B8 8F186534 */ lw $t8, %lo(D_80126534)($t8) -/* 081EBC 800812BC 3C018012 */ lui $at, %hi(D_8012653C) # $at, 0x8012 +/* 081EB4 800812B4 AC2F6534 */ sw $t7, %lo(D_80126530+4)($at) +/* 081EB8 800812B8 8F186534 */ lw $t8, %lo(D_80126530+4)($t8) +/* 081EBC 800812BC 3C018012 */ lui $at, %hi(D_80126530+12) # $at, 0x8012 /* 081EC0 800812C0 27190118 */ addiu $t9, $t8, 0x118 /* 081EC4 800812C4 AF190004 */ sw $t9, 4($t8) -/* 081EC8 800812C8 8D086534 */ lw $t0, %lo(D_80126534)($t0) -/* 081ECC 800812CC 3C0B8012 */ lui $t3, %hi(D_80126538) # $t3, 0x8012 +/* 081EC8 800812C8 8D086534 */ lw $t0, %lo(D_80126530+4)($t0) +/* 081ECC 800812CC 3C0B8012 */ lui $t3, %hi(D_80126530+8) # $t3, 0x8012 /* 081ED0 800812D0 8D0A0004 */ lw $t2, 4($t0) -/* 081ED4 800812D4 3C0F8012 */ lui $t7, %hi(D_80126538) # $t7, 0x8012 +/* 081ED4 800812D4 3C0F8012 */ lui $t7, %hi(D_80126530+8) # $t7, 0x8012 /* 081ED8 800812D8 01464821 */ addu $t1, $t2, $a2 /* 081EDC 800812DC AD090000 */ sw $t1, ($t0) /* 081EE0 800812E0 8C8C0000 */ lw $t4, ($a0) -/* 081EE4 800812E4 3C088012 */ lui $t0, %hi(D_8012653C) # $t0, 0x8012 +/* 081EE4 800812E4 3C088012 */ lui $t0, %hi(D_80126530+12) # $t0, 0x8012 /* 081EE8 800812E8 01836821 */ addu $t5, $t4, $v1 -/* 081EEC 800812EC AC2D6538 */ sw $t5, %lo(D_80126538)($at) -/* 081EF0 800812F0 8D6B6538 */ lw $t3, %lo(D_80126538)($t3) +/* 081EEC 800812EC AC2D6538 */ sw $t5, %lo(D_80126530+8)($at) +/* 081EF0 800812F0 8D6B6538 */ lw $t3, %lo(D_80126530+8)($t3) /* 081EF4 800812F4 00671821 */ addu $v1, $v1, $a3 /* 081EF8 800812F8 256E0118 */ addiu $t6, $t3, 0x118 /* 081EFC 800812FC AD6E0004 */ sw $t6, 4($t3) -/* 081F00 80081300 8DEF6538 */ lw $t7, %lo(D_80126538)($t7) -/* 081F04 80081304 3C0D8012 */ lui $t5, %hi(D_8012653C) # $t5, 0x8012 +/* 081F00 80081300 8DEF6538 */ lw $t7, %lo(D_80126530+8)($t7) +/* 081F04 80081304 3C0D8012 */ lui $t5, %hi(D_80126530+12) # $t5, 0x8012 /* 081F08 80081308 8DF90004 */ lw $t9, 4($t7) /* 081F0C 8008130C 00000000 */ nop /* 081F10 80081310 0326C021 */ addu $t8, $t9, $a2 @@ -66,12 +66,12 @@ glabel func_80081218 /* 081F18 80081318 8C8A0000 */ lw $t2, ($a0) /* 081F1C 8008131C 24040041 */ li $a0, 65 /* 081F20 80081320 01434821 */ addu $t1, $t2, $v1 -/* 081F24 80081324 AC29653C */ sw $t1, %lo(D_8012653C)($at) -/* 081F28 80081328 8D08653C */ lw $t0, %lo(D_8012653C)($t0) +/* 081F24 80081324 AC29653C */ sw $t1, %lo(D_80126530+12)($at) +/* 081F28 80081328 8D08653C */ lw $t0, %lo(D_80126530+12)($t0) /* 081F2C 8008132C 00000000 */ nop /* 081F30 80081330 250C0118 */ addiu $t4, $t0, 0x118 /* 081F34 80081334 AD0C0004 */ sw $t4, 4($t0) -/* 081F38 80081338 8DAD653C */ lw $t5, %lo(D_8012653C)($t5) +/* 081F38 80081338 8DAD653C */ lw $t5, %lo(D_80126530+12)($t5) /* 081F3C 8008133C 00000000 */ nop /* 081F40 80081340 8DAE0004 */ lw $t6, 4($t5) /* 081F44 80081344 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800862C4.s b/asm/non_matchings/unknown_080500/func_800862C4.s index f0914be9..43f4130a 100644 --- a/asm/non_matchings/unknown_080500/func_800862C4.s +++ b/asm/non_matchings/unknown_080500/func_800862C4.s @@ -3,9 +3,9 @@ glabel func_800862C4 /* 086EC8 800862C8 AFB60038 */ sw $s6, 0x38($sp) /* 086ECC 800862CC AFB20028 */ sw $s2, 0x28($sp) /* 086ED0 800862D0 3C128012 */ lui $s2, %hi(D_80126A08) # $s2, 0x8012 -/* 086ED4 800862D4 3C168012 */ lui $s6, %hi(D_8012653C) # $s6, 0x8012 +/* 086ED4 800862D4 3C168012 */ lui $s6, %hi(D_80126530+12) # $s6, 0x8012 /* 086ED8 800862D8 26526A08 */ addiu $s2, %lo(D_80126A08) # addiu $s2, $s2, 0x6a08 -/* 086EDC 800862DC 8ED6653C */ lw $s6, %lo(D_8012653C)($s6) +/* 086EDC 800862DC 8ED6653C */ lw $s6, %lo(D_80126530+12)($s6) /* 086EE0 800862E0 AE400000 */ sw $zero, ($s2) /* 086EE4 800862E4 3C018012 */ lui $at, %hi(D_80126BD4) # $at, 0x8012 /* 086EE8 800862E8 44802000 */ mtc1 $zero, $f4 diff --git a/asm/non_matchings/unknown_080500/func_8008D5F8.s b/asm/non_matchings/unknown_080500/func_8008D5F8.s index bcfd2b0c..2e37b253 100644 --- a/asm/non_matchings/unknown_080500/func_8008D5F8.s +++ b/asm/non_matchings/unknown_080500/func_8008D5F8.s @@ -18,13 +18,13 @@ glabel func_8008D5F8 /* 08E238 8008D638 AFA60020 */ sw $a2, 0x20($sp) /* 08E23C 8008D63C 0C01A955 */ jal func_8006A554 /* 08E240 8008D640 AFA7001C */ sw $a3, 0x1c($sp) -/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 -/* 08E248 8008D648 3C188012 */ lui $t8, %hi(D_80126465) # $t8, 0x8012 +/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 +/* 08E248 8008D648 3C188012 */ lui $t8, %hi(D_80126464+1) # $t8, 0x8012 /* 08E24C 8008D64C 8FA30024 */ lw $v1, 0x24($sp) /* 08E250 8008D650 8FA60020 */ lw $a2, 0x20($sp) /* 08E254 8008D654 8FA7001C */ lw $a3, 0x1c($sp) -/* 08E258 8008D658 81EF645D */ lb $t7, %lo(D_8012645D)($t7) -/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(D_80126465)($t8) +/* 08E258 8008D658 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) +/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(D_80126464+1)($t8) /* 08E260 8008D660 24080002 */ li $t0, 2 /* 08E264 8008D664 00621825 */ or $v1, $v1, $v0 /* 08E268 8008D668 00CF3021 */ addu $a2, $a2, $t7 diff --git a/asm/non_matchings/unknown_080500/func_8008D8BC.s b/asm/non_matchings/unknown_080500/func_8008D8BC.s index e54cef79..86385bdc 100644 --- a/asm/non_matchings/unknown_080500/func_8008D8BC.s +++ b/asm/non_matchings/unknown_080500/func_8008D8BC.s @@ -17,10 +17,10 @@ glabel func_8008D8BC /* 08E4F8 8008D8F8 AFA20028 */ sw $v0, 0x28($sp) /* 08E4FC 8008D8FC 0C01A955 */ jal func_8006A554 /* 08E500 8008D900 AFA50024 */ sw $a1, 0x24($sp) -/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 +/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 /* 08E508 8008D908 8FA30028 */ lw $v1, 0x28($sp) /* 08E50C 8008D90C 8FA50024 */ lw $a1, 0x24($sp) -/* 08E510 8008D910 81EF645D */ lb $t7, %lo(D_8012645D)($t7) +/* 08E510 8008D910 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) /* 08E514 8008D914 00621825 */ or $v1, $v1, $v0 /* 08E518 8008D918 00AF2821 */ addu $a1, $a1, $t7 .L8008D91C: diff --git a/asm/non_matchings/unknown_080500/func_8008DC7C.s b/asm/non_matchings/unknown_080500/func_8008DC7C.s index d3330b66..abba99ca 100644 --- a/asm/non_matchings/unknown_080500/func_8008DC7C.s +++ b/asm/non_matchings/unknown_080500/func_8008DC7C.s @@ -15,10 +15,10 @@ glabel func_8008DC7C /* 08E8B0 8008DCB0 AFA2001C */ sw $v0, 0x1c($sp) /* 08E8B4 8008DCB4 0C01A955 */ jal func_8006A554 /* 08E8B8 8008DCB8 AFA50018 */ sw $a1, 0x18($sp) -/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(D_8012645D) # $t7, 0x8012 +/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 /* 08E8C0 8008DCC0 8FA3001C */ lw $v1, 0x1c($sp) /* 08E8C4 8008DCC4 8FA50018 */ lw $a1, 0x18($sp) -/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(D_8012645D)($t7) +/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) /* 08E8CC 8008DCCC 00621825 */ or $v1, $v1, $v0 /* 08E8D0 8008DCD0 00AF2821 */ addu $a1, $a1, $t7 .L8008DCD4: diff --git a/asm/non_matchings/unknown_080500/func_8008F00C.s b/asm/non_matchings/unknown_080500/func_8008F00C.s index 4900eef6..23eb4373 100644 --- a/asm/non_matchings/unknown_080500/func_8008F00C.s +++ b/asm/non_matchings/unknown_080500/func_8008F00C.s @@ -48,8 +48,8 @@ glabel func_8008F00C /* 08FCB8 8008F0B8 3C048012 */ lui $a0, %hi(D_801269C4) # $a0, 0x8012 /* 08FCBC 8008F0BC 18C0000B */ blez $a2, .L8008F0EC /* 08FCC0 8008F0C0 24180001 */ li $t8, 1 -/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 -/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(p1_vehicle) +/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 +/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(gPlayerVehicle) /* 08FCCC 8008F0CC 00C32821 */ addu $a1, $a2, $v1 /* 08FCD0 8008F0D0 248469C4 */ addiu $a0, %lo(D_801269C4) # addiu $a0, $a0, 0x69c4 .L8008F0D4: diff --git a/asm/non_matchings/unknown_080500/func_8008FF1C.s b/asm/non_matchings/unknown_080500/func_8008FF1C.s index 75591292..72129030 100644 --- a/asm/non_matchings/unknown_080500/func_8008FF1C.s +++ b/asm/non_matchings/unknown_080500/func_8008FF1C.s @@ -335,11 +335,11 @@ glabel func_8008FF1C /* 091000 80090400 3C018012 */ lui $at, %hi(D_801269F0) # $at, 0x8012 /* 091004 80090404 3C108012 */ lui $s0, %hi(D_80126930) # $s0, 0x8012 /* 091008 80090408 3C14800E */ lui $s4, %hi(D_800E05F4) # $s4, 0x800e -/* 09100C 8009040C 3C138012 */ lui $s3, %hi(p1_vehicle) # $s3, 0x8012 +/* 09100C 8009040C 3C138012 */ lui $s3, %hi(gPlayerVehicle) # $s3, 0x8012 /* 091010 80090410 3C12800E */ lui $s2, %hi(D_800E05D4) # $s2, 0x800e /* 091014 80090414 AC2069F0 */ sw $zero, %lo(D_801269F0)($at) /* 091018 80090418 265205D4 */ addiu $s2, %lo(D_800E05D4) # addiu $s2, $s2, 0x5d4 -/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(p1_vehicle) # addiu $s3, $s3, 0x69c0 +/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(gPlayerVehicle) # addiu $s3, $s3, 0x69c0 /* 091020 80090420 269405F4 */ addiu $s4, %lo(D_800E05F4) # addiu $s4, $s4, 0x5f4 /* 091024 80090424 26106930 */ addiu $s0, %lo(D_80126930) # addiu $s0, $s0, 0x6930 /* 091028 80090428 AFA0007C */ sw $zero, 0x7c($sp) diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index e73a5d9b..708e7fab 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -352,8 +352,8 @@ glabel func_80090F30 /* 092040 80091440 24070060 */ li $a3, 96 /* 092044 80091444 0C0310E1 */ jal func_800C4384 /* 092048 80091448 AFAE0010 */ sw $t6, 0x10($sp) -/* 09204C 8009144C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 092050 80091450 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 09204C 8009144C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 092050 80091450 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 092054 80091454 8FAF0070 */ lw $t7, 0x70($sp) /* 092058 80091458 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 09205C 8009145C 0018C880 */ sll $t9, $t8, 2 @@ -375,8 +375,8 @@ glabel func_80090F30 /* 09209C 8009149C 02003025 */ move $a2, $s0 /* 0920A0 800914A0 0C031110 */ jal func_800C4440 /* 0920A4 800914A4 02203825 */ move $a3, $s1 -/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 0920B0 800914B0 8FAE0070 */ lw $t6, 0x70($sp) /* 0920B4 800914B4 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 0920B8 800914B8 00187880 */ sll $t7, $t8, 2 @@ -397,8 +397,8 @@ glabel func_80090F30 /* 0920F4 800914F4 02403025 */ move $a2, $s2 /* 0920F8 800914F8 0C031110 */ jal func_800C4440 /* 0920FC 800914FC 02203825 */ move $a3, $s1 -/* 092100 80091500 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 092104 80091504 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 092100 80091500 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 092104 80091504 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 092108 80091508 8FAD0070 */ lw $t5, 0x70($sp) /* 09210C 8009150C 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 092110 80091510 00187080 */ sll $t6, $t8, 2 @@ -417,8 +417,8 @@ glabel func_80090F30 /* 092144 80091544 24060035 */ li $a2, 53 /* 092148 80091548 0C020600 */ jal func_80081800 /* 09214C 8009154C 24070080 */ li $a3, 128 -/* 092150 80091550 3C0D8012 */ lui $t5, %hi(p1_vehicle) # $t5, 0x8012 -/* 092154 80091554 81AD69C0 */ lb $t5, %lo(p1_vehicle)($t5) +/* 092150 80091550 3C0D8012 */ lui $t5, %hi(gPlayerVehicle) # $t5, 0x8012 +/* 092154 80091554 81AD69C0 */ lb $t5, %lo(gPlayerVehicle)($t5) /* 092158 80091558 8FB80070 */ lw $t8, 0x70($sp) /* 09215C 8009155C 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e /* 092160 80091560 000D7080 */ sll $t6, $t5, 2 @@ -664,10 +664,10 @@ glabel func_80090F30 /* 0924E8 800918E8 258C06B0 */ addiu $t4, %lo(D_800E06B0) # addiu $t4, $t4, 0x6b0 /* 0924EC 800918EC 254A0624 */ addiu $t2, %lo(D_800E0624) # addiu $t2, $t2, 0x624 /* 0924F0 800918F0 00094080 */ sll $t0, $t1, 2 -/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(p1_vehicle) # $s1, 0x8012 +/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(gPlayerVehicle) # $s1, 0x8012 /* 0924F8 800918F8 00135840 */ sll $t3, $s3, 1 /* 0924FC 800918FC 016C8021 */ addu $s0, $t3, $t4 -/* 092500 80091900 263169C0 */ addiu $s1, %lo(p1_vehicle) # addiu $s1, $s1, 0x69c0 +/* 092500 80091900 263169C0 */ addiu $s1, %lo(gPlayerVehicle) # addiu $s1, $s1, 0x69c0 /* 092504 80091904 010A9021 */ addu $s2, $t0, $t2 .L80091908: /* 092508 80091908 822D0000 */ lb $t5, ($s1) @@ -750,8 +750,8 @@ glabel func_80090F30 /* 092624 80091A24 8FAF007C */ lw $t7, 0x7c($sp) /* 092628 80091A28 8FB00080 */ lw $s0, 0x80($sp) .L80091A2C: -/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(p1_vehicle) # $v1, 0x8012 -/* 092630 80091A30 806369C0 */ lb $v1, %lo(p1_vehicle)($v1) +/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 +/* 092630 80091A30 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) /* 092634 80091A34 24010002 */ li $at, 2 /* 092638 80091A38 2610008B */ addiu $s0, $s0, 0x8b /* 09263C 80091A3C 24160003 */ li $s6, 3 @@ -821,10 +821,10 @@ glabel func_80090F30 /* 092730 80091B30 14410031 */ bne $v0, $at, .L80091BF8 /* 092734 80091B34 26310624 */ addiu $s1, %lo(D_800E0624) # addiu $s1, $s1, 0x624 /* 092738 80091B38 8FAA0074 */ lw $t2, 0x74($sp) -/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(p1_vehicle) # $t0, 0x8012 +/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(gPlayerVehicle) # $t0, 0x8012 /* 092740 80091B40 1540002D */ bnez $t2, .L80091BF8 /* 092744 80091B44 00000000 */ nop -/* 092748 80091B48 810869C0 */ lb $t0, %lo(p1_vehicle)($t0) +/* 092748 80091B48 810869C0 */ lb $t0, %lo(gPlayerVehicle)($t0) /* 09274C 80091B4C 8FD90000 */ lw $t9, ($fp) /* 092750 80091B50 01160019 */ multu $t0, $s6 /* 092754 80091B54 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -844,8 +844,8 @@ glabel func_80090F30 /* 09278C 80091B8C AFB80010 */ sw $t8, 0x10($sp) /* 092790 80091B90 0C01E2AE */ jal func_80078AB8 /* 092794 80091B94 AFB9001C */ sw $t9, 0x1c($sp) -/* 092798 80091B98 3C028012 */ lui $v0, %hi(p2_vehicle) # $v0, 0x8012 -/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(p2_vehicle)($v0) +/* 092798 80091B98 3C028012 */ lui $v0, %hi(gPlayerVehicle+1) # $v0, 0x8012 +/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(gPlayerVehicle+1)($v0) /* 0927A0 80091BA0 24010002 */ li $at, 2 /* 0927A4 80091BA4 14410002 */ bne $v0, $at, .L80091BB0 /* 0927A8 80091BA8 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 2d3317a0..1fa5d86b 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -329,10 +329,10 @@ glabel L8009251C /* 093230 80092630 000FC080 */ sll $t8, $t7, 2 /* 093234 80092634 03387021 */ addu $t6, $t9, $t8 /* 093238 80092638 8DCF0000 */ lw $t7, ($t6) -/* 09323C 8009263C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 09323C 8009263C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 /* 093240 80092640 31F90002 */ andi $t9, $t7, 2 /* 093244 80092644 13200027 */ beqz $t9, .L800926E4 -/* 093248 80092648 271869C0 */ addiu $t8, %lo(p1_vehicle) # addiu $t8, $t8, 0x69c0 +/* 093248 80092648 271869C0 */ addiu $t8, %lo(gPlayerVehicle) # addiu $t8, $t8, 0x69c0 /* 09324C 8009264C 00057040 */ sll $t6, $a1, 1 /* 093250 80092650 3C068012 */ lui $a2, %hi(D_80126830) # $a2, 0x8012 /* 093254 80092654 00B81821 */ addu $v1, $a1, $t8 @@ -700,8 +700,8 @@ glabel L8009287C /* 093760 80092B60 0C000741 */ jal func_80001D04 /* 093764 80092B64 00002825 */ move $a1, $zero .L80092B68: -/* 093768 80092B68 3C048012 */ lui $a0, %hi(p1_vehicle) # $a0, 0x8012 -/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(p1_vehicle)($a0) +/* 093768 80092B68 3C048012 */ lui $a0, %hi(gPlayerVehicle) # $a0, 0x8012 +/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(gPlayerVehicle)($a0) /* 093770 80092B70 0C01B6C5 */ jal func_8006DB14 /* 093774 80092B74 00000000 */ nop /* 093778 80092B78 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80092E94.s b/asm/non_matchings/unknown_080500/func_80092E94.s index 791b120b..ce229fb0 100644 --- a/asm/non_matchings/unknown_080500/func_80092E94.s +++ b/asm/non_matchings/unknown_080500/func_80092E94.s @@ -159,8 +159,8 @@ glabel func_80092E94 /* 093D00 80093100 240600FF */ li $a2, 255 /* 093D04 80093104 0C0310E1 */ jal func_800C4384 /* 093D08 80093108 24070060 */ li $a3, 96 -/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(p1_vehicle) # $t1, 0x8012 -/* 093D10 80093110 812969C0 */ lb $t1, %lo(p1_vehicle)($t1) +/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(gPlayerVehicle) # $t1, 0x8012 +/* 093D10 80093110 812969C0 */ lb $t1, %lo(gPlayerVehicle)($t1) /* 093D14 80093114 8FA80050 */ lw $t0, 0x50($sp) /* 093D18 80093118 00095080 */ sll $t2, $t1, 2 /* 093D1C 8009311C 8FB10058 */ lw $s1, 0x58($sp) @@ -180,8 +180,8 @@ glabel func_80092E94 /* 093D54 80093154 02003025 */ move $a2, $s0 /* 093D58 80093158 0C031110 */ jal func_800C4440 /* 093D5C 8009315C 27A70054 */ addiu $a3, $sp, 0x54 -/* 093D60 80093160 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 -/* 093D64 80093164 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 093D60 80093160 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 093D64 80093164 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 093D68 80093168 8FAF0050 */ lw $t7, 0x50($sp) /* 093D6C 8009316C 0018C880 */ sll $t9, $t8, 2 /* 093D70 80093170 01F94821 */ addu $t1, $t7, $t9 @@ -201,8 +201,8 @@ glabel func_80092E94 /* 093DA8 800931A8 02003825 */ move $a3, $s0 /* 093DAC 800931AC 8FA20050 */ lw $v0, 0x50($sp) /* 093DB0 800931B0 3C0D800E */ lui $t5, %hi(D_800DF4C4) # $t5, 0x800e -/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 -/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) +/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 +/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) /* 093DBC 800931BC 8DADF4C4 */ lw $t5, %lo(D_800DF4C4)($t5) /* 093DC0 800931C0 8C4C004C */ lw $t4, 0x4c($v0) /* 093DC4 800931C4 00194880 */ sll $t1, $t9, 2 @@ -223,10 +223,10 @@ glabel func_80092E94 /* 093E00 80093200 0C020600 */ jal func_80081800 /* 093E04 80093204 24070080 */ li $a3, 128 /* 093E08 80093208 8FAE0050 */ lw $t6, 0x50($sp) -/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(p1_vehicle) # $t8, 0x8012 +/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 /* 093E10 80093210 3C0F800E */ lui $t7, %hi(D_800DF4C4) # $t7, 0x800e /* 093E14 80093214 8DEFF4C4 */ lw $t7, %lo(D_800DF4C4)($t7) -/* 093E18 80093218 831869C0 */ lb $t8, %lo(p1_vehicle)($t8) +/* 093E18 80093218 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) /* 093E1C 8009321C 8DCA004C */ lw $t2, 0x4c($t6) /* 093E20 80093220 0018C880 */ sll $t9, $t8, 2 /* 093E24 80093224 014F5821 */ addu $t3, $t2, $t7 @@ -313,8 +313,8 @@ glabel func_80092E94 /* 093F58 80093358 01EB6024 */ and $t4, $t7, $t3 /* 093F5C 8009335C 11800025 */ beqz $t4, .L800933F4 /* 093F60 80093360 00104080 */ sll $t0, $s0, 2 -/* 093F64 80093364 3C198012 */ lui $t9, %hi(p1_vehicle) # $t9, 0x8012 -/* 093F68 80093368 833969C0 */ lb $t9, %lo(p1_vehicle)($t9) +/* 093F64 80093364 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 +/* 093F68 80093368 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) /* 093F6C 8009336C 01104023 */ subu $t0, $t0, $s0 /* 093F70 80093370 3C18800E */ lui $t8, %hi(D_800E0624) # $t8, 0x800e /* 093F74 80093374 27180624 */ addiu $t8, %lo(D_800E0624) # addiu $t8, $t8, 0x624 @@ -355,8 +355,8 @@ glabel func_80092E94 /* 093FF8 800933F8 24010003 */ li $at, 3 /* 093FFC 800933FC 1601FFC8 */ bne $s0, $at, .L80093320 /* 094000 80093400 8FAE007C */ lw $t6, 0x7c($sp) -/* 094004 80093404 3C028012 */ lui $v0, %hi(p1_vehicle) # $v0, 0x8012 -/* 094008 80093408 804269C0 */ lb $v0, %lo(p1_vehicle)($v0) +/* 094004 80093404 3C028012 */ lui $v0, %hi(gPlayerVehicle) # $v0, 0x8012 +/* 094008 80093408 804269C0 */ lb $v0, %lo(gPlayerVehicle)($v0) /* 09400C 8009340C 8FB10040 */ lw $s1, 0x40($sp) /* 094010 80093410 24010002 */ li $at, 2 /* 094014 80093414 14410002 */ bne $v0, $at, .L80093420 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 312c9350..115ce018 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -306,8 +306,8 @@ glabel L80095B34 /* 096780 80095B80 3C013F00 */ lui $at, 0x3f00 /* 096784 80095B84 11C0005B */ beqz $t6, .L80095CF4 /* 096788 80095B88 240D0003 */ li $t5, 3 -/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 -/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(p1_vehicle)($t7) +/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 +/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(gPlayerVehicle)($t7) /* 096794 80095B94 90EC0049 */ lbu $t4, 0x49($a3) /* 096798 80095B98 000FC080 */ sll $t8, $t7, 2 /* 09679C 80095B9C 00F81021 */ addu $v0, $a3, $t8 @@ -331,9 +331,9 @@ glabel L80095B34 /* 0967E4 80095BE4 24A56390 */ addiu $a1, %lo(D_80126390) # addiu $a1, $a1, 0x6390 /* 0967E8 80095BE8 0C025DBE */ jal func_800976F8 /* 0967EC 80095BEC 24060003 */ li $a2, 3 -/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(p1_vehicle) # $t4, 0x8012 +/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(gPlayerVehicle) # $t4, 0x8012 /* 0967F4 80095BF4 8FA2002C */ lw $v0, 0x2c($sp) -/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(p1_vehicle)($t4) +/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(gPlayerVehicle)($t4) /* 0967FC 80095BFC 90580049 */ lbu $t8, 0x49($v0) /* 096800 80095C00 000CC880 */ sll $t9, $t4, 2 /* 096804 80095C04 00597021 */ addu $t6, $v0, $t9 @@ -438,8 +438,8 @@ glabel L80095D50 /* 09697C 80095D7C 304E0080 */ andi $t6, $v0, 0x80 /* 096980 80095D80 0C025DD1 */ jal func_80097744 /* 096984 80095D84 24050003 */ li $a1, 3 -/* 096988 80095D88 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 -/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 +/* 096988 80095D88 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 +/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 /* 096990 80095D90 80ED0000 */ lb $t5, ($a3) /* 096994 80095D94 8FA3002C */ lw $v1, 0x2c($sp) /* 096998 80095D98 000D7880 */ sll $t7, $t5, 2 @@ -472,8 +472,8 @@ glabel L80095D50 /* 096A00 80095E00 24840FA8 */ addiu $a0, %lo(D_800E0FA8) # addiu $a0, $a0, 0xfa8 /* 096A04 80095E04 0C025DD1 */ jal func_80097744 /* 096A08 80095E08 24050003 */ li $a1, 3 -/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(p1_vehicle) # $a3, 0x8012 -/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(p1_vehicle) # addiu $a3, $a3, 0x69c0 +/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 +/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 /* 096A14 80095E14 80F80000 */ lb $t8, ($a3) /* 096A18 80095E18 8FA3002C */ lw $v1, 0x2c($sp) /* 096A1C 80095E1C 0018C880 */ sll $t9, $t8, 2 diff --git a/bss.txt b/bss.txt index 096cf296..76d0a240 100644 --- a/bss.txt +++ b/bss.txt @@ -38,55 +38,9 @@ unknown_078050 unknown_079F50 - unknown_07AF10 -D_80126178; -D_80126180; -D_801261A0; -D_80126260; -D_801262B0; -D_801262B8; -D_801262C0; -D_801262C8; -D_801262CC; -D_801262D0; -D_801262D4; -D_801262D8; -D_801262DC; -D_801262E0; -D_801262E4; -D_80126308; -D_80126309; -D_80126310; - unknown_07B870 -D_80126320; -D_80126328; -D_8012632C; -D_80126330; -D_80126338; -D_8012633C; -D_80126340; -D_80126344; -D_80126348; -D_8012634C; -D_80126350; -D_80126354; -D_80126358; -D_8012635C; -D_80126360; -D_80126364; -D_80126368; -D_8012636C; -D_80126370; -D_80126374; -D_80126378; -D_8012637C; -D_80126380; -D_80126382; -D_80126384; - unknown_080500 D_80126390; diff --git a/src/unknown_07B870.c b/src/unknown_07B870.c index be065832..622e08a5 100644 --- a/src/unknown_07B870.c +++ b/src/unknown_07B870.c @@ -485,12 +485,31 @@ const char D_800E7C50[] = "TEXSPR Error: Tryed to deallocate non-existent sprite /************ .bss ************/ -extern s32 D_80126338; -extern s32 D_8012633C; -extern s32 D_80126354; -extern s32 D_80126378; -extern s16 D_80126382; -extern s16 D_80126384; +s32 D_80126320[2]; +s32 D_80126328; +s32 D_8012632C; +s32 D_80126330[2]; +s32 D_80126338; +s32 D_8012633C; +s32 D_80126340; +s32 D_80126344; +s32 D_80126348; +s32 D_8012634C; +s32 D_80126350; +s32 D_80126354; +s32 D_80126358; +s32 D_8012635C; +s32 D_80126360; +s32 D_80126364; +s32 D_80126368; +s32 D_8012636C; +s32 D_80126370; +s32 D_80126374; +s32 D_80126378; +s32 D_8012637C; +s16 D_80126380; +s16 D_80126382; +s16 D_80126384; /*******************************/ diff --git a/src/unknown_080500.c b/src/unknown_080500.c index 36ea430a..b905c7f1 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -42,6 +42,255 @@ typedef enum MENU_ID { extern s32 osTvType; +typedef struct unk800DFC10 { + u32 *unk0; + s16 unk4; + s16 unk6; + u32 *unk8; + s32 unkC; +} unk800DFC10; + +/************ .bss ************/ + +// The bss section needs to stay above the data section! +// Otherwise the bss variables will get reordered, which is bad. + +unk800DFC10 *D_80126390; +unk800DFC10 *D_80126394; +s32 D_80126398; +s32 D_8012639C; +Gfx *D_801263A0; +s32 D_801263A4; +s32 D_801263A8; +s32 D_801263AC; +s32 D_801263B0; +s8 D_801263B4; +s32 D_801263B8; +s32 D_801263BC; +s32 D_801263C0; +s32 D_801263C4; +s32 D_801263C8; +s32 D_801263CC; +s32 D_801263D0; +s8 D_801263D4[4]; +s32 D_801263D8; +s8 D_801263DC[4]; +s32 D_801263E0; +s32 D_801263E4; +s8 players_character_array[8]; +s8 D_801263F0[8]; +s32 D_801263F8[8]; +u8 D_80126418[8]; +u8 D_80126420[8]; +u8 D_80126428[8]; +s8 D_80126430; +s8 D_80126431; +s32 D_80126434; +s32 D_80126438[4]; +s64 D_80126448; +f32 D_80126450; +u8 D_80126454[4]; +u8 D_80126458[4]; +s8 D_8012645C[4]; +s8 D_80126460[4]; +s8 D_80126464[4]; +u8 D_80126468[4]; +u8 D_8012646C[4]; +s32 D_80126470; +s32 D_80126474; +s32 D_80126478; +s32 D_8012647C; +s32 D_80126480; +s32 D_80126484; +s32 D_80126488; +s32 D_8012648C; +s32 D_80126490; +s32 D_80126494; +s32 D_80126498; +s32 D_8012649C; +s32 D_801264A0[12]; +s32 D_801264D0; +s32 D_801264D4; +s8 D_801264D8; +s32 D_801264DC; +s8 D_801264E0; +s8 D_801264E1; +s8 D_801264E2; +s32 D_801264E4; +s32 D_801264E8; +s32 D_801264EC; +s32 D_801264F0[2]; +s32 D_801264F8[2]; +s32 D_80126500; +s8 D_80126504; +s32 D_80126508; +s16 D_8012650C; +s8 D_8012650E; +s32 D_80126510; +s16 D_80126514; +s8 D_80126516; +s32 D_80126518; +s32 D_8012651C; +s32 D_80126520; +s32 D_80126524; +s32 D_80126528; +s32 D_8012652C; +Settings *D_80126530[4]; +s8 D_80126540; +s8 D_80126541; +s32 D_80126544; +s32 D_80126548; +u32* D_80126550[67]; // lookup table? +s32 D_8012665C; +s32 D_80126660; +s32 D_80126664; +s32 D_80126668[58]; +u8 D_80126750[128]; +s32 D_801267D0; +s32 D_801267D4; +s32 D_801267D8[3]; +s32 D_801267E4; +s32 D_801267E8; +s8* D_801267EC; +s32 D_801267F0[5]; +s32 D_80126804; +s32 D_80126808; +s32 D_8012680C; +s32 D_80126810; +s32 D_80126814; +s32 D_80126818; +s32 D_8012681C; +s32 D_80126820; +s32 D_80126824; +s32 D_80126828; +s32 D_8012682C; +s32 D_80126830; +s32 D_80126834; +s16 D_80126838; +s16 D_8012683A; +s32 D_8012683C; +s32 D_80126840; +s32 D_80126844; +s32 D_80126848; +s32 D_8012684C; +s32 D_80126850; +s32 D_80126854; +s32 D_80126858; +s32 D_8012685C; +s32 D_80126860; +s32 D_80126864; +s32 D_80126868; +s32 D_8012686C; +s32 D_80126870; +s32 D_80126874; +s32 D_80126878[24]; +s32 D_801268D8; +s32 D_801268DC; +s32 D_801268E0; +s32 D_801268E4; +s32 D_801268E8[12]; +s32 D_80126918[3]; +s32 D_80126924; +s32 D_80126928; +s32 D_8012692C; +s32 D_80126930[36]; +s8 gPlayerVehicle[4]; // Unknown number of entries. +s32 D_801269C4; +s32 D_801269C8; +s32 D_801269CC; +s32 D_801269D0[3]; +s32 D_801269DC; +u32* D_801269E0; +s32 D_801269E4; +s32 D_801269E8; +s32 D_801269EC; +s32 D_801269F0; +s32 D_801269F4; +s32 D_801269F8; +s32 D_801269FC; +s32 D_80126A00; +s32 D_80126A04; +s32 D_80126A08; +s32 D_80126A0C; +s32 D_80126A10; +s32 D_80126A14; +s32 D_80126A18; +s32 D_80126A1C; +s32 D_80126A20[4]; +s32 D_80126A30; +s32 D_80126A34; +s32 D_80126A38; +s32 D_80126A3C; +s32 D_80126A40[8]; +s8 D_80126A60[2]; +s32 D_80126A64; +s32 D_80126A68; +s32 D_80126A6C; +s32 D_80126A70; +s32 D_80126A74; +s32 D_80126A78; +s32 D_80126A7C; +s32 D_80126A80[4]; +s32 D_80126A90; +s32 D_80126A94; +s32 D_80126A98; +s32 D_80126A9C; +s32* D_80126AA0[16]; +s32 D_80126AE0[16]; +s32 D_80126B20[16]; +s32 D_80126B60[4]; +s32 D_80126B70[16]; +s32 D_80126BB0; +s32 D_80126BB4; +s32 D_80126BB8; +s32 D_80126BBC; +s32 D_80126BC0; +s32 D_80126BC4; +s32 D_80126BC8; +s32 D_80126BCC; +s32 D_80126BD0; +s32 D_80126BD4; +s32 D_80126BD8; +f32 D_80126BDC; +s32 D_80126BE0; +s32 D_80126BE4; +s32 D_80126BE8; +f32 D_80126BEC; +s32 D_80126BF0[8]; +s32 D_80126C10; +s32 D_80126C14; +s32 D_80126C18; +s32 D_80126C1C; +s32 D_80126C20; +s32 D_80126C24; +s32 D_80126C28; +s32 *D_80126C2C; +u16 (*D_80126C30)[30]; // Cheat table. +s32 D_80126C34; +s32 D_80126C38; +s32 D_80126C3C; +u16 D_80126C40; +u16 D_80126C42; +u16 D_80126C44; +s16 D_80126C46; +s32 D_80126C48; +s16 D_80126C4C; +f32 D_80126C50; +s8 D_80126C54; +s8 D_80126C55; +s8 D_80126C56; +s8 D_80126C57; +u8 D_80126C58[20]; +s32 *D_80126C6C; +s32 D_80126C70; +s32 D_80126C74; +s32 D_80126C78; +s32 D_80126C7C; +s32 D_80126C80[16]; +s32 D_80126CC0; + +/******************************/ + /************ .data ************/ s8 D_800DF450 = 0; @@ -774,15 +1023,17 @@ MenuElement D_800E0CEC[11] = { }; + + MenuElement D_800E0E4C[9] = { { 481, 174, 161, 174, -159, 174, 0, 0, 0, 255, 128, 0, 12, 0, NULL, 0, 0, 0, 0 }, { 479, 172, 159, 172, -161, 172, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, { 368, 192, 48, 192, -272, 192, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, { 506, 187, 186, 187, -134, 187, 255, 192, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, - { 578, 192, 258, 192, -62, 192, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126390, 0, 0, 0, 0 }, + { 578, 192, 258, 192, -62, 192, 255, 128, 255, 96, 255, 0, 12, 0, &D_80126390, 0, 0, 0, 0 }, { 368, 212, 48, 212, -272, 212, 255, 64, 64, 96, 255, 0, 8, 0, NULL, 0, 0, 0, 0 }, { 506, 207, 186, 207, -134, 207, 128, 255, 255, 0, 255, 0, 0, 1, NULL, 0, 0, 0, 0 }, - { 578, 212, 258, 212, -62, 212, 255, 128, 255, 96, 255, 0, 12, 0, (s32*)0x80126394, 0, 0, 0, 0 }, + { 578, 212, 258, 212, -62, 212, 255, 128, 255, 96, 255, 0, 12, 0, &D_80126394, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 }, }; @@ -1224,7 +1475,7 @@ s16 D_800E1E08[4] = { 0, 0, 0x34, -1 }; -s32 *D_800E1E10 = (s32 *)0x800E8200; +s32 *D_800E1E10 = " (ADV."; s32 D_800E1E14 = 0; s32 D_800E1E18 = 0; @@ -1250,7 +1501,6 @@ s16 D_800E1E40[10] = { /************ .rodata ************/ -const char D_800E8200[] = " (ADV."; const char D_800E8208[] = "OK?"; const char D_800E820C[] = "~"; const char D_800E8210[] = "DEL"; @@ -1268,110 +1518,6 @@ const char D_800E8250[] = "loadFrontEndItem() - Item no %d out of range 0-%d\n"; /*********************************/ -/************ .bss ************/ - -extern Gfx *D_801263A0; -extern s32 D_801263A8; -extern s32 D_801263AC; -extern s8 D_801263B4; -extern s32 D_801263BC; -extern s32 D_801263C4; -extern s8 D_801263D4[4]; -extern s8 D_801263DC[4]; -extern s32 D_801263D8; -extern s32 D_801263E0; -extern s8 players_character_array[8]; -extern s8 D_801263F0[8]; -extern u8 D_80126418[8]; -extern u8 D_80126420[8]; -extern s64 D_80126448; -extern f32 D_80126450; -extern u8 D_80126454[4]; -extern u8 D_80126458[4]; -extern s8 D_8012645C[4]; -extern s8 D_80126464[4]; -extern u8 D_80126468[4]; -extern u8 D_8012646C[4]; -extern s32 D_80126470; -extern s32 D_80126484; -extern s32 D_80126488; -extern s8 D_801264D8; -extern s8 D_801264E2; -extern s8 D_80126504; -extern s8 D_8012650E; -extern s8 D_80126516; -extern Settings *D_80126530[3]; -extern s32 D_80126548; -extern u32* D_80126550[1]; // lookup table? Unknown number of entries. -extern u8 D_80126750[1]; // unknown number of entries -extern s32 D_801267D0; -extern s8* D_801267EC; -extern s32 D_80126804; -extern s32 D_80126824; -extern s32 D_8012683C; -extern s32 D_80126840; -extern s32 D_80126844; -extern s32 D_8012684C; -extern s32 D_80126854; -extern s32 D_80126858; -extern s32 D_8012685C; -extern s32 D_80126860; -extern s8 p1_vehicle[4]; // Unknown number of entries. -extern s32 D_801269C8; -extern s32 D_801269CC; -extern u32* D_801269E0; -extern s32 D_801269FC; -extern s32 D_80126A00; -extern s32 D_80126A04; -extern s32 D_80126A08; -extern s32 D_80126A0C; -extern s32 D_80126A10; -extern s32 D_80126A14; -extern s32 D_80126A18; -extern s32 D_80126A1C; -extern s32 D_80126A20[8]; // Unknown number of entries. -extern s8 D_80126A60[2]; -extern s32 D_80126A64; -extern s32 D_80126A68; -extern s32 D_80126A6C; -extern s32 D_80126A94; -extern s32* D_80126AA0[16]; -extern s32 D_80126BB4; -extern s32 D_80126BB8; -extern s32 D_80126BBC; -extern s32 D_80126BC4; -extern s32 D_80126BC8; -extern s32 D_80126BCC; -extern s32 D_80126BD0; -extern s32 D_80126BD4; -extern s32 D_80126BD8; -extern f32 D_80126BDC; -extern s32 D_80126BE0; -extern f32 D_80126BEC; -extern s32 D_80126BE4; -extern s32 D_80126BF0[3]; -extern s32 D_80126C10; -extern s32 D_80126C14; -extern s32 *D_80126C2C; -extern u16 *D_80126C30[30]; // Cheat table. -extern s32 D_80126C34; -extern s32 D_80126C3C; -extern u16 D_80126C40; -extern u16 D_80126C42; -extern s16 D_80126C46; -extern u16 D_80126C44; -extern s32 D_80126C48; -extern s16 D_80126C4C; -extern u8 D_80126C58; -extern f32 D_80126C50; -extern s32 *D_80126C6C; -extern s32 D_80126C70; -extern s32 D_80126C74; -extern s32 D_80126C78; -extern s32 D_80126CC0; - -/******************************/ - Settings *get_settings(void); void func_8009C4A8(s16 *arg0); void func_8009C674(s16 *arg0); @@ -1653,8 +1799,6 @@ void func_800841B8(s32 arg0) { #if 1 GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") #else - -extern s32 D_8012644C; void func_80084734(void); void set_language(s32 language); @@ -1712,7 +1856,7 @@ s32 MenuOptionsLoop(s32 arg0) { func_80001D04(0xEB, 0); } else if (D_800DF460 == 1 && analogX != 0) { // Enable/Disable subtitles. - if (D_8012644C & 0x2000000) { + if (D_80126448+4 & 0x2000000) { func_80001D04(0xEB, 0); func_8009EABC(0, 0x2000000); func_800C2AF4(0); @@ -2282,7 +2426,7 @@ void menu_magic_codes_init(void) { D_80126C44 = 0; D_80126470 = 0; D_80126C4C = -1; - D_80126C58 = 0; + D_80126C58[0] = 0; D_801263BC = 0; D_800DF47C = 0; D_801263D8 = 0; @@ -2864,7 +3008,7 @@ void func_8008DC7C(s32 arg0) { temp_a1 = D_8012645C; if (D_800DF4BC == 2) { phi_v1 = phi_v1 | func_8006A554(1); - temp_a1 += D_8012645D; + temp_a1 += D_8012645C+1; } if (D_80126494 == 0) { @@ -3164,7 +3308,7 @@ void MenuLoadNewAreaInit(void) { D_801263BC = 0; D_800DF47C = 0; temp_s0 = settings->unk4C->unk2; - p1_vehicle = func_8006B0AC(temp_s0); + gPlayerVehicle = func_8006B0AC(temp_s0); temp_v0_2 = func_8006B14C(temp_s0); if (temp_v0_2 != 5) { if (temp_v0_2 != 8) { @@ -3501,7 +3645,7 @@ void MenuTrophyRaceRoundInit(void) { } for(i = 0; i < D_800DF4BC; i++){ - p1_vehicle[i] = func_8006B0AC(temp); + gPlayerVehicle[i] = func_8006B0AC(temp); } func_8006DB14(func_8006B0AC(temp)); @@ -3833,11 +3977,11 @@ s8 func_8009C23C(s32 arg0) { } s8 func_8009C250(s32 arg0) { - return p1_vehicle[arg0]; + return gPlayerVehicle[arg0]; } void func_8009C264(s32 arg0, s32 arg1) { - p1_vehicle[arg0] = arg1; + gPlayerVehicle[arg0] = arg1; } s8* func_8009C274(void) { diff --git a/undefined_syms.txt b/undefined_syms.txt index e8afc62c..1219c778 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,248 +25,217 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_80126320 = 0x80126320; -D_80126328 = 0x80126328; -D_8012632C = 0x8012632C; -D_80126330 = 0x80126330; -D_80126338 = 0x80126338; -D_8012633C = 0x8012633C; -D_80126340 = 0x80126340; -D_80126344 = 0x80126344; -D_80126348 = 0x80126348; -D_8012634C = 0x8012634C; -D_80126350 = 0x80126350; -D_80126354 = 0x80126354; -D_80126358 = 0x80126358; -D_8012635C = 0x8012635C; -D_80126360 = 0x80126360; -D_80126364 = 0x80126364; -D_80126368 = 0x80126368; -D_8012636C = 0x8012636C; -D_80126370 = 0x80126370; -D_80126374 = 0x80126374; -D_80126378 = 0x80126378; -D_8012637C = 0x8012637C; -D_80126380 = 0x80126380; -D_80126382 = 0x80126382; -D_80126384 = 0x80126384; -D_80126390 = 0x80126390; -D_80126394 = 0x80126394; -D_80126398 = 0x80126398; -D_8012639C = 0x8012639C; -D_801263A0 = 0x801263A0; -D_801263A4 = 0x801263A4; -D_801263A8 = 0x801263A8; -D_801263AC = 0x801263AC; -D_801263B0 = 0x801263B0; -D_801263B4 = 0x801263B4; -D_801263B8 = 0x801263B8; -D_801263BC = 0x801263BC; -D_801263C0 = 0x801263C0; -D_801263C4 = 0x801263C4; -D_801263C8 = 0x801263C8; -D_801263CC = 0x801263CC; -D_801263D0 = 0x801263D0; -D_801263D4 = 0x801263D4; -D_801263D5 = 0x801263D5; -D_801263D6 = 0x801263D6; -D_801263D7 = 0x801263D7; -D_801263D8 = 0x801263D8; -D_801263DC = 0x801263DC; -D_801263E0 = 0x801263E0; -players_character_array = 0x801263E8; -D_801263F0 = 0x801263F0; -D_801263F8 = 0x801263F8; -D_80126418 = 0x80126418; -D_80126420 = 0x80126420; -D_80126428 = 0x80126428; -D_80126430 = 0x80126430; -D_80126431 = 0x80126431; -D_80126438 = 0x80126438; -D_80126448 = 0x80126448; -D_8012644C = 0x8012644C; -D_80126450 = 0x80126450; -D_80126454 = 0x80126454; -D_80126458 = 0x80126458; -D_8012645C = 0x8012645C; -D_8012645D = 0x8012645D; -D_80126460 = 0x80126460; -D_80126464 = 0x80126464; -D_80126465 = 0x80126465; -D_80126468 = 0x80126468; -D_8012646C = 0x8012646C; -D_80126470 = 0x80126470; -D_80126474 = 0x80126474; -D_80126478 = 0x80126478; -D_8012647C = 0x8012647C; -D_80126480 = 0x80126480; -D_80126484 = 0x80126484; -D_80126488 = 0x80126488; -D_8012648C = 0x8012648C; -D_80126490 = 0x80126490; -D_80126494 = 0x80126494; -D_80126498 = 0x80126498; -D_801264A0 = 0x801264A0; -D_801264D0 = 0x801264D0; -D_801264D4 = 0x801264D4; -D_801264D8 = 0x801264D8; -D_801264DC = 0x801264DC; -D_801264E2 = 0x801264E2; -D_801264E4 = 0x801264E4; -D_801264EC = 0x801264EC; -D_801264F8 = 0x801264F8; -D_80126504 = 0x80126504; -D_80126508 = 0x80126508; -D_8012650E = 0x8012650E; -D_80126510 = 0x80126510; -D_80126516 = 0x80126516; -D_80126518 = 0x80126518; -D_80126520 = 0x80126520; -D_80126530 = 0x80126530; -D_80126534 = 0x80126534; -D_80126538 = 0x80126538; -D_8012653C = 0x8012653C; -D_80126540 = 0x80126540; -D_80126541 = 0x80126541; -D_80126548 = 0x80126548; -D_80126550 = 0x80126550; -D_8012665C = 0x8012665C; -D_80126660 = 0x80126660; -D_80126664 = 0x80126664; -D_80126750 = 0x80126750; -D_801267D0 = 0x801267D0; -D_801267D8 = 0x801267D8; -D_801267E4 = 0x801267E4; -D_801267E8 = 0x801267E8; -D_801267EC = 0x801267EC; -D_801267F0 = 0x801267F0; -D_80126804 = 0x80126804; -D_80126808 = 0x80126808; -D_8012680C = 0x8012680C; -D_80126810 = 0x80126810; -D_80126814 = 0x80126814; -D_80126818 = 0x80126818; -D_80126820 = 0x80126820; -D_80126824 = 0x80126824; -D_80126828 = 0x80126828; -D_80126830 = 0x80126830; -D_80126838 = 0x80126838; -D_8012683A = 0x8012683A; -D_8012683C = 0x8012683C; -D_80126840 = 0x80126840; -D_80126844 = 0x80126844; -D_80126848 = 0x80126848; -D_8012684C = 0x8012684C; -D_80126850 = 0x80126850; -D_80126854 = 0x80126854; -D_80126858 = 0x80126858; -D_8012685C = 0x8012685C; -D_80126860 = 0x80126860; -D_80126864 = 0x80126864; -D_80126868 = 0x80126868; -D_8012686C = 0x8012686C; -D_80126870 = 0x80126870; -D_80126874 = 0x80126874; -D_80126878 = 0x80126878; -D_801268D8 = 0x801268D8; -D_801268DC = 0x801268DC; -D_801268E0 = 0x801268E0; -D_801268E8 = 0x801268E8; -D_80126918 = 0x80126918; -D_80126924 = 0x80126924; -D_80126928 = 0x80126928; -D_8012692C = 0x8012692C; -D_80126930 = 0x80126930; -p1_vehicle = 0x801269C0; -p2_vehicle = 0x801269C1; -D_801269C4 = 0x801269C4; -D_801269C8 = 0x801269C8; -D_801269CC = 0x801269CC; -D_801269D0 = 0x801269D0; -D_801269DC = 0x801269DC; -D_801269E0 = 0x801269E0; -D_801269E4 = 0x801269E4; -D_801269E8 = 0x801269E8; -D_801269EC = 0x801269EC; -D_801269F0 = 0x801269F0; -D_801269F4 = 0x801269F4; -D_801269F8 = 0x801269F8; -D_801269FC = 0x801269FC; -D_80126A00 = 0x80126A00; -D_80126A04 = 0x80126A04; -D_80126A08 = 0x80126A08; -D_80126A0C = 0x80126A0C; -D_80126A10 = 0x80126A10; -D_80126A14 = 0x80126A14; -D_80126A18 = 0x80126A18; -D_80126A1C = 0x80126A1C; -D_80126A20 = 0x80126A20; -D_80126A30 = 0x80126A30; -D_80126A34 = 0x80126A34; -D_80126A38 = 0x80126A38; -D_80126A3C = 0x80126A3C; -D_80126A40 = 0x80126A40; -D_80126A60 = 0x80126A60; -D_80126A64 = 0x80126A64; -D_80126A68 = 0x80126A68; -D_80126A6C = 0x80126A6C; -D_80126A70 = 0x80126A70; -D_80126A74 = 0x80126A74; -D_80126A78 = 0x80126A78; -D_80126A80 = 0x80126A80; -D_80126A90 = 0x80126A90; -D_80126A94 = 0x80126A94; -D_80126A98 = 0x80126A98; -D_80126AA0 = 0x80126AA0; -D_80126AE0 = 0x80126AE0; -D_80126B20 = 0x80126B20; -D_80126B60 = 0x80126B60; -D_80126B70 = 0x80126B70; -D_80126BB0 = 0x80126BB0; -D_80126BB4 = 0x80126BB4; -D_80126BB8 = 0x80126BB8; -D_80126BBC = 0x80126BBC; -D_80126BC0 = 0x80126BC0; -D_80126BC4 = 0x80126BC4; -D_80126BC8 = 0x80126BC8; -D_80126BCC = 0x80126BCC; -D_80126BD0 = 0x80126BD0; -D_80126BD4 = 0x80126BD4; -D_80126BD8 = 0x80126BD8; -D_80126BDC = 0x80126BDC; -D_80126BE0 = 0x80126BE0; -D_80126BE4 = 0x80126BE4; -D_80126BE8 = 0x80126BE8; -D_80126BEC = 0x80126BEC; -D_80126BF0 = 0x80126BF0; -D_80126C10 = 0x80126C10; -D_80126C14 = 0x80126C14; -D_80126C18 = 0x80126C18; -D_80126C1C = 0x80126C1C; -D_80126C20 = 0x80126C20; -D_80126C24 = 0x80126C24; -D_80126C28 = 0x80126C28; -D_80126C2C = 0x80126C2C; -D_80126C30 = 0x80126C30; -D_80126C34 = 0x80126C34; -D_80126C38 = 0x80126C38; -D_80126C3C = 0x80126C3C; -D_80126C40 = 0x80126C40; -D_80126C42 = 0x80126C42; -D_80126C44 = 0x80126C44; -D_80126C46 = 0x80126C46; -D_80126C48 = 0x80126C48; -D_80126C4C = 0x80126C4C; -D_80126C50 = 0x80126C50; -D_80126C54 = 0x80126C54; -D_80126C57 = 0x80126C57; -D_80126C58 = 0x80126C58; -D_80126C6C = 0x80126C6C; -D_80126C70 = 0x80126C70; -D_80126C74 = 0x80126C74; -D_80126C78 = 0x80126C78; -D_80126C80 = 0x80126C80; -D_80126CC0 = 0x80126CC0; +/D_80126390 = 0x80126390; +/D_80126394 = 0x80126394; +/D_80126398 = 0x80126398; +/D_8012639C = 0x8012639C; +/D_801263A0 = 0x801263A0; +/D_801263A4 = 0x801263A4; +/D_801263A8 = 0x801263A8; +/D_801263AC = 0x801263AC; +/D_801263B0 = 0x801263B0; +/D_801263B4 = 0x801263B4; +/D_801263B8 = 0x801263B8; +/D_801263BC = 0x801263BC; +/D_801263C0 = 0x801263C0; +/D_801263C4 = 0x801263C4; +/D_801263C8 = 0x801263C8; +/D_801263CC = 0x801263CC; +/D_801263D0 = 0x801263D0; +/D_801263D4 = 0x801263D4; +/D_801263D8 = 0x801263D8; +/D_801263DC = 0x801263DC; +/D_801263E0 = 0x801263E0; +/players_character_array = 0x801263E8; +/D_801263F0 = 0x801263F0; +/D_801263F8 = 0x801263F8; +/D_80126418 = 0x80126418; +/D_80126420 = 0x80126420; +/D_80126428 = 0x80126428; +/D_80126430 = 0x80126430; +/D_80126431 = 0x80126431; +/D_80126438 = 0x80126438; +/D_80126448 = 0x80126448; +/D_80126450 = 0x80126450; +/D_80126454 = 0x80126454; +/D_80126458 = 0x80126458; +/D_8012645C = 0x8012645C; +/D_80126460 = 0x80126460; +/D_80126464 = 0x80126464; +/D_80126468 = 0x80126468; +/D_8012646C = 0x8012646C; +/D_80126470 = 0x80126470; +/D_80126474 = 0x80126474; +/D_80126478 = 0x80126478; +/D_8012647C = 0x8012647C; +/D_80126480 = 0x80126480; +/D_80126484 = 0x80126484; +/D_80126488 = 0x80126488; +/D_8012648C = 0x8012648C; +/D_80126490 = 0x80126490; +/D_80126494 = 0x80126494; +/D_80126498 = 0x80126498; + +/D_801264A0 = 0x801264A0; +/D_801264D0 = 0x801264D0; +/D_801264D4 = 0x801264D4; +/D_801264D8 = 0x801264D8; +/D_801264DC = 0x801264DC; +/D_801264E2 = 0x801264E2; +/D_801264E4 = 0x801264E4; +/D_801264EC = 0x801264EC; +/D_801264F8 = 0x801264F8; + +/D_80126504 = 0x80126504; +/D_80126508 = 0x80126508; +/D_8012650E = 0x8012650E; +/D_80126510 = 0x80126510; +/D_80126516 = 0x80126516; +/D_80126518 = 0x80126518; +/D_80126520 = 0x80126520; + +/D_80126530 = 0x80126530; +/D_80126540 = 0x80126540; +/D_80126541 = 0x80126541; +/D_80126548 = 0x80126548; +/D_80126550 = 0x80126550; +/D_8012665C = 0x8012665C; +/D_80126660 = 0x80126660; +/D_80126664 = 0x80126664; +/D_80126750 = 0x80126750; +/D_801267D0 = 0x801267D0; +/D_801267D8 = 0x801267D8; +/D_801267E4 = 0x801267E4; +/D_801267E8 = 0x801267E8; +/D_801267EC = 0x801267EC; +/D_801267F0 = 0x801267F0; +/D_80126804 = 0x80126804; +/D_80126808 = 0x80126808; +/D_8012680C = 0x8012680C; +/D_80126810 = 0x80126810; +/D_80126814 = 0x80126814; +/D_80126818 = 0x80126818; +/D_80126820 = 0x80126820; +/D_80126824 = 0x80126824; +/D_80126828 = 0x80126828; +/D_80126830 = 0x80126830; +/D_80126838 = 0x80126838; +/D_8012683A = 0x8012683A; +/D_8012683C = 0x8012683C; +/D_80126840 = 0x80126840; +/D_80126844 = 0x80126844; +/D_80126848 = 0x80126848; +/D_8012684C = 0x8012684C; +/D_80126850 = 0x80126850; +/D_80126854 = 0x80126854; +/D_80126858 = 0x80126858; +/D_8012685C = 0x8012685C; +/D_80126860 = 0x80126860; +/D_80126864 = 0x80126864; +/D_80126868 = 0x80126868; +/D_8012686C = 0x8012686C; +/D_80126870 = 0x80126870; +/D_80126874 = 0x80126874; +/D_80126878 = 0x80126878; +/D_801268D8 = 0x801268D8; +/D_801268DC = 0x801268DC; +/D_801268E0 = 0x801268E0; +/D_801268E8 = 0x801268E8; +/D_80126918 = 0x80126918; +/D_80126924 = 0x80126924; +/D_80126928 = 0x80126928; +/D_8012692C = 0x8012692C; +/D_80126930 = 0x80126930; +/gPlayerVehicle = 0x801269C0; +/D_801269C4 = 0x801269C4; +/D_801269C8 = 0x801269C8; +/D_801269CC = 0x801269CC; +/D_801269D0 = 0x801269D0; +/D_801269DC = 0x801269DC; +/D_801269E0 = 0x801269E0; +/D_801269E4 = 0x801269E4; +/D_801269E8 = 0x801269E8; +/D_801269EC = 0x801269EC; +/D_801269F0 = 0x801269F0; +/D_801269F4 = 0x801269F4; +/D_801269F8 = 0x801269F8; +/D_801269FC = 0x801269FC; +/D_80126A00 = 0x80126A00; +/D_80126A04 = 0x80126A04; +/D_80126A08 = 0x80126A08; +/D_80126A0C = 0x80126A0C; +/D_80126A10 = 0x80126A10; +/D_80126A14 = 0x80126A14; +/D_80126A18 = 0x80126A18; +/D_80126A1C = 0x80126A1C; +/D_80126A20 = 0x80126A20; +/D_80126A30 = 0x80126A30; +/D_80126A34 = 0x80126A34; +/D_80126A38 = 0x80126A38; +/D_80126A3C = 0x80126A3C; +/D_80126A40 = 0x80126A40; +/D_80126A60 = 0x80126A60; +/D_80126A64 = 0x80126A64; +/D_80126A68 = 0x80126A68; +/D_80126A6C = 0x80126A6C; +/D_80126A70 = 0x80126A70; +/D_80126A74 = 0x80126A74; +/D_80126A78 = 0x80126A78; +/D_80126A80 = 0x80126A80; +/D_80126A90 = 0x80126A90; +/D_80126A94 = 0x80126A94; +/D_80126A98 = 0x80126A98; +/D_80126AA0 = 0x80126AA0; +/D_80126AE0 = 0x80126AE0; +/D_80126B20 = 0x80126B20; +/D_80126B60 = 0x80126B60; +/D_80126B70 = 0x80126B70; +/D_80126BB0 = 0x80126BB0; +/D_80126BB4 = 0x80126BB4; +/D_80126BB8 = 0x80126BB8; +/D_80126BBC = 0x80126BBC; +/D_80126BC0 = 0x80126BC0; +/D_80126BC4 = 0x80126BC4; +/D_80126BC8 = 0x80126BC8; +/D_80126BCC = 0x80126BCC; +/D_80126BD0 = 0x80126BD0; +/D_80126BD4 = 0x80126BD4; +/D_80126BD8 = 0x80126BD8; +/D_80126BDC = 0x80126BDC; +/D_80126BE0 = 0x80126BE0; +/D_80126BE4 = 0x80126BE4; +/D_80126BE8 = 0x80126BE8; +/D_80126BEC = 0x80126BEC; +/D_80126BF0 = 0x80126BF0; +/D_80126C10 = 0x80126C10; +/D_80126C14 = 0x80126C14; +/D_80126C18 = 0x80126C18; +/D_80126C1C = 0x80126C1C; +/D_80126C20 = 0x80126C20; +/D_80126C24 = 0x80126C24; +/D_80126C28 = 0x80126C28; +/D_80126C2C = 0x80126C2C; +/D_80126C30 = 0x80126C30; +/D_80126C34 = 0x80126C34; +/D_80126C38 = 0x80126C38; +/D_80126C3C = 0x80126C3C; +/D_80126C40 = 0x80126C40; +/D_80126C42 = 0x80126C42; +/D_80126C44 = 0x80126C44; +/D_80126C46 = 0x80126C46; +/D_80126C48 = 0x80126C48; +/D_80126C4C = 0x80126C4C; +/D_80126C50 = 0x80126C50; +/D_80126C54 = 0x80126C54; +/D_80126C57 = 0x80126C57; +/D_80126C58 = 0x80126C58; +/D_80126C6C = 0x80126C6C; +/D_80126C70 = 0x80126C70; +/D_80126C74 = 0x80126C74; +/D_80126C78 = 0x80126C78; +/D_80126C80 = 0x80126C80; +/D_80126CC0 = 0x80126CC0; + D_80126CD0 = 0x80126CD0; D_80126CD1 = 0x80126CD1; D_80126CD2 = 0x80126CD2; From e8ecba6f0076f6025b4b88d5dcb9d1160b39e0c4 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 19:04:01 -0500 Subject: [PATCH 36/39] Added bss for unknown_09F8F0 & unknown_0AEE70 --- bss.txt | 371 ------------------------------------------- src/unknown_07B870.c | 2 +- src/unknown_09F8F0.c | 106 +++++++++++-- src/unknown_0AEE70.c | 101 ++++++++++++ undefined_syms.txt | 356 ----------------------------------------- 5 files changed, 193 insertions(+), 743 deletions(-) diff --git a/bss.txt b/bss.txt index 76d0a240..a7c9b8f0 100644 --- a/bss.txt +++ b/bss.txt @@ -43,381 +43,10 @@ unknown_07AF10 unknown_07B870 unknown_080500 -D_80126390; -D_80126394; -D_80126398; -D_8012639C; -D_801263A0; -D_801263A4; -D_801263A8; -D_801263AC; -D_801263B0; -D_801263B4; -D_801263B8; -D_801263BC; -D_801263C0; -D_801263C4; -D_801263C8; -D_801263CC; -D_801263D0; -D_801263D4; -D_801263D5; -D_801263D6; -D_801263D7; -D_801263D8; -D_801263DC; -D_801263E0; -players_character_array; -D_801263F0; -D_801263F8; -D_80126418; -D_80126420; -D_80126428; -D_80126430; -D_80126431; -D_80126438; -D_80126448; -D_8012644C; -D_80126450; -D_80126454; -D_80126458; -D_8012645C; -D_8012645D; -D_80126460; -D_80126464; -D_80126465; -D_80126468; -D_8012646C; -D_80126470; -D_80126474; -D_80126478; -D_8012647C; -D_80126480; -D_80126484; -D_80126488; -D_8012648C; -D_80126490; -D_80126494; -D_80126498; -D_801264A0; -D_801264D0; -D_801264D4; -D_801264D8; -D_801264DC; -D_801264E2; -D_801264E4; -D_801264EC; -D_801264F8; -D_80126504; -D_80126508; -D_8012650E; -D_80126510; -D_80126516; -D_80126518; -D_80126520; -D_80126530; -D_80126534; -D_80126538; -D_8012653C; -D_80126540; -D_80126541; -D_80126548; -D_80126550; -D_8012665C; -D_80126660; -D_80126664; -D_80126750; -D_801267D0; -D_801267D8; -D_801267E4; -D_801267E8; -D_801267EC; -D_801267F0; -D_80126804; -D_80126808; -D_8012680C; -D_80126810; -D_80126814; -D_80126818; -D_80126820; -D_80126824; -D_80126828; -D_80126830; -D_80126838; -D_8012683A; -D_8012683C; -D_80126840; -D_80126844; -D_80126848; -D_8012684C; -D_80126850; -D_80126854; -D_80126858; -D_8012685C; -D_80126860; -D_80126864; -D_80126868; -D_8012686C; -D_80126870; -D_80126874; -D_80126878; -D_801268D8; -D_801268DC; -D_801268E0; -D_801268E8; -D_80126918; -D_80126924; -D_80126928; -D_8012692C; -D_80126930; -p1_vehicle; -p2_vehicle; -D_801269C4; -D_801269C8; -D_801269CC; -D_801269D0; -D_801269DC; -D_801269E0; -D_801269E4; -D_801269E8; -D_801269EC; -D_801269F0; -D_801269F4; -D_801269F8; -D_801269FC; -D_80126A00; -D_80126A04; -D_80126A08; -D_80126A0C; -D_80126A10; -D_80126A14; -D_80126A18; -D_80126A1C; -D_80126A20; -D_80126A30; -D_80126A34; -D_80126A38; -D_80126A3C; -D_80126A40; -D_80126A60; -D_80126A64; -D_80126A68; -D_80126A6C; -D_80126A70; -D_80126A74; -D_80126A78; -D_80126A80; -D_80126A90; -D_80126A94; -D_80126A98; -D_80126AA0; -D_80126AE0; -D_80126B20; -D_80126B60; -D_80126B70; -D_80126BB0; -D_80126BB4; -D_80126BB8; -D_80126BBC; -D_80126BC0; -D_80126BC4; -D_80126BC8; -D_80126BCC; -D_80126BD0; -D_80126BD4; -D_80126BD8; -D_80126BDC; -D_80126BE0; -D_80126BE4; -D_80126BE8; -D_80126BEC; -D_80126BF0; -D_80126C10; -D_80126C14; -D_80126C18; -D_80126C1C; -D_80126C20; -D_80126C24; -D_80126C28; -D_80126C2C; -D_80126C30; -D_80126C34; -D_80126C38; -D_80126C3C; -D_80126C40; -D_80126C42; -D_80126C44; -D_80126C46; -D_80126C48; -D_80126C4C; -D_80126C50; -D_80126C54; -D_80126C57; -D_80126C58; -D_80126C6C; -D_80126C70; -D_80126C74; -D_80126C78; -D_80126C80; -D_80126CC0; - unknown_09F8F0 -D_80126CD0; -D_80126CD1; -D_80126CD2; -D_80126CD3; -D_80126CD4; -D_80126CD5; -D_80126CD8; -D_80126CDC; -D_80126CE0; -D_80126CEC; -D_80126CF0; -D_80126CF4; -D_80126CF8; -D_80126CFC; -D_80126D00; -D_80126D04; -D_80126D08; -D_80126D0C; -D_80126D10; -D_80126D14; -D_80126D18; -D_80126D1C; -D_80126D20; -D_80126D24; -D_80126D28; -D_80126D2C; -D_80126D30; -D_80126D34; -D_80126D35; -D_80126D36; -D_80126D37; -D_80126D38; -D_80126D3C; -D_80126D40; -D_80126D44; -D_80126D48; -D_80126D4C; -D_80126D50; -D_80126D54; -D_80126D55; -D_80126D56; -D_80126D58; -D_80126D5C; -D_80126D60; -D_80126D64; -D_80126D65; -D_80126D66; -D_80126D67; -D_80126D68; -D_80126D69; -D_80126D6C; -D_80126D70; -D_80126D71; -D_80126D74; -D_80126D78; -D_80126D7C; -D_80126D80; -D_80127180; -D_80127184; -D_80127188; -D_80127189; -D_8012718A; -D_8012718B; -D_8012718C; -D_80127190; -D_80127194; - - -unknown_078050 -D_801271B0; - - -unknown_09F8F0 -D_80127BB0; -D_80127BB4; -D_80127BB8; -D_80127BF8; -D_80127C00; -D_80127C04; -D_80127C08; -D_80127C0C; -D_80127C10; -D_80127C14; -D_80127C18; -D_80127C1C; -D_80127C20; -D_80127C24; -D_80127C28; -D_80127C2C; -D_80127C30; -D_80127C40; -D_80127C80; - unknown_0AEE70 -D_80127C88; -D_80127CA0; -D_80127CA4; -D_80127CA8; -D_80127CAC; -D_80127CAE; -D_80127CB0; -D_80127CB2; -D_80127CB4; -D_80127CB8; -D_80127CBC; -D_80127CC0; -D_80127CC4; -D_80127CC8; -D_80127CCC; -D_80127CD0; -D_80127CD2; -D_80127CD8; -D_801285D8; -D_801295E0; -D_80129790; -D_801297A8; -D_801297C8; -D_801297E8; -D_80129800; -D_80129824; -D_8012982C; -D_80129834; -D_8012983C; -D_80129844; -D_8012984C; -D_80129854; -D_8012985C; -D_80129864; -D_8012986C; -D_80129874; -D_8012987C; -D_80129884; -D_8012988C; -D_80129894; -D_8012989C; -D_801298A4; -D_801298AC; -D_801298B4; -D_801298BC; -D_801298C4; -D_801298CC; -D_801298D4; -D_801298DC; -D_801298E4; -D_801298EC; -D_801298F4; -D_801298FC; -D_80129904; -D_80129918; -D_8012991C; -D_80129920; -D_80129924; -D_801299B0; - unknown_0C4800 piThreadStack; diff --git a/src/unknown_07B870.c b/src/unknown_07B870.c index 622e08a5..373d6a28 100644 --- a/src/unknown_07B870.c +++ b/src/unknown_07B870.c @@ -511,7 +511,7 @@ s16 D_80126380; s16 D_80126382; s16 D_80126384; -/*******************************/ +/******************************/ GLOBAL_ASM("asm/non_matchings/unknown_07B870/func_8007AC70.s") diff --git a/src/unknown_09F8F0.c b/src/unknown_09F8F0.c index 6331d4d9..3a5d2654 100644 --- a/src/unknown_09F8F0.c +++ b/src/unknown_09F8F0.c @@ -369,21 +369,97 @@ s16 D_800E2C98[4] = { /************ .bss ************/ -extern u8 D_80126CD0; -extern u8 D_80126CD1; -extern u8 D_80126CD2; -extern u8 D_80126CD3; -extern u8 D_80126CD4; -extern unk80126CDC* D_80126CDC; -extern u8 D_80126D34; -extern s32 D_80126D40; -extern unk80126D60* D_80126D60; -extern s32 D_80126D74; -extern s32 D_80126D78; -extern u16 D_80126D7C; -extern u8 D_80127188; -extern u8 D_8012718B; -extern unk80127BF8 D_80127BF8; +u8 D_80126CD0; +u8 D_80126CD1; +u8 D_80126CD2; +u8 D_80126CD3; +u8 D_80126CD4; +u8 D_80126CD5; +s32 D_80126CD8; +unk80126CDC* D_80126CDC; +s32 D_80126CE0; +s32 D_80126CE4; +s32 D_80126CE8; +s32 D_80126CEC; +s32 D_80126CF0; +s32 D_80126CF4; +s32 D_80126CF8; +s32 D_80126CFC; +s32 D_80126D00; +s32 D_80126D04; +s32 D_80126D08; +s32 D_80126D0C; +s32 D_80126D10; +s32 D_80126D14; +s32 D_80126D18; +s32 D_80126D1C; +s32 D_80126D20; +s32 D_80126D24; +s32 D_80126D28; +s32 D_80126D2C; +s32 D_80126D30; +u8 D_80126D34; +u8 D_80126D35; +u8 D_80126D36; +u8 D_80126D37; +s32 D_80126D38; +s32 D_80126D3C; +s32 D_80126D40; +s32 D_80126D44; +s32 D_80126D48; +s32 D_80126D4C; +s32 D_80126D50; +u8 D_80126D54; +u8 D_80126D55; +u8 D_80126D56; +s32 D_80126D58; +s32 D_80126D5C; +unk80126D60* D_80126D60; +u8 D_80126D64; +u8 D_80126D65; +u8 D_80126D66; +u8 D_80126D67; +u8 D_80126D68; +u8 D_80126D69; +s32 D_80126D6C; +u8 D_80126D70; +u8 D_80126D71; +s32 D_80126D74; +s32 D_80126D78; +u16 D_80126D7C; +s32 D_80126D80; +s32 D_80126D84; +s32 D_80126D88[254]; +s32 D_80127180; +s32 D_80127184; +u8 D_80127188; +u8 D_80127189; +u8 D_8012718A; +u8 D_8012718B; +s32 D_8012718C; +s32 D_80127190; +s32 D_80127194; +s32 D_80127198[6]; +s32 D_801271B0[640]; +s32 D_80127BB0; +s32 D_80127BB4; +s32 D_80127BB8[16]; +unk80127BF8 D_80127BF8; +s32 D_80127BFC; +s32 D_80127C00; +s32 D_80127C04; +s32 D_80127C08; +s32 D_80127C0C; +s32 D_80127C10; +s32 D_80127C14; +s32 D_80127C18; +s32 D_80127C1C; +s32 D_80127C20; +s32 D_80127C24; +s32 D_80127C28; +s32 D_80127C2C; +s32 D_80127C30[4]; +s32 D_80127C40[16]; /******************************/ diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index 813ec141..a0417f2b 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -159,6 +159,107 @@ s32 D_800E2EEC = 0x100; /*******************************/ +/************ .bss ************/ + +s32 D_80127C80; +s32 D_80127C84; +s32 D_80127C88[6]; +s32 D_80127CA0; +s32 D_80127CA4; +s32 D_80127CA8; +s16 D_80127CAC; +s16 D_80127CAE; +s16 D_80127CB0; +s16 D_80127CB2; +s32 D_80127CB4; +s32 D_80127CB8; +s32 D_80127CBC; +s32 D_80127CC0; +s32 D_80127CC4; +s32 D_80127CC8; +s32 D_80127CCC; +s16 D_80127CD0; +s16 D_80127CD2; +s32 D_80127CD4; +s32 D_80127CD8[576]; +s32 D_801285D8[1026]; +s32 D_801295E0[108]; +s32 D_80129790[6]; +s32 D_801297A8[8]; +s32 D_801297C8[8]; +s32 D_801297E8[6]; +s32 D_80129800[9]; +s32 D_80129824; +s32 D_80129828; +s32 D_8012982C; +s32 D_80129830; +s32 D_80129834; +s32 D_80129838; +s32 D_8012983C; +s32 D_80129840; +s32 D_80129844; +s32 D_80129848; +s32 D_8012984C; +s32 D_80129850; +s32 D_80129854; +s32 D_80129858; +s32 D_8012985C; +s32 D_80129860; +s32 D_80129864; +s32 D_80129868; +s32 D_8012986C; +s32 D_80129870; +s32 D_80129874; +s32 D_80129878; +s32 D_8012987C; +s32 D_80129880; +s32 D_80129884; +s32 D_80129888; +s32 D_8012988C; +s32 D_80129890; +s32 D_80129894; +s32 D_80129898; +s32 D_8012989C; +s32 D_801298A0; +s32 D_801298A4; +s32 D_801298A8; +s32 D_801298AC; +s32 D_801298B0; +s32 D_801298B4; +s32 D_801298B8; +s32 D_801298BC; +s32 D_801298C0; +s32 D_801298C4; +s32 D_801298C8; +s32 D_801298CC; +s32 D_801298D0; +s32 D_801298D4; +s32 D_801298D8; +s32 D_801298DC; +s32 D_801298E0; +s32 D_801298E4; +s32 D_801298E8; +s32 D_801298EC; +s32 D_801298F0; +s32 D_801298F4; +s32 D_801298F8; +s32 D_801298FC; +s32 D_80129900; +s32 D_80129904; +s32 D_80129908; +s32 D_8012990C; +s32 D_80129910; +s32 D_80129914; +s32 D_80129918; +s32 D_8012991C; +s32 D_80129920; +s32 D_80129924; +s32 D_80129928[34]; +s32 D_801299B0; + + +/******************************/ + void func_800AE2D8(void); void func_800AE374(void); void func_800AE438(void); diff --git a/undefined_syms.txt b/undefined_syms.txt index 1219c778..1fdfd62a 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,362 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -/D_80126390 = 0x80126390; -/D_80126394 = 0x80126394; -/D_80126398 = 0x80126398; -/D_8012639C = 0x8012639C; -/D_801263A0 = 0x801263A0; -/D_801263A4 = 0x801263A4; -/D_801263A8 = 0x801263A8; -/D_801263AC = 0x801263AC; -/D_801263B0 = 0x801263B0; -/D_801263B4 = 0x801263B4; -/D_801263B8 = 0x801263B8; -/D_801263BC = 0x801263BC; -/D_801263C0 = 0x801263C0; -/D_801263C4 = 0x801263C4; -/D_801263C8 = 0x801263C8; -/D_801263CC = 0x801263CC; -/D_801263D0 = 0x801263D0; -/D_801263D4 = 0x801263D4; -/D_801263D8 = 0x801263D8; -/D_801263DC = 0x801263DC; -/D_801263E0 = 0x801263E0; -/players_character_array = 0x801263E8; -/D_801263F0 = 0x801263F0; -/D_801263F8 = 0x801263F8; -/D_80126418 = 0x80126418; -/D_80126420 = 0x80126420; -/D_80126428 = 0x80126428; -/D_80126430 = 0x80126430; -/D_80126431 = 0x80126431; -/D_80126438 = 0x80126438; -/D_80126448 = 0x80126448; -/D_80126450 = 0x80126450; -/D_80126454 = 0x80126454; -/D_80126458 = 0x80126458; -/D_8012645C = 0x8012645C; -/D_80126460 = 0x80126460; -/D_80126464 = 0x80126464; -/D_80126468 = 0x80126468; -/D_8012646C = 0x8012646C; -/D_80126470 = 0x80126470; -/D_80126474 = 0x80126474; -/D_80126478 = 0x80126478; -/D_8012647C = 0x8012647C; -/D_80126480 = 0x80126480; -/D_80126484 = 0x80126484; -/D_80126488 = 0x80126488; -/D_8012648C = 0x8012648C; -/D_80126490 = 0x80126490; -/D_80126494 = 0x80126494; -/D_80126498 = 0x80126498; - -/D_801264A0 = 0x801264A0; -/D_801264D0 = 0x801264D0; -/D_801264D4 = 0x801264D4; -/D_801264D8 = 0x801264D8; -/D_801264DC = 0x801264DC; -/D_801264E2 = 0x801264E2; -/D_801264E4 = 0x801264E4; -/D_801264EC = 0x801264EC; -/D_801264F8 = 0x801264F8; - -/D_80126504 = 0x80126504; -/D_80126508 = 0x80126508; -/D_8012650E = 0x8012650E; -/D_80126510 = 0x80126510; -/D_80126516 = 0x80126516; -/D_80126518 = 0x80126518; -/D_80126520 = 0x80126520; - -/D_80126530 = 0x80126530; -/D_80126540 = 0x80126540; -/D_80126541 = 0x80126541; -/D_80126548 = 0x80126548; -/D_80126550 = 0x80126550; -/D_8012665C = 0x8012665C; -/D_80126660 = 0x80126660; -/D_80126664 = 0x80126664; -/D_80126750 = 0x80126750; -/D_801267D0 = 0x801267D0; -/D_801267D8 = 0x801267D8; -/D_801267E4 = 0x801267E4; -/D_801267E8 = 0x801267E8; -/D_801267EC = 0x801267EC; -/D_801267F0 = 0x801267F0; -/D_80126804 = 0x80126804; -/D_80126808 = 0x80126808; -/D_8012680C = 0x8012680C; -/D_80126810 = 0x80126810; -/D_80126814 = 0x80126814; -/D_80126818 = 0x80126818; -/D_80126820 = 0x80126820; -/D_80126824 = 0x80126824; -/D_80126828 = 0x80126828; -/D_80126830 = 0x80126830; -/D_80126838 = 0x80126838; -/D_8012683A = 0x8012683A; -/D_8012683C = 0x8012683C; -/D_80126840 = 0x80126840; -/D_80126844 = 0x80126844; -/D_80126848 = 0x80126848; -/D_8012684C = 0x8012684C; -/D_80126850 = 0x80126850; -/D_80126854 = 0x80126854; -/D_80126858 = 0x80126858; -/D_8012685C = 0x8012685C; -/D_80126860 = 0x80126860; -/D_80126864 = 0x80126864; -/D_80126868 = 0x80126868; -/D_8012686C = 0x8012686C; -/D_80126870 = 0x80126870; -/D_80126874 = 0x80126874; -/D_80126878 = 0x80126878; -/D_801268D8 = 0x801268D8; -/D_801268DC = 0x801268DC; -/D_801268E0 = 0x801268E0; -/D_801268E8 = 0x801268E8; -/D_80126918 = 0x80126918; -/D_80126924 = 0x80126924; -/D_80126928 = 0x80126928; -/D_8012692C = 0x8012692C; -/D_80126930 = 0x80126930; -/gPlayerVehicle = 0x801269C0; -/D_801269C4 = 0x801269C4; -/D_801269C8 = 0x801269C8; -/D_801269CC = 0x801269CC; -/D_801269D0 = 0x801269D0; -/D_801269DC = 0x801269DC; -/D_801269E0 = 0x801269E0; -/D_801269E4 = 0x801269E4; -/D_801269E8 = 0x801269E8; -/D_801269EC = 0x801269EC; -/D_801269F0 = 0x801269F0; -/D_801269F4 = 0x801269F4; -/D_801269F8 = 0x801269F8; -/D_801269FC = 0x801269FC; -/D_80126A00 = 0x80126A00; -/D_80126A04 = 0x80126A04; -/D_80126A08 = 0x80126A08; -/D_80126A0C = 0x80126A0C; -/D_80126A10 = 0x80126A10; -/D_80126A14 = 0x80126A14; -/D_80126A18 = 0x80126A18; -/D_80126A1C = 0x80126A1C; -/D_80126A20 = 0x80126A20; -/D_80126A30 = 0x80126A30; -/D_80126A34 = 0x80126A34; -/D_80126A38 = 0x80126A38; -/D_80126A3C = 0x80126A3C; -/D_80126A40 = 0x80126A40; -/D_80126A60 = 0x80126A60; -/D_80126A64 = 0x80126A64; -/D_80126A68 = 0x80126A68; -/D_80126A6C = 0x80126A6C; -/D_80126A70 = 0x80126A70; -/D_80126A74 = 0x80126A74; -/D_80126A78 = 0x80126A78; -/D_80126A80 = 0x80126A80; -/D_80126A90 = 0x80126A90; -/D_80126A94 = 0x80126A94; -/D_80126A98 = 0x80126A98; -/D_80126AA0 = 0x80126AA0; -/D_80126AE0 = 0x80126AE0; -/D_80126B20 = 0x80126B20; -/D_80126B60 = 0x80126B60; -/D_80126B70 = 0x80126B70; -/D_80126BB0 = 0x80126BB0; -/D_80126BB4 = 0x80126BB4; -/D_80126BB8 = 0x80126BB8; -/D_80126BBC = 0x80126BBC; -/D_80126BC0 = 0x80126BC0; -/D_80126BC4 = 0x80126BC4; -/D_80126BC8 = 0x80126BC8; -/D_80126BCC = 0x80126BCC; -/D_80126BD0 = 0x80126BD0; -/D_80126BD4 = 0x80126BD4; -/D_80126BD8 = 0x80126BD8; -/D_80126BDC = 0x80126BDC; -/D_80126BE0 = 0x80126BE0; -/D_80126BE4 = 0x80126BE4; -/D_80126BE8 = 0x80126BE8; -/D_80126BEC = 0x80126BEC; -/D_80126BF0 = 0x80126BF0; -/D_80126C10 = 0x80126C10; -/D_80126C14 = 0x80126C14; -/D_80126C18 = 0x80126C18; -/D_80126C1C = 0x80126C1C; -/D_80126C20 = 0x80126C20; -/D_80126C24 = 0x80126C24; -/D_80126C28 = 0x80126C28; -/D_80126C2C = 0x80126C2C; -/D_80126C30 = 0x80126C30; -/D_80126C34 = 0x80126C34; -/D_80126C38 = 0x80126C38; -/D_80126C3C = 0x80126C3C; -/D_80126C40 = 0x80126C40; -/D_80126C42 = 0x80126C42; -/D_80126C44 = 0x80126C44; -/D_80126C46 = 0x80126C46; -/D_80126C48 = 0x80126C48; -/D_80126C4C = 0x80126C4C; -/D_80126C50 = 0x80126C50; -/D_80126C54 = 0x80126C54; -/D_80126C57 = 0x80126C57; -/D_80126C58 = 0x80126C58; -/D_80126C6C = 0x80126C6C; -/D_80126C70 = 0x80126C70; -/D_80126C74 = 0x80126C74; -/D_80126C78 = 0x80126C78; -/D_80126C80 = 0x80126C80; -/D_80126CC0 = 0x80126CC0; - -D_80126CD0 = 0x80126CD0; -D_80126CD1 = 0x80126CD1; -D_80126CD2 = 0x80126CD2; -D_80126CD3 = 0x80126CD3; -D_80126CD4 = 0x80126CD4; -D_80126CD5 = 0x80126CD5; -D_80126CD8 = 0x80126CD8; -D_80126CDC = 0x80126CDC; -D_80126CE0 = 0x80126CE0; -D_80126CEC = 0x80126CEC; -D_80126CF0 = 0x80126CF0; -D_80126CF4 = 0x80126CF4; -D_80126CF8 = 0x80126CF8; -D_80126CFC = 0x80126CFC; -D_80126D00 = 0x80126D00; -D_80126D04 = 0x80126D04; -D_80126D08 = 0x80126D08; -D_80126D0C = 0x80126D0C; -D_80126D10 = 0x80126D10; -D_80126D14 = 0x80126D14; -D_80126D18 = 0x80126D18; -D_80126D1C = 0x80126D1C; -D_80126D20 = 0x80126D20; -D_80126D24 = 0x80126D24; -D_80126D28 = 0x80126D28; -D_80126D2C = 0x80126D2C; -D_80126D30 = 0x80126D30; -D_80126D34 = 0x80126D34; -D_80126D35 = 0x80126D35; -D_80126D36 = 0x80126D36; -D_80126D37 = 0x80126D37; -D_80126D38 = 0x80126D38; -D_80126D3C = 0x80126D3C; -D_80126D40 = 0x80126D40; -D_80126D44 = 0x80126D44; -D_80126D48 = 0x80126D48; -D_80126D4C = 0x80126D4C; -D_80126D50 = 0x80126D50; -D_80126D54 = 0x80126D54; -D_80126D55 = 0x80126D55; -D_80126D56 = 0x80126D56; -D_80126D58 = 0x80126D58; -D_80126D5C = 0x80126D5C; -D_80126D60 = 0x80126D60; -D_80126D64 = 0x80126D64; -D_80126D65 = 0x80126D65; -D_80126D66 = 0x80126D66; -D_80126D67 = 0x80126D67; -D_80126D68 = 0x80126D68; -D_80126D69 = 0x80126D69; -D_80126D6C = 0x80126D6C; -D_80126D70 = 0x80126D70; -D_80126D71 = 0x80126D71; -D_80126D74 = 0x80126D74; -D_80126D78 = 0x80126D78; -D_80126D7C = 0x80126D7C; -D_80126D80 = 0x80126D80; -D_80127180 = 0x80127180; -D_80127184 = 0x80127184; -D_80127188 = 0x80127188; -D_80127189 = 0x80127189; -D_8012718A = 0x8012718A; -D_8012718B = 0x8012718B; -D_8012718C = 0x8012718C; -D_80127190 = 0x80127190; -D_80127194 = 0x80127194; -D_801271B0 = 0x801271B0; -D_80127BB0 = 0x80127BB0; -D_80127BB4 = 0x80127BB4; -D_80127BB8 = 0x80127BB8; -D_80127BF8 = 0x80127BF8; -D_80127C00 = 0x80127C00; -D_80127C04 = 0x80127C04; -D_80127C08 = 0x80127C08; -D_80127C0C = 0x80127C0C; -D_80127C10 = 0x80127C10; -D_80127C14 = 0x80127C14; -D_80127C18 = 0x80127C18; -D_80127C1C = 0x80127C1C; -D_80127C20 = 0x80127C20; -D_80127C24 = 0x80127C24; -D_80127C28 = 0x80127C28; -D_80127C2C = 0x80127C2C; -D_80127C30 = 0x80127C30; -D_80127C40 = 0x80127C40; -D_80127C80 = 0x80127C80; -D_80127C88 = 0x80127C88; -D_80127CA0 = 0x80127CA0; -D_80127CA4 = 0x80127CA4; -D_80127CA8 = 0x80127CA8; -D_80127CAC = 0x80127CAC; -D_80127CAE = 0x80127CAE; -D_80127CB0 = 0x80127CB0; -D_80127CB2 = 0x80127CB2; -D_80127CB4 = 0x80127CB4; -D_80127CB8 = 0x80127CB8; -D_80127CBC = 0x80127CBC; -D_80127CC0 = 0x80127CC0; -D_80127CC4 = 0x80127CC4; -D_80127CC8 = 0x80127CC8; -D_80127CCC = 0x80127CCC; -D_80127CD0 = 0x80127CD0; -D_80127CD2 = 0x80127CD2; -D_80127CD8 = 0x80127CD8; -D_801285D8 = 0x801285D8; -D_801295E0 = 0x801295E0; -D_80129790 = 0x80129790; -D_801297A8 = 0x801297A8; -D_801297C8 = 0x801297C8; -D_801297E8 = 0x801297E8; -D_80129800 = 0x80129800; -D_80129824 = 0x80129824; -D_8012982C = 0x8012982C; -D_80129834 = 0x80129834; -D_8012983C = 0x8012983C; -D_80129844 = 0x80129844; -D_8012984C = 0x8012984C; -D_80129854 = 0x80129854; -D_8012985C = 0x8012985C; -D_80129864 = 0x80129864; -D_8012986C = 0x8012986C; -D_80129874 = 0x80129874; -D_8012987C = 0x8012987C; -D_80129884 = 0x80129884; -D_8012988C = 0x8012988C; -D_80129894 = 0x80129894; -D_8012989C = 0x8012989C; -D_801298A4 = 0x801298A4; -D_801298AC = 0x801298AC; -D_801298B4 = 0x801298B4; -D_801298BC = 0x801298BC; -D_801298C4 = 0x801298C4; -D_801298CC = 0x801298CC; -D_801298D4 = 0x801298D4; -D_801298DC = 0x801298DC; -D_801298E4 = 0x801298E4; -D_801298EC = 0x801298EC; -D_801298F4 = 0x801298F4; -D_801298FC = 0x801298FC; -D_80129904 = 0x80129904; -D_80129918 = 0x80129918; -D_8012991C = 0x8012991C; -D_80129920 = 0x80129920; -D_80129924 = 0x80129924; -D_801299B0 = 0x801299B0; piThreadStack = 0x80129AB0; D_80129BB0 = 0x80129BB0; D_80129FB0 = 0x80129FB0; From 67a289e51fea2125590d22748dbf39068caf5e75 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 9 Jun 2021 20:12:46 -0500 Subject: [PATCH 37/39] Added bss for unknown_0C4800 & unknown_0C7F50 --- bss.txt | 122 ---------------------------------- src/unknown_0AEE70.c | 2 +- src/unknown_0C4800.c | 155 ++++++++++++++++++++++++++++++++++++++----- src/unknown_0C7F50.c | 8 ++- undefined_syms.txt | 121 +-------------------------------- 5 files changed, 146 insertions(+), 262 deletions(-) diff --git a/bss.txt b/bss.txt index a7c9b8f0..131d7195 100644 --- a/bss.txt +++ b/bss.txt @@ -49,128 +49,6 @@ unknown_09F8F0 unknown_0AEE70 unknown_0C4800 -piThreadStack; -D_80129BB0; -D_80129FB0; -D_80129FBC; - - -unknown_0B8920 -D_80129FC0; -D_80129FC4; -D_80129FC8; -D_80129FCC; -D_80129FE8; -D_80129FF0; -D_8012A008; -D_8012A00C; -D_8012A018; -D_8012A01C; -D_8012A020; -D_8012A028; -D_8012A078; -D_8012A07C; -D_8012A080; -D_8012A084; -D_8012A088; -D_8012A08C; -D_8012A090; -D_8012A094; -D_8012A098; -D_8012A09C; -D_8012A0A0; -D_8012A0A4; -D_8012A0A8; -D_8012A0AC; -D_8012A0B0; -D_8012A0B4; -D_8012A0B8; -D_8012A0BC; -D_8012A0C0; -D_8012A0C4; -D_8012A0C8; -D_8012A0CC; -D_8012A0D0; -D_8012A0D4; -D_8012A0D8; -D_8012A0DC; -D_8012A0E0; -D_8012A0E8; -D_8012A1E8; -D_8012A5E8; -D_8012A5F4; -D_8012A600; -D_8012A720; -D_8012A724; -D_8012A728; -D_8012A730; -D_8012A734; -D_8012A735; -D_8012A736; -D_8012A737; -D_8012A738; -D_8012A73C; -D_8012A740; -D_8012A744; -D_8012A748; -D_8012A74C; -D_8012A750; -D_8012A754; -D_8012A758; -D_8012A75C; -D_8012A760; -D_8012A764; -D_8012A768; -D_8012A76C; -D_8012A770; -D_8012A774; -D_8012A778; -D_8012A77C; -D_8012A780; -D_8012A784; -D_8012A785; -D_8012A786; -D_8012A787; -D_8012A788; -D_8012A789; -D_8012A78A; -D_8012A78C; -D_8012A78E; -D_8012A790; -D_8012A798; -D_8012A7A0; -D_8012A7A4; -D_8012A7A8; -D_8012A7AA; -D_8012A7AC; -D_8012A7AE; -D_8012A7B0; -D_8012A7B2; -D_8012A7B4; -D_8012A7B6; -D_8012A7B8; -D_8012A7BA; -D_8012A7C0; -D_8012A7C8; -D_8012A7D0; -D_8012A7D4; -D_8012A7E0; -D_8012A7E4; -D_8012A7E8; -D_8012A7EC; -D_8012A7F0; -D_8012A7F4; - - -unknown_0C4800 -piThread; -piEventQueue; -piEventBuf; -gzip_bit_buffer; -gzip_num_bits; -D_8012AAD8; -D_8012AAE0; - unknown_0C7F50 D_8012AAF0; diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index a0417f2b..8f9cf5d6 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -255,7 +255,7 @@ s32 D_8012991C; s32 D_80129920; s32 D_80129924; s32 D_80129928[34]; -s32 D_801299B0; +s32 D_801299B0[64]; /******************************/ diff --git a/src/unknown_0C4800.c b/src/unknown_0C4800.c index 4cf1898a..fc62a4a7 100644 --- a/src/unknown_0C4800.c +++ b/src/unknown_0C4800.c @@ -5,17 +5,6 @@ #include "macros.h" #include "libultra_internal.h" -#define OS_PIM_STACKSIZE 4096 - -extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled -extern OSDevMgr __osPiDevMgr; -extern u8 piThreadStack[OS_PIM_STACKSIZE];//piThreadStack -extern OSThread piThread; //piThread -extern OSMesgQueue piEventQueue; //piEventQueue -extern OSMesg piEventBuf[1]; //piEventBuf -extern OSMesgQueue piAccessQueue; //piAccessQueue -void __osDevMgrMain(void); - /************ .data ************/ // Fast3D (F3DDKR) display list @@ -57,7 +46,124 @@ u8* gzip_inflate_output = NULL; /*******************************/ -extern s32 D_8012A7E0; +/************ .bss ************/ + +#define OS_PIM_STACKSIZE 4096 +u8 piThreadStack[256];//piThreadStack[OS_PIM_STACKSIZE]; + +s32 D_80129BB0[256]; +s32 D_80129FB0[3]; +s32 D_80129FBC; +s32 D_80129FC0; +s32 D_80129FC4; +s32 D_80129FC8; +s32 D_80129FCC; +s32 D_80129FD0[4]; +s32 D_80129FE0[2]; +s32 D_80129FE8; +s32 D_80129FF0[6]; +s32 D_8012A008; +s32 D_8012A00C; +s32 D_8012A010; +s32 D_8012A014; +s32 D_8012A018; +s32 D_8012A01C; +s32 D_8012A020[2]; +s32 D_8012A028[20]; +s32 D_8012A078; +s32 D_8012A07C; +s32 D_8012A080; +s32 D_8012A084; +s32 D_8012A088; +s32 D_8012A08C; +s32 D_8012A090; +s32 D_8012A094; +s32 D_8012A098; +s32 D_8012A09C; +s32 D_8012A0A0; +s32 D_8012A0A4; +s32 D_8012A0A8; +s32 D_8012A0AC; +s32 D_8012A0B0; +s32 D_8012A0B4; +s32 D_8012A0B8; +s32 D_8012A0BC; +s32 D_8012A0C0; +s32 D_8012A0C4; +s32 D_8012A0C8; +s32 D_8012A0CC; +s32 D_8012A0D0; +s32 D_8012A0D4; +s32 D_8012A0D8; +s32 D_8012A0DC; +s32 D_8012A0E0; +s32 D_8012A0E8[64]; +s32 D_8012A1E8[256]; +s32 D_8012A5E8[3]; +s32 D_8012A5F4; +s32 D_8012A5F8; +s32 D_8012A5FC; +s32 D_8012A600[72]; +s32 D_8012A720; +s32 D_8012A724; +s32 D_8012A728[2]; +s32 D_8012A730; +s8 D_8012A734; +s8 D_8012A735; +s8 D_8012A736; +s8 D_8012A737; +s32 D_8012A738; +s32 D_8012A73C; +s32 D_8012A740; +s32 D_8012A744; +s32 D_8012A748; +s32 D_8012A74C; +s32 D_8012A750; +s32 D_8012A754; +s32 D_8012A758; +s32 D_8012A75C; +s32 D_8012A760; +s32 D_8012A764; +s32 D_8012A768; +s32 D_8012A76C; +s32 D_8012A770; +s32 D_8012A774; +s32 D_8012A778; +s32 D_8012A77C; +s32 D_8012A780; +s8 D_8012A784; +s8 D_8012A785; +s8 D_8012A786; +s8 D_8012A787; +s8 D_8012A788; +s8 D_8012A789; +s8 D_8012A78A; +s16 D_8012A78C; +s16 D_8012A78E; +s32 D_8012A790[2]; +s32 D_8012A798; +s32 D_8012A79C; +s32 D_8012A7A0; +s32 D_8012A7A4; +s16 D_8012A7A8; +s16 D_8012A7AA; +s16 D_8012A7AC; +s16 D_8012A7AE; +s16 D_8012A7B0; +s16 D_8012A7B2; +s16 D_8012A7B4; +s16 D_8012A7B6; +s16 D_8012A7B8; +s16 D_8012A7BA; +s32 D_8012A7C0[2]; +s32 D_8012A7C8; +s32 D_8012A7CC; +s32 D_8012A7D0; +s32 D_8012A7D4; +s32 D_8012A7D8; +s32 D_8012A7DC; +s32 D_8012A7E0; +s32 D_8012A7E4; /* Size: 0x28 bytes */ typedef struct unk8012A7E8_24 { @@ -97,13 +203,26 @@ typedef struct unk8012A7E8 { unk8012A7E8_24 *unk24; } unk8012A7E8; -extern unk8012A7E8 (*D_8012A7E8)[1]; -extern s32 D_8012A7F0; -extern s8 D_8012A7F4; -extern s32 D_8012AAD8; -extern u32 gzip_num_bits; -extern u32 gzip_bit_buffer; +unk8012A7E8 (*D_8012A7E8)[1]; +s32 D_8012A7EC; +s32 D_8012A7F0; +s8 D_8012A7F4; +s32 D_8012A7F8; +s32 D_8012A7FC; +OSThread piThread; //piThread +s32 D_8012A9B0[64]; +OSMesgQueue piEventQueue; //piEventQueue +OSMesg piEventBuf[2]; //piEventBuf +u32 gzip_bit_buffer; +u32 gzip_num_bits; +s32 D_8012AAD8; +/******************************/ + +extern OSMesgQueue piAccessQueue; //piAccessQueue +extern u32 __osPiAccessQueueEnabled; //__osPiAccessQueueEnabled +extern OSDevMgr __osPiDevMgr; +void __osDevMgrMain(void); #if 1 GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C3C00.s") diff --git a/src/unknown_0C7F50.c b/src/unknown_0C7F50.c index d0adc4bc..abd22408 100644 --- a/src/unknown_0C7F50.c +++ b/src/unknown_0C7F50.c @@ -16,9 +16,11 @@ s32 D_800E377C = 0; /************ .bss ************/ -extern OSMesgQueue D_8012ACA0; -extern OSMesg D_8012ACB8; -extern OSThread D_8012AAF0; +s32 D_8012AAE0[4]; +OSThread D_8012AAF0; +OSMesgQueue D_8012ACA0; +OSMesg D_8012ACB8; + extern void *D_8012CCC0; /*****************************/ diff --git a/undefined_syms.txt b/undefined_syms.txt index 1fdfd62a..27b204b3 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,126 +25,11 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -piThreadStack = 0x80129AB0; -D_80129BB0 = 0x80129BB0; -D_80129FB0 = 0x80129FB0; -D_80129FBC = 0x80129FBC; -D_80129FC0 = 0x80129FC0; -D_80129FC4 = 0x80129FC4; -D_80129FC8 = 0x80129FC8; -D_80129FCC = 0x80129FCC; -D_80129FE8 = 0x80129FE8; -D_80129FF0 = 0x80129FF0; -D_8012A008 = 0x8012A008; -D_8012A00C = 0x8012A00C; -D_8012A018 = 0x8012A018; -D_8012A01C = 0x8012A01C; -D_8012A020 = 0x8012A020; -D_8012A028 = 0x8012A028; -D_8012A078 = 0x8012A078; -D_8012A07C = 0x8012A07C; -D_8012A080 = 0x8012A080; -D_8012A084 = 0x8012A084; -D_8012A088 = 0x8012A088; -D_8012A08C = 0x8012A08C; -D_8012A090 = 0x8012A090; -D_8012A094 = 0x8012A094; -D_8012A098 = 0x8012A098; -D_8012A09C = 0x8012A09C; -D_8012A0A0 = 0x8012A0A0; -D_8012A0A4 = 0x8012A0A4; -D_8012A0A8 = 0x8012A0A8; -D_8012A0AC = 0x8012A0AC; -D_8012A0B0 = 0x8012A0B0; -D_8012A0B4 = 0x8012A0B4; -D_8012A0B8 = 0x8012A0B8; -D_8012A0BC = 0x8012A0BC; -D_8012A0C0 = 0x8012A0C0; -D_8012A0C4 = 0x8012A0C4; -D_8012A0C8 = 0x8012A0C8; -D_8012A0CC = 0x8012A0CC; -D_8012A0D0 = 0x8012A0D0; -D_8012A0D4 = 0x8012A0D4; -D_8012A0D8 = 0x8012A0D8; -D_8012A0DC = 0x8012A0DC; -D_8012A0E0 = 0x8012A0E0; -D_8012A0E8 = 0x8012A0E8; -D_8012A1E8 = 0x8012A1E8; -D_8012A5E8 = 0x8012A5E8; -D_8012A5F4 = 0x8012A5F4; -D_8012A600 = 0x8012A600; -D_8012A720 = 0x8012A720; -D_8012A724 = 0x8012A724; -D_8012A728 = 0x8012A728; -D_8012A730 = 0x8012A730; -D_8012A734 = 0x8012A734; -D_8012A735 = 0x8012A735; -D_8012A736 = 0x8012A736; -D_8012A737 = 0x8012A737; -D_8012A738 = 0x8012A738; -D_8012A73C = 0x8012A73C; -D_8012A740 = 0x8012A740; -D_8012A744 = 0x8012A744; -D_8012A748 = 0x8012A748; -D_8012A74C = 0x8012A74C; -D_8012A750 = 0x8012A750; -D_8012A754 = 0x8012A754; -D_8012A758 = 0x8012A758; -D_8012A75C = 0x8012A75C; -D_8012A760 = 0x8012A760; -D_8012A764 = 0x8012A764; -D_8012A768 = 0x8012A768; -D_8012A76C = 0x8012A76C; -D_8012A770 = 0x8012A770; -D_8012A774 = 0x8012A774; -D_8012A778 = 0x8012A778; -D_8012A77C = 0x8012A77C; -D_8012A780 = 0x8012A780; -D_8012A784 = 0x8012A784; -D_8012A785 = 0x8012A785; -D_8012A786 = 0x8012A786; -D_8012A787 = 0x8012A787; -D_8012A788 = 0x8012A788; -D_8012A789 = 0x8012A789; -D_8012A78A = 0x8012A78A; -D_8012A78C = 0x8012A78C; -D_8012A78E = 0x8012A78E; -D_8012A790 = 0x8012A790; -D_8012A798 = 0x8012A798; -D_8012A7A0 = 0x8012A7A0; -D_8012A7A4 = 0x8012A7A4; -D_8012A7A8 = 0x8012A7A8; -D_8012A7AA = 0x8012A7AA; -D_8012A7AC = 0x8012A7AC; -D_8012A7AE = 0x8012A7AE; -D_8012A7B0 = 0x8012A7B0; -D_8012A7B2 = 0x8012A7B2; -D_8012A7B4 = 0x8012A7B4; -D_8012A7B6 = 0x8012A7B6; -D_8012A7B8 = 0x8012A7B8; -D_8012A7BA = 0x8012A7BA; -D_8012A7C0 = 0x8012A7C0; -D_8012A7C8 = 0x8012A7C8; -D_8012A7D0 = 0x8012A7D0; -D_8012A7D4 = 0x8012A7D4; -D_8012A7E0 = 0x8012A7E0; -D_8012A7E4 = 0x8012A7E4; -D_8012A7E8 = 0x8012A7E8; -D_8012A7EC = 0x8012A7EC; -D_8012A7F0 = 0x8012A7F0; -D_8012A7F4 = 0x8012A7F4; -piThread = 0x8012A800; -piEventQueue = 0x8012AAB0; -piEventBuf = 0x8012AAC8; -gzip_bit_buffer = 0x8012AAD0; -gzip_num_bits = 0x8012AAD4; -D_8012AAD8 = 0x8012AAD8; -D_8012AAE0 = 0x8012AAE0; -D_8012AAF0 = 0x8012AAF0; -D_8012ACA0 = 0x8012ACA0; -D_8012ACB8 = 0x8012ACB8; + viThreadStack = 0x8012C130; + D_8012CCC0 = 0x8012CCC0; + __osEventStateTab = 0x8012CCD0; D_8012CD50 = 0x8012CD50; D_8012CD8C = 0x8012CD8C; From 4da2c7dfa2c8f250829f7605309d9cfb97940c50 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 10 Jun 2021 00:39:47 -0500 Subject: [PATCH 38/39] Finished BSS sections (for now) and cleaning undefined_syms.txt --- .../unknown_005740/func_80004B40.s | 4 +- .../unknown_05F690/func_80060EA8.s | 4 +- .../unknown_072E50/func_80076C58.s | 12 +- .../unknown_080500/func_80080580.s | 12 +- .../unknown_080500/func_80080BC8.s | 12 +- .../unknown_080500/func_80080E90.s | 6 +- .../unknown_080500/func_80081C04.s | 4 +- .../unknown_080500/func_8008AD44.s | 8 +- .../unknown_0B8920/func_800B82B4.s | 4 +- .../unknown_0B8920/func_800C1130.s | 4 +- .../unknown_0B8920/func_800C3C00.s | 4 +- .../unknown_0B8920/func_800C45A4.s | 11 +- .../unknown_0B8920/func_800C5B58.s | 6 +- asm/unknown_031D30/func_80031130.s | 4 +- asm/unknown_031D30/func_80031600.s | 8 +- bss.txt | 108 ------------------ .../non_matchings/osViMgr_0D2590/viMgrMain.s | 4 +- .../unknown_0CA9A0/alResamplePull.s | 4 +- .../unknown_0CCF90/osInitialize.s | 32 +++--- .../unknown_0D23F0/osInvalDCache.s | 4 +- .../unknown_0D24A0/osWritebackDCacheAll.s | 4 +- lib/asm/osInvalICache.s | 4 +- lib/asm/osWritebackDCache.s | 4 +- lib/src/osSetEventMesg.c | 2 +- lib/src/osViMgr.c | 7 +- lib/src/unknown_0C9A20.c | 2 +- lib/src/unknown_0CD820.c | 18 +++ lib/src/unknown_0CE200.c | 25 ++++ src/unknown_0C7F50.c | 1 + tools/python/generate_ld.py | 13 ++- undefined_syms.txt | 61 ---------- 31 files changed, 149 insertions(+), 247 deletions(-) delete mode 100644 bss.txt diff --git a/asm/non_matchings/unknown_005740/func_80004B40.s b/asm/non_matchings/unknown_005740/func_80004B40.s index 7ab0bf38..f7ab0305 100644 --- a/asm/non_matchings/unknown_005740/func_80004B40.s +++ b/asm/non_matchings/unknown_005740/func_80004B40.s @@ -45,7 +45,7 @@ glabel func_80004B40 /* 0057CC 80004BCC AFA2003C */ sw $v0, 0x3c($sp) /* 0057D0 80004BD0 0019C880 */ sll $t9, $t9, 2 /* 0057D4 80004BD4 8C4F001C */ lw $t7, 0x1c($v0) -/* 0057D8 80004BD8 3C1200FF */ lui $s2, %hi(D_00FF0018) # $s2, 0xff +/* 0057D8 80004BD8 3C1200FF */ lui $s2, %hi(0x00FF0018) # $s2, 0xff /* 0057DC 80004BDC 0338C823 */ subu $t9, $t9, $t8 /* 0057E0 80004BE0 3652FFFF */ ori $s2, (0x00FFFFFF & 0xFFFF) # ori $s2, $s2, 0xffff /* 0057E4 80004BE4 0019C880 */ sll $t9, $t9, 2 @@ -163,7 +163,7 @@ glabel func_80004B40 /* 00599C 80004D9C A12F0004 */ sb $t7, 4($t1) /* 0059A0 80004DA0 96790018 */ lhu $t9, 0x18($s3) /* 0059A4 80004DA4 25850002 */ addiu $a1, $t4, 2 -/* 0059A8 80004DA8 A6590018 */ sh $t9, %lo(D_00FF0018)($s2) +/* 0059A8 80004DA8 A6590018 */ sh $t9, %lo(0x00FF0018)($s2) /* 0059AC 80004DAC 914E000E */ lbu $t6, 0xe($t2) /* 0059B0 80004DB0 25A40001 */ addiu $a0, $t5, 1 /* 0059B4 80004DB4 A12E000E */ sb $t6, 0xe($t1) diff --git a/asm/non_matchings/unknown_05F690/func_80060EA8.s b/asm/non_matchings/unknown_05F690/func_80060EA8.s index 3f9b6b0a..951c8721 100644 --- a/asm/non_matchings/unknown_05F690/func_80060EA8.s +++ b/asm/non_matchings/unknown_05F690/func_80060EA8.s @@ -241,7 +241,7 @@ glabel func_80060EA8 /* 061E34 80061234 4480A000 */ mtc1 $zero, $f20 /* 061E38 80061238 87040024 */ lh $a0, 0x24($t8) /* 061E3C 8006123C AFBF00A4 */ sw $ra, 0xa4($sp) -/* 061E40 80061240 3C05FF7F */ lui $a1, %hi(D_FF7F0001) # $a1, 0xff7f +/* 061E40 80061240 3C05FF7F */ lui $a1, %hi(0xFF7F0001) # $a1, 0xff7f /* 061E44 80061244 0004C840 */ sll $t9, $a0, 1 /* 061E48 80061248 2412000A */ li $s2, 10 /* 061E4C 8006124C 03202025 */ move $a0, $t9 @@ -361,7 +361,7 @@ glabel func_80060EA8 /* 061FEC 800613EC 04C0FFDF */ bltz $a2, .L8006136C /* 061FF0 800613F0 00000000 */ nop .L800613F4: -/* 061FF4 800613F4 24A50001 */ addiu $a1, %lo(D_FF7F0001) # addiu $a1, $a1, 1 +/* 061FF4 800613F4 24A50001 */ addiu $a1, %lo(0xFF7F0001) # addiu $a1, $a1, 1 /* 061FF8 800613F8 00057C00 */ sll $t7, $a1, 0x10 /* 061FFC 800613FC 000F2C03 */ sra $a1, $t7, 0x10 /* 062000 80061400 0225082A */ slt $at, $s1, $a1 diff --git a/asm/non_matchings/unknown_072E50/func_80076C58.s b/asm/non_matchings/unknown_072E50/func_80076C58.s index 551c3b2c..f6b8ce96 100644 --- a/asm/non_matchings/unknown_072E50/func_80076C58.s +++ b/asm/non_matchings/unknown_072E50/func_80076C58.s @@ -27,8 +27,8 @@ glabel func_80076C58 /* 0778B8 80076CB8 10000009 */ b .L80076CE0 /* 0778BC 80076CBC 00001025 */ move $v0, $zero .L80076CC0: -/* 0778C0 80076CC0 3C19000F */ lui $t9, %hi(D_000ECC30) # $t9, 0xf -/* 0778C4 80076CC4 2739CC30 */ addiu $t9, %lo(D_000ECC30) # addiu $t9, $t9, -0x33d0 +/* 0778C0 80076CC0 3C19000F */ lui $t9, %hi(__ASSETS_LUT_END) # $t9, 0xf +/* 0778C4 80076CC4 2739CC30 */ addiu $t9, %lo(__ASSETS_LUT_END) # addiu $t9, $t9, -0x33d0 /* 0778C8 80076CC8 8FA6001C */ lw $a2, 0x1c($sp) /* 0778CC 80076CCC 00F92021 */ addu $a0, $a3, $t9 /* 0778D0 80076CD0 0C01DBDE */ jal dmacopy @@ -65,8 +65,8 @@ glabel func_80076C58 /* 077940 80076D40 0C01C327 */ jal func_80070C9C /* 077944 80076D44 AFA30030 */ sw $v1, 0x30($sp) /* 077948 80076D48 8FA30030 */ lw $v1, 0x30($sp) -/* 07794C 80076D4C 3C08000F */ lui $t0, %hi(D_000ECC30) # $t0, 0xf -/* 077950 80076D50 2508CC30 */ addiu $t0, %lo(D_000ECC30) # addiu $t0, $t0, -0x33d0 +/* 07794C 80076D4C 3C08000F */ lui $t0, %hi(__ASSETS_LUT_END) # $t0, 0xf +/* 077950 80076D50 2508CC30 */ addiu $t0, %lo(__ASSETS_LUT_END) # addiu $t0, $t0, -0x33d0 /* 077954 80076D54 00682021 */ addu $a0, $v1, $t0 /* 077958 80076D58 AFA20028 */ sw $v0, 0x28($sp) /* 07795C 80076D5C AFA40020 */ sw $a0, 0x20($sp) @@ -128,8 +128,8 @@ glabel func_80076C58 /* 077A2C 80076E2C 01E81021 */ addu $v0, $t7, $t0 /* 077A30 80076E30 8C430000 */ lw $v1, ($v0) /* 077A34 80076E34 8C580004 */ lw $t8, 4($v0) -/* 077A38 80076E38 3C19000F */ lui $t9, %hi(D_000ECC30) # $t9, 0xf -/* 077A3C 80076E3C 2739CC30 */ addiu $t9, %lo(D_000ECC30) # addiu $t9, $t9, -0x33d0 +/* 077A38 80076E38 3C19000F */ lui $t9, %hi(__ASSETS_LUT_END) # $t9, 0xf +/* 077A3C 80076E3C 2739CC30 */ addiu $t9, %lo(__ASSETS_LUT_END) # addiu $t9, $t9, -0x33d0 /* 077A40 80076E40 03033023 */ subu $a2, $t8, $v1 /* 077A44 80076E44 AFA60018 */ sw $a2, 0x18($sp) /* 077A48 80076E48 0C01DBDE */ jal dmacopy diff --git a/asm/non_matchings/unknown_080500/func_80080580.s b/asm/non_matchings/unknown_080500/func_80080580.s index 8dd1e4dd..53598c02 100644 --- a/asm/non_matchings/unknown_080500/func_80080580.s +++ b/asm/non_matchings/unknown_080500/func_80080580.s @@ -286,8 +286,10 @@ glabel func_80080580 /* 0815E0 800809E0 3C0E0702 */ lui $t6, (0x07020010 >> 16) # lui $t6, 0x702 /* 0815E4 800809E4 244F0008 */ addiu $t7, $v0, 8 /* 0815E8 800809E8 AEEF0000 */ sw $t7, ($s7) -/* 0815EC 800809EC 3C18000E */ lui $t8, %hi(D_000E1CB0) # $t8, 0xe -/* 0815F0 800809F0 27181CB0 */ addiu $t8, %lo(D_000E1CB0) # addiu $t8, $t8, 0x1cb0 + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 0815EC 800809EC 3C18000E */ lui $t8, %hi(D_800E1C70 - 0x7FFFFFC0) # $t8, 0xe + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 0815F0 800809F0 27181CB0 */ addiu $t8, %lo(D_800E1C70 - 0x7FFFFFC0) # addiu $t8, $t8, 0x1cb0 /* 0815F4 800809F4 35CE0010 */ ori $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10 /* 0815F8 800809F8 AC4E0000 */ sw $t6, ($v0) /* 0815FC 800809FC AC580004 */ sw $t8, 4($v0) @@ -314,8 +316,10 @@ glabel func_80080580 /* 08164C 80080A4C 3C0E0702 */ lui $t6, (0x07020010 >> 16) # lui $t6, 0x702 /* 081650 80080A50 244F0008 */ addiu $t7, $v0, 8 /* 081654 80080A54 AEEF0000 */ sw $t7, ($s7) -/* 081658 80080A58 3C19000E */ lui $t9, %hi(D_000E1CA0) # $t9, 0xe -/* 08165C 80080A5C 27391CA0 */ addiu $t9, %lo(D_000E1CA0) # addiu $t9, $t9, 0x1ca0 + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 081658 80080A58 3C19000E */ lui $t9, %hi(D_800E1C70 - 0x7FFFFFD0) # $t9, 0xe + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 08165C 80080A5C 27391CA0 */ addiu $t9, %lo(D_800E1C70 - 0x7FFFFFD0) # addiu $t9, $t9, 0x1ca0 /* 081660 80080A60 35CE0010 */ ori $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10 /* 081664 80080A64 0000F825 */ move $ra, $zero /* 081668 80080A68 3C098000 */ lui $t1, 0x8000 diff --git a/asm/non_matchings/unknown_080500/func_80080BC8.s b/asm/non_matchings/unknown_080500/func_80080BC8.s index e5be398f..4f307d8f 100644 --- a/asm/non_matchings/unknown_080500/func_80080BC8.s +++ b/asm/non_matchings/unknown_080500/func_80080BC8.s @@ -23,16 +23,20 @@ glabel func_80080BC8 /* 08181C 80080C1C 00006825 */ move $t5, $zero /* 081820 80080C20 1920007E */ blez $t1, .L80080E1C /* 081824 80080C24 00003825 */ move $a3, $zero -/* 081828 80080C28 3C16000E */ lui $s6, %hi(D_000E1CA0) # $s6, 0xe -/* 08182C 80080C2C 3C11000E */ lui $s1, %hi(D_000E1CB0) # $s1, 0xe + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 081828 80080C28 3C16000E */ lui $s6, %hi(D_800E1C70 - 0x7FFFFFD0) # $s6, 0xe + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 08182C 80080C2C 3C11000E */ lui $s1, %hi(D_800E1C70 - 0x7FFFFFC0) # $s1, 0xe /* 081830 80080C30 3C1F0702 */ lui $ra, (0x07020010 >> 16) # lui $ra, 0x702 /* 081834 80080C34 3C0B8012 */ lui $t3, %hi(D_80126C2C) # $t3, 0x8012 /* 081838 80080C38 3C0A800E */ lui $t2, %hi(D_800E1DB4) # $t2, 0x800e /* 08183C 80080C3C 254A1DB4 */ addiu $t2, %lo(D_800E1DB4) # addiu $t2, $t2, 0x1db4 /* 081840 80080C40 256B6C2C */ addiu $t3, %lo(D_80126C2C) # addiu $t3, $t3, 0x6c2c /* 081844 80080C44 37FF0010 */ ori $ra, (0x07020010 & 0xFFFF) # ori $ra, $ra, 0x10 -/* 081848 80080C48 26311CB0 */ addiu $s1, %lo(D_000E1CB0) # addiu $s1, $s1, 0x1cb0 -/* 08184C 80080C4C 26D61CA0 */ addiu $s6, %lo(D_000E1CA0) # addiu $s6, $s6, 0x1ca0 + # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0 +/* 081848 80080C48 26311CB0 */ addiu $s1, %lo(D_800E1C70 - 0x7FFFFFC0) # addiu $s1, $s1, 0x1cb0 + # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0 +/* 08184C 80080C4C 26D61CA0 */ addiu $s6, %lo(D_800E1C70 - 0x7FFFFFD0) # addiu $s6, $s6, 0x1ca0 /* 081850 80080C50 3C150500 */ lui $s5, 0x500 /* 081854 80080C54 3C140400 */ lui $s4, 0x400 /* 081858 80080C58 3C13E700 */ lui $s3, 0xe700 diff --git a/asm/non_matchings/unknown_080500/func_80080E90.s b/asm/non_matchings/unknown_080500/func_80080E90.s index 2ea5c8c7..0886cc4d 100644 --- a/asm/non_matchings/unknown_080500/func_80080E90.s +++ b/asm/non_matchings/unknown_080500/func_80080E90.s @@ -19,12 +19,14 @@ glabel func_80080E90 /* 081AD4 80080ED4 AC6F0000 */ sw $t7, ($v1) /* 081AD8 80080ED8 AC780004 */ sw $t8, 4($v1) /* 081ADC 80080EDC 8C830000 */ lw $v1, ($a0) -/* 081AE0 80080EE0 3C0F000E */ lui $t7, %hi(D_000E1CC0) # $t7, 0xe + # D_800E1C70 - 0x7FFFFFB0 = 0xE1CC0 +/* 081AE0 80080EE0 3C0F000E */ lui $t7, %hi(D_800E1C70 - 0x7FFFFFB0) # $t7, 0xe /* 081AE4 80080EE4 24790008 */ addiu $t9, $v1, 8 /* 081AE8 80080EE8 AC990000 */ sw $t9, ($a0) /* 081AEC 80080EEC 3C0E0702 */ lui $t6, (0x07020010 >> 16) # lui $t6, 0x702 /* 081AF0 80080EF0 35CE0010 */ ori $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10 -/* 081AF4 80080EF4 25EF1CC0 */ addiu $t7, %lo(D_000E1CC0) # addiu $t7, $t7, 0x1cc0 + # D_800E1C70 - 0x7FFFFFB0 = 0xE1CC0 +/* 081AF4 80080EF4 25EF1CC0 */ addiu $t7, %lo(D_800E1C70 - 0x7FFFFFB0) # addiu $t7, $t7, 0x1cc0 /* 081AF8 80080EF8 AC6F0004 */ sw $t7, 4($v1) /* 081AFC 80080EFC AC6E0000 */ sw $t6, ($v1) /* 081B00 80080F00 8FB70058 */ lw $s7, 0x58($sp) diff --git a/asm/non_matchings/unknown_080500/func_80081C04.s b/asm/non_matchings/unknown_080500/func_80081C04.s index e10df426..dcda4470 100644 --- a/asm/non_matchings/unknown_080500/func_80081C04.s +++ b/asm/non_matchings/unknown_080500/func_80081C04.s @@ -5,7 +5,7 @@ glabel func_80081C04 /* 082810 80081C10 00A0A025 */ move $s4, $a1 /* 082814 80081C14 AFB30024 */ sw $s3, 0x24($sp) /* 082818 80081C18 AFB1001C */ sw $s1, 0x1c($sp) -/* 08281C 80081C1C 3C103B9A */ lui $s0, %hi(D_3B9A0001) # $s0, 0x3b9a +/* 08281C 80081C1C 3C103B9A */ lui $s0, %hi(0x3B9A0001) # $s0, 0x3b9a /* 082820 80081C20 00808825 */ move $s1, $a0 /* 082824 80081C24 AFBF002C */ sw $ra, 0x2c($sp) /* 082828 80081C28 AFB20020 */ sw $s2, 0x20($sp) @@ -135,7 +135,7 @@ glabel func_80081C04 /* 0829E0 80081DE0 92290000 */ lbu $t1, ($s1) /* 0829E4 80081DE4 0C027298 */ jal func_8009CA60 /* 0829E8 80081DE8 A5490018 */ sh $t1, 0x18($t2) -/* 0829EC 80081DEC 26100001 */ addiu $s0, %lo(D_3B9A0001) # addiu $s0, $s0, 1 +/* 0829EC 80081DEC 26100001 */ addiu $s0, %lo(0x3B9A0001) # addiu $s0, $s0, 1 /* 0829F0 80081DF0 26310001 */ addiu $s1, $s1, 1 /* 0829F4 80081DF4 1613FFF4 */ bne $s0, $s3, .L80081DC8 /* 0829F8 80081DF8 2694000C */ addiu $s4, $s4, 0xc diff --git a/asm/non_matchings/unknown_080500/func_8008AD44.s b/asm/non_matchings/unknown_080500/func_8008AD44.s index 0828fffa..90710aba 100644 --- a/asm/non_matchings/unknown_080500/func_8008AD44.s +++ b/asm/non_matchings/unknown_080500/func_8008AD44.s @@ -9,8 +9,8 @@ glabel func_8008AD44 /* 08B960 8008AD60 AFB1001C */ sw $s1, 0x1c($sp) /* 08B964 8008AD64 15C0003B */ bnez $t6, .L8008AE54 /* 08B968 8008AD68 AFB00018 */ sw $s0, 0x18($sp) -/* 08B96C 8008AD6C 3C1000AD */ lui $s0, %hi(D_00AC9630) # $s0, 0xad -/* 08B970 8008AD70 26109630 */ addiu $s0, %lo(D_00AC9630) # addiu $s0, $s0, -0x69d0 +/* 08B96C 8008AD6C 3C1000AD */ lui $s0, %hi(__ROM_END) # $s0, 0xad +/* 08B970 8008AD70 26109630 */ addiu $s0, %lo(__ROM_END) # addiu $s0, $s0, -0x69d0 /* 08B974 8008AD74 2610F000 */ addiu $s0, $s0, -0x1000 /* 08B978 8008AD78 24131000 */ li $s3, 4096 /* 08B97C 8008AD7C 02009025 */ move $s2, $s0 @@ -75,8 +75,8 @@ glabel func_8008AD44 /* 08BA4C 8008AE4C 3C01800E */ lui $at, %hi(D_800E1E18) # $at, 0x800e /* 08BA50 8008AE50 AC2A1E18 */ sw $t2, %lo(D_800E1E18)($at) .L8008AE54: -/* 08BA54 8008AE54 3C1000AD */ lui $s0, %hi(D_00AC9630) # $s0, 0xad -/* 08BA58 8008AE58 26109630 */ addiu $s0, %lo(D_00AC9630) # addiu $s0, $s0, -0x69d0 +/* 08BA54 8008AE54 3C1000AD */ lui $s0, %hi(__ROM_END) # $s0, 0xad +/* 08BA58 8008AE58 26109630 */ addiu $s0, %lo(__ROM_END) # addiu $s0, $s0, -0x69d0 /* 08BA5C 8008AE5C 00002025 */ move $a0, $zero /* 08BA60 8008AE60 00002825 */ move $a1, $zero /* 08BA64 8008AE64 00003025 */ move $a2, $zero diff --git a/asm/non_matchings/unknown_0B8920/func_800B82B4.s b/asm/non_matchings/unknown_0B8920/func_800B82B4.s index ddd79fb5..6408d34a 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B82B4.s +++ b/asm/non_matchings/unknown_0B8920/func_800B82B4.s @@ -238,7 +238,7 @@ glabel func_800B82B4 .L800B8618: /* 0B9218 800B8618 0C01BE46 */ jal save_rng_seed /* 0B921C 800B861C 00000000 */ nop -/* 0B9220 800B8620 3C045741 */ lui $a0, %hi(D_57410001) # $a0, 0x5741 +/* 0B9220 800B8620 3C045741 */ lui $a0, %hi(0x57410001) # $a0, 0x5741 /* 0B9224 800B8624 0C01BE43 */ jal set_rng_seed /* 0B9228 800B8628 34845646 */ ori $a0, (0x57415646 & 0xFFFF) # ori $a0, $a0, 0x5646 /* 0B922C 800B862C 8E830004 */ lw $v1, 4($s4) @@ -318,7 +318,7 @@ glabel func_800B82B4 /* 0B932C 800B872C 8C4E0000 */ lw $t6, ($v0) /* 0B9330 800B8730 460A1402 */ mul.s $f16, $f2, $f10 /* 0B9334 800B8734 01C37821 */ addu $t7, $t6, $v1 -/* 0B9338 800B8738 24840001 */ addiu $a0, %lo(D_57410001) # addiu $a0, $a0, 1 +/* 0B9338 800B8738 24840001 */ addiu $a0, %lo(0x57410001) # addiu $a0, $a0, 1 /* 0B933C 800B873C 460084A1 */ cvt.d.s $f18, $f16 /* 0B9340 800B8740 46209180 */ add.d $f6, $f18, $f0 /* 0B9344 800B8744 444CF800 */ cfc1 $t4, $31 diff --git a/asm/non_matchings/unknown_0B8920/func_800C1130.s b/asm/non_matchings/unknown_0B8920/func_800C1130.s index e7c777d0..c2bc4259 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C1130.s +++ b/asm/non_matchings/unknown_0B8920/func_800C1130.s @@ -3,7 +3,7 @@ glabel func_800C1130 /* 0C1D34 800C1134 24E731B0 */ addiu $a3, %lo(D_800E31B0) # addiu $a3, $a3, 0x31b0 /* 0C1D38 800C1138 44842000 */ mtc1 $a0, $f4 /* 0C1D3C 800C113C 94E20000 */ lhu $v0, ($a3) -/* 0C1D40 800C1140 3C03800E */ lui $v1, %hi(D_800E0001) # $v1, 0x800e +/* 0C1D40 800C1140 3C03800E */ lui $v1, 0x800e /* 0C1D44 800C1144 1840009B */ blez $v0, .L800C13B4 /* 0C1D48 800C1148 46802020 */ cvt.s.w $f0, $f4 /* 0C1D4C 800C114C 0082082A */ slt $at, $a0, $v0 @@ -26,7 +26,7 @@ glabel func_800C1130 /* 0C1D8C 800C118C 01C23021 */ addu $a2, $t6, $v0 /* 0C1D90 800C1190 46080282 */ mul.s $f10, $f0, $f8 /* 0C1D94 800C1194 C4C60000 */ lwc1 $f6, ($a2) -/* 0C1D98 800C1198 24630001 */ addiu $v1, %lo(D_800E0001) # addiu $v1, $v1, 1 +/* 0C1D98 800C1198 24630001 */ addiu $v1, $v1, 1 /* 0C1D9C 800C119C 460A3400 */ add.s $f16, $f6, $f10 /* 0C1DA0 800C11A0 E4D00000 */ swc1 $f16, ($a2) /* 0C1DA4 800C11A4 8D4B0000 */ lw $t3, ($t2) diff --git a/asm/non_matchings/unknown_0B8920/func_800C3C00.s b/asm/non_matchings/unknown_0B8920/func_800C3C00.s index 038c5dfc..d62f7168 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C3C00.s +++ b/asm/non_matchings/unknown_0B8920/func_800C3C00.s @@ -26,7 +26,7 @@ glabel func_800C3C00 /* 0C485C 800C3C5C 1420FFF8 */ bnez $at, .L800C3C40 /* 0C4860 800C3C60 00000000 */ nop .L800C3C64: -/* 0C4864 800C3C64 3C05FFFF */ lui $a1, %hi(D_FFFF0028) # $a1, 0xffff +/* 0C4864 800C3C64 3C05FFFF */ lui $a1, %hi(0xFFFF0028) # $a1, 0xffff /* 0C4868 800C3C68 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff /* 0C486C 800C3C6C 0C01C327 */ jal func_80070C9C /* 0C4870 800C3C70 24040940 */ li $a0, 2368 @@ -156,7 +156,7 @@ glabel func_800C3C00 /* 0C4A54 800C3E54 8CCB0000 */ lw $t3, ($a2) /* 0C4A58 800C3E58 00000000 */ nop /* 0C4A5C 800C3E5C 01656021 */ addu $t4, $t3, $a1 -/* 0C4A60 800C3E60 24A50028 */ addiu $a1, %lo(D_FFFF0028) # addiu $a1, $a1, 0x28 +/* 0C4A60 800C3E60 24A50028 */ addiu $a1, %lo(0xFFFF0028) # addiu $a1, $a1, 0x28 /* 0C4A64 800C3E64 28A10140 */ slti $at, $a1, 0x140 /* 0C4A68 800C3E68 1420FF90 */ bnez $at, .L800C3CAC /* 0C4A6C 800C3E6C AD800024 */ sw $zero, 0x24($t4) diff --git a/asm/non_matchings/unknown_0B8920/func_800C45A4.s b/asm/non_matchings/unknown_0B8920/func_800C45A4.s index 0c0c54fe..d284a76d 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C45A4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C45A4.s @@ -201,8 +201,9 @@ glabel func_800C45A4 /* 0C5494 800C4894 24790008 */ addiu $t9, $v1, 8 /* 0C5498 800C4898 AE390000 */ sw $t9, ($s1) /* 0C549C 800C489C 3C180702 */ lui $t8, (0x07020010 >> 16) # lui $t8, 0x702 -/* 0C54A0 800C48A0 3C0E000E */ lui $t6, %hi(D_000E36D8) # $t6, 0xe -/* 0C54A4 800C48A4 25CE36D8 */ addiu $t6, %lo(D_000E36D8) # addiu $t6, $t6, 0x36d8 + # D_800E3690 - 0x7FFFFFB8 = 0xE36D8 +/* 0C54A0 800C48A0 3C0E000E */ lui $t6, %hi(D_800E3690 - 0x7FFFFFB8) # $t6, 0xe +/* 0C54A4 800C48A4 25CE36D8 */ addiu $t6, %lo(D_800E3690 - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8 /* 0C54A8 800C48A8 37180010 */ ori $t8, (0x07020010 & 0xFFFF) # ori $t8, $t8, 0x10 /* 0C54AC 800C48AC AC780000 */ sw $t8, ($v1) /* 0C54B0 800C48B0 AC6E0004 */ sw $t6, 4($v1) @@ -271,12 +272,14 @@ glabel func_800C45A4 /* 0C55A8 800C49A8 032FC025 */ or $t8, $t9, $t7 /* 0C55AC 800C49AC AC780004 */ sw $t8, 4($v1) /* 0C55B0 800C49B0 8E230000 */ lw $v1, ($s1) -/* 0C55B4 800C49B4 3C0F000E */ lui $t7, %hi(D_000E36C8) # $t7, 0xe + # D_800E3690 - 0x7FFFFFC8 = 0xE36C8 +/* 0C55B4 800C49B4 3C0F000E */ lui $t7, %hi(D_800E3690 - 0x7FFFFFC8) # $t7, 0xe /* 0C55B8 800C49B8 246E0008 */ addiu $t6, $v1, 8 /* 0C55BC 800C49BC AE2E0000 */ sw $t6, ($s1) /* 0C55C0 800C49C0 3C190702 */ lui $t9, (0x07020010 >> 16) # lui $t9, 0x702 /* 0C55C4 800C49C4 37390010 */ ori $t9, (0x07020010 & 0xFFFF) # ori $t9, $t9, 0x10 -/* 0C55C8 800C49C8 25EF36C8 */ addiu $t7, %lo(D_000E36C8) # addiu $t7, $t7, 0x36c8 + # D_800E3690 - 0x7FFFFFC8 = 0xE36C8 +/* 0C55C8 800C49C8 25EF36C8 */ addiu $t7, %lo(D_800E3690 - 0x7FFFFFC8) # addiu $t7, $t7, 0x36c8 /* 0C55CC 800C49CC AC6F0004 */ sw $t7, 4($v1) /* 0C55D0 800C49D0 AC790000 */ sw $t9, ($v1) /* 0C55D4 800C49D4 8E230000 */ lw $v1, ($s1) diff --git a/asm/non_matchings/unknown_0B8920/func_800C5B58.s b/asm/non_matchings/unknown_0B8920/func_800C5B58.s index 1bfbb0c2..018214fe 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C5B58.s +++ b/asm/non_matchings/unknown_0B8920/func_800C5B58.s @@ -30,8 +30,10 @@ glabel func_800C5B58 /* 0C67C8 800C5BC8 3C0D0702 */ lui $t5, (0x07020010 >> 16) # lui $t5, 0x702 /* 0C67CC 800C5BCC 244C0008 */ addiu $t4, $v0, 8 /* 0C67D0 800C5BD0 AE6C0000 */ sw $t4, ($s3) -/* 0C67D4 800C5BD4 3C0E000E */ lui $t6, %hi(D_000E36D8) # $t6, 0xe -/* 0C67D8 800C5BD8 25CE36D8 */ addiu $t6, %lo(D_000E36D8) # addiu $t6, $t6, 0x36d8 + # D_800E3690 - 0x7FFFFFB8 = 0xE36D8 +/* 0C67D4 800C5BD4 3C0E000E */ lui $t6, %hi(D_800E3690 - 0x7FFFFFB8) # $t6, 0xe + # D_800E3690 - 0x7FFFFFB8 = 0xE36D8 +/* 0C67D8 800C5BD8 25CE36D8 */ addiu $t6, %lo(D_800E3690 - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8 /* 0C67DC 800C5BDC 35AD0010 */ ori $t5, (0x07020010 & 0xFFFF) # ori $t5, $t5, 0x10 /* 0C67E0 800C5BE0 AC4D0000 */ sw $t5, ($v0) /* 0C67E4 800C5BE4 AC4E0004 */ sw $t6, 4($v0) diff --git a/asm/unknown_031D30/func_80031130.s b/asm/unknown_031D30/func_80031130.s index 3db8cfdf..16215e95 100644 --- a/asm/unknown_031D30/func_80031130.s +++ b/asm/unknown_031D30/func_80031130.s @@ -1,7 +1,7 @@ glabel func_80031130 /* 031D30 80031130 27BDFF90 */ addiu $sp, $sp, -0x70 /* 031D34 80031134 3C080001 */ lui $t0, (0x000186A0 >> 16) # lui $t0, 1 -/* 031D38 80031138 3C09FFFE */ lui $t1, %hi(D_FFFDFFFB) # $t1, 0xfffe +/* 031D38 80031138 3C09FFFE */ lui $t1, %hi(0xFFFDFFFB) # $t1, 0xfffe /* 031D3C 8003113C AFB6002C */ sw $s6, 0x2c($sp) /* 031D40 80031140 AFB50028 */ sw $s5, 0x28($sp) /* 031D44 80031144 AFB40024 */ sw $s4, 0x24($sp) @@ -121,7 +121,7 @@ glabel func_80031130 /* 031ED8 800312D8 25080005 */ addiu $t0, $t0, 5 /* 031EDC 800312DC 0113082A */ slt $at, $t0, $s3 /* 031EE0 800312E0 14200010 */ bnez $at, .L80031324 -/* 031EE4 800312E4 2529FFFB */ addiu $t1, %lo(D_FFFDFFFB) # addiu $t1, $t1, -5 +/* 031EE4 800312E4 2529FFFB */ addiu $t1, %lo(0xFFFDFFFB) # addiu $t1, $t1, -5 /* 031EE8 800312E8 0249082A */ slt $at, $s2, $t1 /* 031EEC 800312EC 5420000E */ bnezl $at, .L80031328 /* 031EF0 800312F0 25EFFFFF */ addiu $t7, $t7, -1 diff --git a/asm/unknown_031D30/func_80031600.s b/asm/unknown_031D30/func_80031600.s index e3081a99..0d1aadda 100644 --- a/asm/unknown_031D30/func_80031600.s +++ b/asm/unknown_031D30/func_80031600.s @@ -21,10 +21,10 @@ glabel func_80031600 /* 032240 80031640 8D2A0000 */ lw $t2, ($t1) /* 032244 80031644 59400006 */ blezl $t2, .L80031660 /* 032248 80031648 95420000 */ lhu $v0, ($t2) -/* 03224C 8003164C 3C0B8000 */ lui $t3, %hi(D_80000018) # $t3, 0x8000 +/* 03224C 8003164C 3C0B8000 */ lui $t3, 0x8000 /* 032250 80031650 016A5825 */ or $t3, $t3, $t2 /* 032254 80031654 0800C651 */ j .L80031944 -/* 032258 80031658 8D6B0018 */ lw $t3, %lo(D_80000018)($t3) +/* 032258 80031658 8D6B0018 */ lw $t3, 0x18($t3) /* 03225C 8003165C 95420000 */ lhu $v0, ($t2) .L80031660: @@ -257,10 +257,10 @@ glabel func_80031954 /* 0325A0 800319A0 8D2A0000 */ lw $t2, ($t1) /* 0325A4 800319A4 59400006 */ blezl $t2, .L800319C0 /* 0325A8 800319A8 95420000 */ lhu $v0, ($t2) -/* 0325AC 800319AC 3C0B8000 */ lui $t3, %hi(D_80000018) # $t3, 0x8000 +/* 0325AC 800319AC 3C0B8000 */ lui $t3, 0x8000 /* 0325B0 800319B0 016A5825 */ or $t3, $t3, $t2 /* 0325B4 800319B4 0800C6C6 */ j .L80031B18 -/* 0325B8 800319B8 8D6B0018 */ lw $t3, %lo(D_80000018)($t3) +/* 0325B8 800319B8 8D6B0018 */ lw $t3, 0x18($t3) /* 0325BC 800319BC 95420000 */ lhu $v0, ($t2) .L800319C0: diff --git a/bss.txt b/bss.txt deleted file mode 100644 index 131d7195..00000000 --- a/bss.txt +++ /dev/null @@ -1,108 +0,0 @@ -unknown_001050 - -unknown_003260 - -unknown_005740 - -unknown_00BC20 - -unknown_0255E0 - -unknown_032760 - -unknown_0348C0 - -unknown_043920 - -unknown_05CEF0 - -unknown_05DCD0 - -unknown_05F0C0 - -unknown_05F690 - -unknown_0667D0 - -unknown_066AA0 - -unknown_06B2B0 - -unknown_071730 - -unknown_072E50 - -unknown_0777A0 - -unknown_078050 - -unknown_079F50 - -unknown_07AF10 - -unknown_07B870 - -unknown_080500 - -unknown_09F8F0 - -unknown_0AEE70 - -unknown_0C4800 - -unknown_0C7F50 -D_8012AAF0; -D_8012ACA0; -D_8012ACB8; - - -osViMgr -viThreadStack; -D_8012CCC0; -__osEventStateTab; - - -unknown_0CD820 -D_8012CD50; -D_8012CD8C; -D_8012CD90; -__osMaxControllers; -D_8012CDB8; -D_8012CDD0; -__osPfsPifRam; -D_8012CE1C; - - -unknown_0CE200 -D_8012CE20; -D_8012CE28; -D_8012CE40; -D_8012CE7C; - - -osViMgr -viThread; -viEventQueue; -viEventBuf; -viRetraceMsg; -viCounterMsg; -D_8012D190; - - -unknown_0D29F0 -D_8012D1A0; - - -unknown_0D3020 -D_8012D1E0; -piAccessQueue; -__osCurrentTime; -D_8012D224; -__osBaseCounter; -D_8012D22C; -D_8012D230; -D_8012D240; - - -unknown_071730 -D_8012D3F0; \ No newline at end of file diff --git a/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s b/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s index 7c902d6c..9f605f94 100644 --- a/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s +++ b/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s @@ -46,10 +46,10 @@ glabel viMgrMain .L800D1BAC: /* 0D27AC 800D1BAC 0C035824 */ jal __osViSwapContext /* 0D27B0 800D1BB0 00000000 */ nop -/* 0D27B4 800D1BB4 3C038013 */ lui $v1, %hi(D_8012FFFF) # $v1, 0x8013 +/* 0D27B4 800D1BB4 3C038013 */ lui $v1, %hi(D_8012D190) # $v1, 0x8013 /* 0D27B8 800D1BB8 9463D190 */ lhu $v1, %lo(D_8012D190)($v1) /* 0D27BC 800D1BBC 3C018013 */ lui $at, %hi(D_8012D190) # $at, 0x8013 -/* 0D27C0 800D1BC0 2463FFFF */ addiu $v1, %lo(D_8012FFFF) # addiu $v1, $v1, -1 +/* 0D27C0 800D1BC0 2463FFFF */ addiu $v1, $v1, -1 /* 0D27C4 800D1BC4 306FFFFF */ andi $t7, $v1, 0xffff /* 0D27C8 800D1BC8 15E0000E */ bnez $t7, .L800D1C04 /* 0D27CC 800D1BCC A42FD190 */ sh $t7, %lo(D_8012D190)($at) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s index 913eafb3..c6586ff6 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s @@ -55,8 +55,8 @@ glabel alResamplePull /* 0CCE2C 800CC22C 4626203C */ c.lt.d $f4, $f6 /* 0CCE30 800CC230 00000000 */ nop /* 0CCE34 800CC234 45020005 */ bc1fl .L800CC24C -/* 0CCE38 800CC238 3C014700 */ lui $at, %hi(D_46FF9630) # $at, 0x4700 -/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(D_46FF9630)($at) +/* 0CCE38 800CC238 3C014700 */ lui $at, %hi(0x46FF9630) # $at, 0x4700 +/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(0x46FF9630)($at) /* 0CCE40 800CC240 E5080018 */ swc1 $f8, 0x18($t0) /* 0CCE44 800CC244 C5020018 */ lwc1 $f2, 0x18($t0) /* 0CCE48 800CC248 3C014700 */ li $at, 0x47000000 # 32768.000000 diff --git a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s index 49e78744..764b8d57 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s +++ b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s @@ -49,53 +49,53 @@ glabel osInitialize /* 0CD24C 800CC64C 3C08800D */ lui $t0, %hi(__osExceptionPreamble) # $t0, 0x800d /* 0CD250 800CC650 25082CB0 */ addiu $t0, %lo(__osExceptionPreamble) # addiu $t0, $t0, 0x2cb0 /* 0CD254 800CC654 8D010000 */ lw $at, ($t0) -/* 0CD258 800CC658 3C198000 */ lui $t9, %hi(D_8000000C) # $t9, 0x8000 +/* 0CD258 800CC658 3C198000 */ lui $t9, 0x8000 /* 0CD25C 800CC65C 3C0D800D */ lui $t5, %hi(__osExceptionPreamble) # $t5, 0x800d /* 0CD260 800CC660 AF210000 */ sw $at, ($t9) /* 0CD264 800CC664 8D0B0004 */ lw $t3, 4($t0) /* 0CD268 800CC668 25AD2CB0 */ addiu $t5, %lo(__osExceptionPreamble) # addiu $t5, $t5, 0x2cb0 -/* 0CD26C 800CC66C 3C0C8000 */ lui $t4, %hi(D_8000000C) # $t4, 0x8000 -/* 0CD270 800CC670 AF2B0004 */ sw $t3, %lo(D_80000004)($t9) +/* 0CD26C 800CC66C 3C0C8000 */ lui $t4, 0x8000 +/* 0CD270 800CC670 AF2B0004 */ sw $t3, 4($t9) /* 0CD274 800CC674 8D010008 */ lw $at, 8($t0) /* 0CD278 800CC678 358C0080 */ ori $t4, (0x80000080 & 0xFFFF) # ori $t4, $t4, 0x80 /* 0CD27C 800CC67C 3C09800D */ lui $t1, %hi(__osExceptionPreamble) # $t1, 0x800d -/* 0CD280 800CC680 AF210008 */ sw $at, %lo(D_80000008)($t9) +/* 0CD280 800CC680 AF210008 */ sw $at, 8($t9) /* 0CD284 800CC684 8D0B000C */ lw $t3, 0xc($t0) /* 0CD288 800CC688 25292CB0 */ addiu $t1, %lo(__osExceptionPreamble) # addiu $t1, $t1, 0x2cb0 -/* 0CD28C 800CC68C 3C0A8000 */ lui $t2, %hi(D_8000000C) # $t2, 0x8000 -/* 0CD290 800CC690 AF2B000C */ sw $t3, %lo(D_8000000C)($t9) +/* 0CD28C 800CC68C 3C0A8000 */ lui $t2, 0x8000 +/* 0CD290 800CC690 AF2B000C */ sw $t3, 0xc($t9) /* 0CD294 800CC694 8DA10000 */ lw $at, ($t5) /* 0CD298 800CC698 354A0100 */ ori $t2, (0x80000100 & 0xFFFF) # ori $t2, $t2, 0x100 /* 0CD29C 800CC69C 3C0E800D */ lui $t6, %hi(__osExceptionPreamble) # $t6, 0x800d /* 0CD2A0 800CC6A0 AD810000 */ sw $at, ($t4) /* 0CD2A4 800CC6A4 8DB80004 */ lw $t8, 4($t5) /* 0CD2A8 800CC6A8 25CE2CB0 */ addiu $t6, %lo(__osExceptionPreamble) # addiu $t6, $t6, 0x2cb0 -/* 0CD2AC 800CC6AC 3C0F8000 */ lui $t7, %hi(D_8000000C) # $t7, 0x8000 -/* 0CD2B0 800CC6B0 AD980004 */ sw $t8, %lo(D_80000004)($t4) +/* 0CD2AC 800CC6AC 3C0F8000 */ lui $t7, 0x8000 +/* 0CD2B0 800CC6B0 AD980004 */ sw $t8, 4($t4) /* 0CD2B4 800CC6B4 8DA10008 */ lw $at, 8($t5) /* 0CD2B8 800CC6B8 35EF0180 */ ori $t7, (0x80000180 & 0xFFFF) # ori $t7, $t7, 0x180 /* 0CD2BC 800CC6BC 3C048000 */ lui $a0, 0x8000 -/* 0CD2C0 800CC6C0 AD810008 */ sw $at, %lo(D_80000008)($t4) +/* 0CD2C0 800CC6C0 AD810008 */ sw $at, 8($t4) /* 0CD2C4 800CC6C4 8DB8000C */ lw $t8, 0xc($t5) /* 0CD2C8 800CC6C8 24050190 */ li $a1, 400 -/* 0CD2CC 800CC6CC AD98000C */ sw $t8, %lo(D_8000000C)($t4) +/* 0CD2CC 800CC6CC AD98000C */ sw $t8, 0xc($t4) /* 0CD2D0 800CC6D0 8D210000 */ lw $at, ($t1) /* 0CD2D4 800CC6D4 AD410000 */ sw $at, ($t2) /* 0CD2D8 800CC6D8 8D2B0004 */ lw $t3, 4($t1) -/* 0CD2DC 800CC6DC AD4B0004 */ sw $t3, %lo(D_80000004)($t2) +/* 0CD2DC 800CC6DC AD4B0004 */ sw $t3, 4($t2) /* 0CD2E0 800CC6E0 8D210008 */ lw $at, 8($t1) -/* 0CD2E4 800CC6E4 AD410008 */ sw $at, %lo(D_80000008)($t2) +/* 0CD2E4 800CC6E4 AD410008 */ sw $at, 8($t2) /* 0CD2E8 800CC6E8 8D2B000C */ lw $t3, 0xc($t1) -/* 0CD2EC 800CC6EC AD4B000C */ sw $t3, %lo(D_8000000C)($t2) +/* 0CD2EC 800CC6EC AD4B000C */ sw $t3, 0xc($t2) /* 0CD2F0 800CC6F0 8DC10000 */ lw $at, ($t6) /* 0CD2F4 800CC6F4 ADE10000 */ sw $at, ($t7) /* 0CD2F8 800CC6F8 8DD80004 */ lw $t8, 4($t6) -/* 0CD2FC 800CC6FC ADF80004 */ sw $t8, %lo(D_80000004)($t7) +/* 0CD2FC 800CC6FC ADF80004 */ sw $t8, 4($t7) /* 0CD300 800CC700 8DC10008 */ lw $at, 8($t6) -/* 0CD304 800CC704 ADE10008 */ sw $at, %lo(D_80000008)($t7) +/* 0CD304 800CC704 ADE10008 */ sw $at, 8($t7) /* 0CD308 800CC708 8DD8000C */ lw $t8, 0xc($t6) /* 0CD30C 800CC70C 0C03518C */ jal osWritebackDCache -/* 0CD310 800CC710 ADF8000C */ sw $t8, %lo(D_8000000C)($t7) +/* 0CD310 800CC710 ADF8000C */ sw $t8, 0xC($t7) /* 0CD314 800CC714 3C048000 */ lui $a0, 0x8000 /* 0CD318 800CC718 0C0351AC */ jal osInvalICache /* 0CD31C 800CC71C 24050190 */ li $a1, 400 diff --git a/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s b/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s index 19ea5b4e..24dffdac 100644 --- a/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s +++ b/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s @@ -38,14 +38,14 @@ glabel osInvalDCache /* 0D2474 800D1874 00000000 */ nop .L800D1878: -/* 0D2478 800D1878 3C088000 */ lui $t0, %hi(D_80000010) # $t0, 0x8000 +/* 0D2478 800D1878 3C088000 */ lui $t0, 0x8000 /* 0D247C 800D187C 010B4821 */ addu $t1, $t0, $t3 /* 0D2480 800D1880 2529FFF0 */ addiu $t1, $t1, -0x10 .L800D1884: /* 0D2484 800D1884 BD010000 */ cache 1, ($t0) /* 0D2488 800D1888 0109082B */ sltu $at, $t0, $t1 /* 0D248C 800D188C 1420FFFD */ bnez $at, .L800D1884 -/* 0D2490 800D1890 25080010 */ addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10 +/* 0D2490 800D1890 25080010 */ addiu $t0, $t0, 0x10 /* 0D2494 800D1894 03E00008 */ jr $ra /* 0D2498 800D1898 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s b/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s index 4ec747ea..e89e3996 100644 --- a/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s +++ b/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s @@ -1,5 +1,5 @@ glabel osWritebackDCacheAll -/* 0D24A0 800D18A0 3C088000 */ lui $t0, %hi(D_80000010) # $t0, 0x8000 +/* 0D24A0 800D18A0 3C088000 */ lui $t0, 0x8000 /* 0D24A4 800D18A4 240A2000 */ li $t2, 8192 /* 0D24A8 800D18A8 010A4821 */ addu $t1, $t0, $t2 /* 0D24AC 800D18AC 2529FFF0 */ addiu $t1, $t1, -0x10 @@ -7,7 +7,7 @@ glabel osWritebackDCacheAll /* 0D24B0 800D18B0 BD010000 */ cache 1, ($t0) /* 0D24B4 800D18B4 0109082B */ sltu $at, $t0, $t1 /* 0D24B8 800D18B8 1420FFFD */ bnez $at, .L800D18B0 -/* 0D24BC 800D18BC 25080010 */ addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10 +/* 0D24BC 800D18BC 25080010 */ addiu $t0, $t0, 0x10 /* 0D24C0 800D18C0 03E00008 */ jr $ra /* 0D24C4 800D18C4 00000000 */ nop diff --git a/lib/asm/osInvalICache.s b/lib/asm/osInvalICache.s index dec7d2dd..4e23d32e 100644 --- a/lib/asm/osInvalICache.s +++ b/lib/asm/osInvalICache.s @@ -33,14 +33,14 @@ glabel osInvalICache /* 0D52FC 800D46FC 00000000 */ nop .L800D4700: -/* 0D5300 800D4700 3C088000 */ lui $t0, %hi(D_80000020) # $t0, 0x8000 +/* 0D5300 800D4700 3C088000 */ lui $t0, 0x8000 /* 0D5304 800D4704 010B4821 */ addu $t1, $t0, $t3 /* 0D5308 800D4708 2529FFE0 */ addiu $t1, $t1, -0x20 .L800D470C: /* 0D530C 800D470C BD000000 */ cache 0, ($t0) /* 0D5310 800D4710 0109082B */ sltu $at, $t0, $t1 /* 0D5314 800D4714 1420FFFD */ bnez $at, .L800D470C -/* 0D5318 800D4718 25080020 */ addiu $t0, %lo(D_80000020) # addiu $t0, $t0, 0x20 +/* 0D5318 800D4718 25080020 */ addiu $t0, $t0, 0x20 /* 0D531C 800D471C 03E00008 */ jr $ra /* 0D5320 800D4720 00000000 */ nop diff --git a/lib/asm/osWritebackDCache.s b/lib/asm/osWritebackDCache.s index db6ff14f..5b9a25fc 100644 --- a/lib/asm/osWritebackDCache.s +++ b/lib/asm/osWritebackDCache.s @@ -34,14 +34,14 @@ glabel osWritebackDCache /* 0D527C 800D467C 00000000 */ nop .L800D4680: -/* 0D5280 800D4680 3C088000 */ lui $t0, %hi(D_80000010) # $t0, 0x8000 +/* 0D5280 800D4680 3C088000 */ lui $t0, 0x8000 /* 0D5284 800D4684 010B4821 */ addu $t1, $t0, $t3 /* 0D5288 800D4688 2529FFF0 */ addiu $t1, $t1, -0x10 .L800D468C: /* 0D528C 800D468C BD010000 */ cache 1, ($t0) /* 0D5290 800D4690 0109082B */ sltu $at, $t0, $t1 /* 0D5294 800D4694 1420FFFD */ bnez $at, .L800D468C -/* 0D5298 800D4698 25080010 */ addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10 +/* 0D5298 800D4698 25080010 */ addiu $t0, $t0, 0x10 /* 0D529C 800D469C 03E00008 */ jr $ra /* 0D52A0 800D46A0 00000000 */ nop diff --git a/lib/src/osSetEventMesg.c b/lib/src/osSetEventMesg.c index 347200fa..82424c45 100644 --- a/lib/src/osSetEventMesg.c +++ b/lib/src/osSetEventMesg.c @@ -10,7 +10,7 @@ typedef struct __OSEventState } __OSEventState; -__OSEventState __osEventStateTab[OS_NUM_EVENTS];//__osEventStateTab[OS_NUM_EVENTS]; +__OSEventState __osEventStateTab[15]; // __osEventStateTab[OS_NUM_EVENTS]; void osSetEventMesg(OSEvent event, OSMesgQueue *mq, OSMesg msg) { register u32 saveMask = __osDisableInt(); diff --git a/lib/src/osViMgr.c b/lib/src/osViMgr.c index 36b45803..ae2185dc 100644 --- a/lib/src/osViMgr.c +++ b/lib/src/osViMgr.c @@ -5,7 +5,6 @@ #include "macros.h" #include "libultra_internal.h" -#define OS_VIM_STACKSIZE 4096 extern OSTime __osCurrentTime; extern u32 __osBaseCounter; @@ -13,7 +12,11 @@ extern u32 D_8012D22C; //__osViIntrCount OSDevMgr __osViDevMgr = {0}; -extern u8 viThreadStack[OS_VIM_STACKSIZE]; +#define OS_VIM_STACKSIZE 4096 +u8 viThreadStack[2960]; // viThreadStack[OS_VIM_STACKSIZE]; + +s32 D_8012CCC0; + extern OSThread viThread; extern OSMesgQueue viEventQueue; extern OSMesg viEventBuf[5]; //viEventBuf; diff --git a/lib/src/unknown_0C9A20.c b/lib/src/unknown_0C9A20.c index c63fb58a..3d802000 100644 --- a/lib/src/unknown_0C9A20.c +++ b/lib/src/unknown_0C9A20.c @@ -6,7 +6,7 @@ // This probably does not belong here. Please move it to the appropriate place! #define EQPOWER_LENGTH 128 -static s16 eqpower[ EQPOWER_LENGTH ] = { +s16 eqpower[ EQPOWER_LENGTH ] = { 32767, 32764, 32757, 32744, 32727, 32704, 32677, 32644, 32607, 32564, 32517, 32464, 32407, 32344, 32277, 32205, 32127, 32045, diff --git a/lib/src/unknown_0CD820.c b/lib/src/unknown_0CD820.c index 4adbd683..d09539a8 100644 --- a/lib/src/unknown_0CD820.c +++ b/lib/src/unknown_0CD820.c @@ -6,6 +6,24 @@ s32 D_800E38C0 = 0; +s32 D_8012CD50[15]; +s32 D_8012CD8C; +s8 D_8012CD90; +s8 __osMaxControllers; // 8012CD91 +s32 D_8012CD94; +s32 D_8012CD98[6]; +s32 D_8012CDB0; +s32 D_8012CDB4; +s32 D_8012CDB8; +s32 D_8012CDBC; +s32 D_8012CDC0[4]; +s32 D_8012CDD0[4]; +s32 __osPfsPifRam; // 8012CDE0 +s32 D_8012CDE4; +s32 D_8012CDE8[12]; +s32 D_8012CE18; +s32 D_8012CE1C; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s") diff --git a/lib/src/unknown_0CE200.c b/lib/src/unknown_0CE200.c index 23bcf4eb..757a3e77 100644 --- a/lib/src/unknown_0CE200.c +++ b/lib/src/unknown_0CE200.c @@ -6,6 +6,31 @@ s32 D_800E38D0 = 0; +// Ok, so I completely gave up on the rest of these bss variables. +// This is probably not the right place for them, but we can always +// fix that later. ¯\_(ツ)_/¯ + +s32 D_8012CE20[2]; +s32 D_8012CE28[6]; +s32 D_8012CE40[15]; +s32 D_8012CE7C; +s32 viThread[172]; +s32 viEventQueue[6]; +s32 viEventBuf[6]; +s32 viRetraceMsg[6]; +s32 viCounterMsg[6]; +s32 D_8012D190[4]; +s32 D_8012D1A0[16]; +s32 D_8012D1E0[2]; +s32 piAccessQueue[14]; +s32 __osCurrentTime; +s32 D_8012D224; +s32 __osBaseCounter; +s32 D_8012D22C; +s32 D_8012D230[4]; +s32 D_8012D240[108]; +s32 D_8012D3F0; + GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiCreateAccessQueue.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiGetAccess.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiRelAccess.s") diff --git a/src/unknown_0C7F50.c b/src/unknown_0C7F50.c index abd22408..3662e251 100644 --- a/src/unknown_0C7F50.c +++ b/src/unknown_0C7F50.c @@ -20,6 +20,7 @@ s32 D_8012AAE0[4]; OSThread D_8012AAF0; OSMesgQueue D_8012ACA0; OSMesg D_8012ACB8; +s32 D_8012ACC0[1306]; extern void *D_8012CCC0; diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 4c67e61a..568a1df7 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -26,6 +26,13 @@ LATE_DATA_FILES = [ BUILD_DIR + '/lib/src/unknown_0D3020.o' ] +BSS_LIB_ORDER_FILES = [ + BUILD_DIR + '/lib/src/osViMgr.o', + BUILD_DIR + '/lib/src/osSetEventMesg.o', + BUILD_DIR + '/lib/src/unknown_0CD820.o', + BUILD_DIR + '/lib/src/unknown_0CE200.o' +] + class GenerateLD: def __init__(self, file): print('Generating linker file...') @@ -53,6 +60,8 @@ class GenerateLD: self.gen_ucode_data_section() self.gen_bss_section() self.gen_assets_section() + self.gen_line('__ROM_END = romPos;') + self.gen_newline() self.gen_discard() self.gen_close_block() @@ -130,9 +139,9 @@ class GenerateLD: self.gen_line('.bss.noload . (NOLOAD): SUBALIGN(4)') self.gen_open_block() for file in self.files: - if file[0] not in LATE_DATA_FILES: + if file[0] not in BSS_LIB_ORDER_FILES: self.gen_line(file[0] + '(.bss);') - for file in LATE_DATA_FILES: + for file in BSS_LIB_ORDER_FILES: self.gen_line(file + '(.bss);') self.gen_close_block() self.gen_newline() diff --git a/undefined_syms.txt b/undefined_syms.txt index 27b204b3..528174a5 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1,66 +1,9 @@ -D_000E1CA0 = 0x000E1CA0; -D_000E1CB0 = 0x000E1CB0; -D_000E1CC0 = 0x000E1CC0; -D_000E36C8 = 0x000E36C8; -D_000E36D8 = 0x000E36D8; -D_000ECC30 = 0x000ECC30; -D_00AC9630 = 0x00AC9630; -D_00FF0018 = 0x00FF0018; -D_3B9A0001 = 0x3B9A0001; -D_46FF9630 = 0x46FF9630; -D_57410001 = 0x57410001; - -D_80000004 = 0x80000004; -D_80000008 = 0x80000008; -D_8000000C = 0x8000000C; -D_80000010 = 0x80000010; -D_80000018 = 0x80000018; -D_80000020 = 0x80000020; osTvType = 0x80000300; osRomBase = 0x80000308; osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -D_800E0001 = 0x800E0001; -eqpower = 0x800E37A0; - - -viThreadStack = 0x8012C130; - -D_8012CCC0 = 0x8012CCC0; - -__osEventStateTab = 0x8012CCD0; -D_8012CD50 = 0x8012CD50; -D_8012CD8C = 0x8012CD8C; -D_8012CD90 = 0x8012CD90; -__osMaxControllers = 0x8012CD91; -D_8012CDB8 = 0x8012CDB8; -D_8012CDD0 = 0x8012CDD0; -__osPfsPifRam = 0x8012CDE0; -D_8012CE1C = 0x8012CE1C; -D_8012CE20 = 0x8012CE20; -D_8012CE28 = 0x8012CE28; -D_8012CE40 = 0x8012CE40; -D_8012CE7C = 0x8012CE7C; -viThread = 0x8012CE80; -viEventQueue = 0x8012D130; -viEventBuf = 0x8012D148; -viRetraceMsg = 0x8012D160; -viCounterMsg = 0x8012D178; -D_8012D190 = 0x8012D190; -D_8012D1A0 = 0x8012D1A0; -D_8012D1E0 = 0x8012D1E0; -piAccessQueue = 0x8012D1E8; -__osCurrentTime = 0x8012D220; -D_8012D224 = 0x8012D224; -__osBaseCounter = 0x8012D228; -D_8012D22C = 0x8012D22C; -D_8012D230 = 0x8012D230; -D_8012D240 = 0x8012D240; -D_8012D3F0 = 0x8012D3F0; -D_8012FFFF = 0x8012FFFF; - D_A0000200 = 0xA0000200; D_A0000284 = 0xA0000284; SP_IMEM = 0xA4001000; @@ -101,7 +44,3 @@ D_A5000508 = 0xA5000508; D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; - -D_FF7F0001 = 0xFF7F0001; -D_FFFDFFFB = 0xFFFDFFFB; -D_FFFF0028 = 0xFFFF0028; \ No newline at end of file From 413601c7762e520d85a44d5b27905c34e59613e4 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 10 Jun 2021 01:31:04 -0500 Subject: [PATCH 39/39] Fixed conflicts --- include/unknown_043920.h | 4 +++- include/unknown_06B2B0.h | 11 ++++++++++- include/unknown_080500.h | 4 ++-- src/unknown_003260.c | 15 --------------- src/unknown_06B2B0.c | 9 --------- src/unknown_080500.c | 8 -------- 6 files changed, 15 insertions(+), 36 deletions(-) diff --git a/include/unknown_043920.h b/include/unknown_043920.h index a6f5bc06..3c84013b 100644 --- a/include/unknown_043920.h +++ b/include/unknown_043920.h @@ -19,7 +19,9 @@ extern f32 D_800DCBE8[19]; // Unused? Not sure if this is actually an array or just some random data. extern s32 D_800DCC34[19]; -extern s32 D_800DCC80[19]; +extern s32 D_800DCC80[13]; + +extern s16 D_800DCCB4[12]; extern u16 D_800DCCCC[20]; diff --git a/include/unknown_06B2B0.h b/include/unknown_06B2B0.h index 3f9e3881..aa163905 100644 --- a/include/unknown_06B2B0.h +++ b/include/unknown_06B2B0.h @@ -3,6 +3,15 @@ #include "types.h" +typedef struct unknown800DD408 { + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u16 unk4; + u16 unk6; +} unknown800DD408; + extern s8 D_800DD310; extern s8 D_800DD314; extern s8 D_800DD318; @@ -55,7 +64,7 @@ extern s32 D_800DD3EC; extern s8 D_800DD3F0; extern s16 D_800DD3F4[8]; extern s32 D_800DD404; -extern s32 D_800DD408; +extern unknown800DD408 D_800DD408; extern s32 D_800DD40C; // Unused? diff --git a/include/unknown_080500.h b/include/unknown_080500.h index 3b759e76..fd91e5c9 100644 --- a/include/unknown_080500.h +++ b/include/unknown_080500.h @@ -339,8 +339,8 @@ extern u16 D_800E0700[8]; extern s16 D_800E0710[16]; -extern s16 D_800E0730[18]; -extern s16 D_800E0758[56]; +extern s16 D_800E0730[19]; +extern s16 D_800E0758[54]; extern s16 D_800E07C4[14]; diff --git a/src/unknown_003260.c b/src/unknown_003260.c index d4f461d8..1e6a5353 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -32,21 +32,6 @@ typedef union { }ALSndpEvent; -/* Unknown Size */ -typedef struct unk800DC6BC { - ALPlayer node; - ALEventQueue evtq; - ALEvent nextEvent; - ALSynth *drvr; - u32 unk3C; - unk800DC6BC_40 *unk40; - s32 unk44; - s32 unk48; - s32 frameTime; - ALMicroTime nextDelta; - ALMicroTime curTime; -} unk800DC6BC; //ALSndPlayer - typedef struct unk80119240 { ALLink node; diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index 62d45cb4..f677640a 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -86,15 +86,6 @@ s16 D_800DD3F4[8] = { }; s32 D_800DD404 = 12; -typedef struct unknown800DD408 { - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u16 unk4; - u16 unk6; -} unknown800DD408; - unknown800DD408 D_800DD408 = { 0, 255, 255, 255, 30, 0xFFFF }; diff --git a/src/unknown_080500.c b/src/unknown_080500.c index b905c7f1..7718a5ff 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -42,14 +42,6 @@ typedef enum MENU_ID { extern s32 osTvType; -typedef struct unk800DFC10 { - u32 *unk0; - s16 unk4; - s16 unk6; - u32 *unk8; - s32 unkC; -} unk800DFC10; - /************ .bss ************/ // The bss section needs to stay above the data section!