From ec8922ceba0c7f02de5d6c8af9095b8d1b8aa307 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Thu, 27 May 2021 22:32:40 -0700 Subject: [PATCH] Added glabels for jump tables --- .../unknown_003260/_handleEvent.s | 4 +- .../unknown_00BC20/func_8000CC7C.s | 4 +- .../unknown_00BC20/func_8000E0B0.s | 4 +- .../unknown_00BC20/func_8000EA54.s | 4 +- .../unknown_00BC20/func_800101AC.s | 8 +- .../unknown_00BC20/func_80014B50.s | 4 +- .../unknown_00BC20/func_800235DC.s | 4 +- .../unknown_00BC20/func_800238BC.s | 4 +- .../unknown_00BC20/func_80023E30.s | 4 +- .../unknown_00BC20/func_80023F48.s | 4 +- .../unknown_0255E0/func_8002A900.s | 4 +- .../unknown_032760/func_80033A14.s | 4 +- .../unknown_032760/func_80039330.s | 8 +- .../unknown_032760/func_8003E630.s | 4 +- .../unknown_032760/func_80040C54.s | 4 +- .../unknown_032760/func_800422F0.s | 4 +- .../unknown_043920/func_8004447C.s | 8 +- .../unknown_043920/func_800452A0.s | 8 +- .../unknown_043920/func_80048C7C.s | 4 +- .../unknown_043920/func_8004DE38.s | 4 +- .../unknown_043920/func_8005250C.s | 4 +- .../unknown_043920/func_80053E9C.s | 4 +- .../unknown_043920/func_80055EC0.s | 8 +- .../unknown_043920/func_80057A40.s | 4 +- .../unknown_043920/func_8005A6F0.s | 4 +- .../unknown_05DCD0/func_8005D820.s | 4 +- .../unknown_05F690/func_8005EA90.s | 4 +- .../unknown_061D30/__CSPHandleMIDIMsg.s | 4 +- .../unknown_061D30/__CSPHandleNextSeqEvent.s | 4 +- .../unknown_061D30/__CSPVoiceHandler.s | 4 +- asm/non_matchings/unknown_064830/alFxNew.s | 4 +- .../unknown_064830/alFxParamHdl.s | 4 +- .../unknown_066AA0/func_8006CCF0.s | 12 +-- .../unknown_066AA0/func_8006DCF8.s | 4 +- .../unknown_079F50/__scSchedule.s | 4 +- .../unknown_07AF10/func_8007A550.s | 4 +- data/dkr.data.s | 80 +++++++++++++++++++ undefined_syms.txt | 43 ++++++++++ 38 files changed, 209 insertions(+), 86 deletions(-) diff --git a/asm/non_matchings/unknown_003260/_handleEvent.s b/asm/non_matchings/unknown_003260/_handleEvent.s index 8e5452e6..3995b4a2 100644 --- a/asm/non_matchings/unknown_003260/_handleEvent.s +++ b/asm/non_matchings/unknown_003260/_handleEvent.s @@ -84,9 +84,9 @@ glabel _handleEvent /* 0041A0 800035A0 2D210010 */ sltiu $at, $t1, 0x10 /* 0041A4 800035A4 102002BA */ beqz $at, .L80004090 /* 0041A8 800035A8 00094880 */ sll $t1, $t1, 2 -/* 0041AC 800035AC 3C01800E */ lui $at, 0x800e +/* 0041AC 800035AC 3C01800E */ lui $at, %hi(D_800E4BB0) # $at, 0x800e /* 0041B0 800035B0 00290821 */ addu $at, $at, $t1 -/* 0041B4 800035B4 8C294BB0 */ lw $t1, 0x4bb0($at) +/* 0041B4 800035B4 8C294BB0 */ lw $t1, %lo(D_800E4BB0)($at) /* 0041B8 800035B8 00000000 */ nop /* 0041BC 800035BC 01200008 */ jr $t1 /* 0041C0 800035C0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 69b3ced3..f73a9928 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -912,9 +912,9 @@ glabel func_8000CC7C /* 00E550 8000D950 2DE10009 */ sltiu $at, $t7, 9 /* 00E554 8000D954 1020000D */ beqz $at, .L8000D98C /* 00E558 8000D958 000F7880 */ sll $t7, $t7, 2 -/* 00E55C 8000D95C 3C01800E */ lui $at, 0x800e +/* 00E55C 8000D95C 3C01800E */ lui $at, %hi(D_800E5154) # $at, 0x800e /* 00E560 8000D960 002F0821 */ addu $at, $at, $t7 -/* 00E564 8000D964 8C2F5154 */ lw $t7, 0x5154($at) +/* 00E564 8000D964 8C2F5154 */ lw $t7, %lo(D_800E5154)($at) /* 00E568 8000D968 00000000 */ nop /* 00E56C 8000D96C 01E00008 */ jr $t7 /* 00E570 8000D970 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000E0B0.s b/asm/non_matchings/unknown_00BC20/func_8000E0B0.s index ca593536..2833f662 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E0B0.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E0B0.s @@ -6,9 +6,9 @@ glabel func_8000E0B0 /* 00ECC0 8000E0C0 10200014 */ beqz $at, .L8000E114 /* 00ECC4 8000E0C4 AFBF0014 */ sw $ra, 0x14($sp) /* 00ECC8 8000E0C8 000E7080 */ sll $t6, $t6, 2 -/* 00ECCC 8000E0CC 3C01800E */ lui $at, 0x800e +/* 00ECCC 8000E0CC 3C01800E */ lui $at, %hi(D_800E5188) # $at, 0x800e /* 00ECD0 8000E0D0 002E0821 */ addu $at, $at, $t6 -/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, 0x5188($at) +/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, %lo(D_800E5188)($at) /* 00ECD8 8000E0D8 00000000 */ nop /* 00ECDC 8000E0DC 01C00008 */ jr $t6 /* 00ECE0 8000E0E0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index 7b768a25..bf1bd880 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -162,9 +162,9 @@ glabel func_8000EA54 /* 00F8B4 8000ECB4 2D410027 */ sltiu $at, $t2, 0x27 /* 00F8B8 8000ECB8 10200049 */ beqz $at, .L8000EDE0 /* 00F8BC 8000ECBC 000A5080 */ sll $t2, $t2, 2 -/* 00F8C0 8000ECC0 3C01800E */ lui $at, 0x800e +/* 00F8C0 8000ECC0 3C01800E */ lui $at, %hi(D_800E51B4) # $at, 0x800e /* 00F8C4 8000ECC4 002A0821 */ addu $at, $at, $t2 -/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, 0x51b4($at) +/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, %lo(D_800E51B4)($at) /* 00F8CC 8000ECCC 00000000 */ nop /* 00F8D0 8000ECD0 01400008 */ jr $t2 /* 00F8D4 8000ECD4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800101AC.s b/asm/non_matchings/unknown_00BC20/func_800101AC.s index 45c3e15d..72ab0216 100644 --- a/asm/non_matchings/unknown_00BC20/func_800101AC.s +++ b/asm/non_matchings/unknown_00BC20/func_800101AC.s @@ -117,9 +117,9 @@ glabel func_800101AC /* 010F50 80010350 2D810074 */ sltiu $at, $t4, 0x74 /* 010F54 80010354 102000A8 */ beqz $at, .L800105F8 /* 010F58 80010358 000C6080 */ sll $t4, $t4, 2 -/* 010F5C 8001035C 3C01800E */ lui $at, 0x800e +/* 010F5C 8001035C 3C01800E */ lui $at, %hi(D_800E5250) # $at, 0x800e /* 010F60 80010360 002C0821 */ addu $at, $at, $t4 -/* 010F64 80010364 8C2C5250 */ lw $t4, 0x5250($at) +/* 010F64 80010364 8C2C5250 */ lw $t4, %lo(D_800E5250)($at) /* 010F68 80010368 00000000 */ nop /* 010F6C 8001036C 01800008 */ jr $t4 /* 010F70 80010370 00000000 */ nop @@ -306,9 +306,9 @@ glabel func_800101AC /* 01120C 8001060C 2F210046 */ sltiu $at, $t9, 0x46 /* 011210 80010610 10200014 */ beqz $at, .L80010664 /* 011214 80010614 0019C880 */ sll $t9, $t9, 2 -/* 011218 80010618 3C01800E */ lui $at, 0x800e +/* 011218 80010618 3C01800E */ lui $at, %hi(D_800E5420) # $at, 0x800e /* 01121C 8001061C 00390821 */ addu $at, $at, $t9 -/* 011220 80010620 8C395420 */ lw $t9, 0x5420($at) +/* 011220 80010620 8C395420 */ lw $t9, %lo(D_800E5420)($at) /* 011224 80010624 00000000 */ nop /* 011228 80010628 03200008 */ jr $t9 /* 01122C 8001062C 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80014B50.s b/asm/non_matchings/unknown_00BC20/func_80014B50.s index 13208040..6bebda90 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014B50.s +++ b/asm/non_matchings/unknown_00BC20/func_80014B50.s @@ -5,9 +5,9 @@ glabel func_80014B50 /* 01575C 80014B5C 102001F8 */ beqz $at, .L80015340 /* 015760 80014B60 00A01825 */ move $v1, $a1 /* 015764 80014B64 00077080 */ sll $t6, $a3, 2 -/* 015768 80014B68 3C01800E */ lui $at, 0x800e +/* 015768 80014B68 3C01800E */ lui $at, %hi(D_800E5588) # $at, 0x800e /* 01576C 80014B6C 002E0821 */ addu $at, $at, $t6 -/* 015770 80014B70 8C2E5588 */ lw $t6, 0x5588($at) +/* 015770 80014B70 8C2E5588 */ lw $t6, %lo(D_800E5588)($at) /* 015774 80014B74 00000000 */ nop /* 015778 80014B78 01C00008 */ jr $t6 /* 01577C 80014B7C 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800235DC.s b/asm/non_matchings/unknown_00BC20/func_800235DC.s index 979f9925..793525af 100644 --- a/asm/non_matchings/unknown_00BC20/func_800235DC.s +++ b/asm/non_matchings/unknown_00BC20/func_800235DC.s @@ -7,9 +7,9 @@ glabel func_800235DC /* 0241F0 800235F0 2F010077 */ sltiu $at, $t8, 0x77 /* 0241F4 800235F4 102000AC */ beqz $at, .L800238A8 /* 0241F8 800235F8 0018C080 */ sll $t8, $t8, 2 -/* 0241FC 800235FC 3C01800E */ lui $at, 0x800e +/* 0241FC 800235FC 3C01800E */ lui $at, %hi(D_800E5688) # $at, 0x800e /* 024200 80023600 00380821 */ addu $at, $at, $t8 -/* 024204 80023604 8C385688 */ lw $t8, 0x5688($at) +/* 024204 80023604 8C385688 */ lw $t8, %lo(D_800E5688)($at) /* 024208 80023608 00000000 */ nop /* 02420C 8002360C 03000008 */ jr $t8 /* 024210 80023610 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800238BC.s b/asm/non_matchings/unknown_00BC20/func_800238BC.s index 9a0bed91..6d5dc28d 100644 --- a/asm/non_matchings/unknown_00BC20/func_800238BC.s +++ b/asm/non_matchings/unknown_00BC20/func_800238BC.s @@ -12,9 +12,9 @@ glabel func_800238BC /* 0244E4 800238E4 2F210076 */ sltiu $at, $t9, 0x76 /* 0244E8 800238E8 1020014D */ beqz $at, .L80023E20 /* 0244EC 800238EC 0019C880 */ sll $t9, $t9, 2 -/* 0244F0 800238F0 3C01800E */ lui $at, 0x800e +/* 0244F0 800238F0 3C01800E */ lui $at, %hi(D_800E5864) # $at, 0x800e /* 0244F4 800238F4 00390821 */ addu $at, $at, $t9 -/* 0244F8 800238F8 8C395864 */ lw $t9, 0x5864($at) +/* 0244F8 800238F8 8C395864 */ lw $t9, %lo(D_800E5864)($at) /* 0244FC 800238FC 00000000 */ nop /* 024500 80023900 03200008 */ jr $t9 /* 024504 80023904 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80023E30.s b/asm/non_matchings/unknown_00BC20/func_80023E30.s index 0e454833..33ee5bdd 100644 --- a/asm/non_matchings/unknown_00BC20/func_80023E30.s +++ b/asm/non_matchings/unknown_00BC20/func_80023E30.s @@ -4,9 +4,9 @@ glabel func_80023E30 /* 024A38 80023E38 10200041 */ beqz $at, .L80023F40 /* 024A3C 80023E3C 00001825 */ move $v1, $zero /* 024A40 80023E40 000E7080 */ sll $t6, $t6, 2 -/* 024A44 80023E44 3C01800E */ lui $at, 0x800e +/* 024A44 80023E44 3C01800E */ lui $at, %hi(D_800E5A3C) # $at, 0x800e /* 024A48 80023E48 002E0821 */ addu $at, $at, $t6 -/* 024A4C 80023E4C 8C2E5A3C */ lw $t6, 0x5a3c($at) +/* 024A4C 80023E4C 8C2E5A3C */ lw $t6, %lo(D_800E5A3C)($at) /* 024A50 80023E50 00000000 */ nop /* 024A54 80023E54 01C00008 */ jr $t6 /* 024A58 80023E58 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80023F48.s b/asm/non_matchings/unknown_00BC20/func_80023F48.s index b9dd7585..fe6cc235 100644 --- a/asm/non_matchings/unknown_00BC20/func_80023F48.s +++ b/asm/non_matchings/unknown_00BC20/func_80023F48.s @@ -16,9 +16,9 @@ glabel func_80023F48 /* 024B80 80023F80 2DE10076 */ sltiu $at, $t7, 0x76 /* 024B84 80023F84 1020017A */ beqz $at, .L80024570 /* 024B88 80023F88 000F7880 */ sll $t7, $t7, 2 -/* 024B8C 80023F8C 3C01800E */ lui $at, 0x800e +/* 024B8C 80023F8C 3C01800E */ lui $at, %hi(D_800E5C0C) # $at, 0x800e /* 024B90 80023F90 002F0821 */ addu $at, $at, $t7 -/* 024B94 80023F94 8C2F5C0C */ lw $t7, 0x5c0c($at) +/* 024B94 80023F94 8C2F5C0C */ lw $t7, %lo(D_800E5C0C)($at) /* 024B98 80023F98 00000000 */ nop /* 024B9C 80023F9C 01E00008 */ jr $t7 /* 024BA0 80023FA0 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_8002A900.s b/asm/non_matchings/unknown_0255E0/func_8002A900.s index 8047d8a2..7ce2076d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A900.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A900.s @@ -123,9 +123,9 @@ glabel func_8002A900 /* 02B6D4 8002AAD4 2D610020 */ sltiu $at, $t3, 0x20 /* 02B6D8 8002AAD8 1020001E */ beqz $at, .L8002AB54 /* 02B6DC 8002AADC 000B5880 */ sll $t3, $t3, 2 -/* 02B6E0 8002AAE0 3C01800E */ lui $at, 0x800e +/* 02B6E0 8002AAE0 3C01800E */ lui $at, %hi(D_800E5EC0) # $at, 0x800e /* 02B6E4 8002AAE4 002B0821 */ addu $at, $at, $t3 -/* 02B6E8 8002AAE8 8C2B5EC0 */ lw $t3, 0x5ec0($at) +/* 02B6E8 8002AAE8 8C2B5EC0 */ lw $t3, %lo(D_800E5EC0)($at) /* 02B6EC 8002AAEC 00000000 */ nop /* 02B6F0 8002AAF0 01600008 */ jr $t3 /* 02B6F4 8002AAF4 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80033A14.s b/asm/non_matchings/unknown_032760/func_80033A14.s index 56b03f2b..fd89e253 100644 --- a/asm/non_matchings/unknown_032760/func_80033A14.s +++ b/asm/non_matchings/unknown_032760/func_80033A14.s @@ -16,9 +16,9 @@ glabel func_80033A14 /* 03464C 80033A4C 10200067 */ beqz $at, .L80033BEC /* 034650 80033A50 46083503 */ div.s $f20, $f6, $f8 /* 034654 80033A54 0018C080 */ sll $t8, $t8, 2 -/* 034658 80033A58 3C01800E */ lui $at, 0x800e +/* 034658 80033A58 3C01800E */ lui $at, %hi(D_800E5F80) # $at, 0x800e /* 03465C 80033A5C 00380821 */ addu $at, $at, $t8 -/* 034660 80033A60 8C385F80 */ lw $t8, 0x5f80($at) +/* 034660 80033A60 8C385F80 */ lw $t8, %lo(D_800E5F80)($at) /* 034664 80033A64 00000000 */ nop /* 034668 80033A68 03000008 */ jr $t8 /* 03466C 80033A6C 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 1571fc68..db1f94c8 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -280,9 +280,9 @@ glabel func_80039330 /* 03A334 80039734 2DA10015 */ sltiu $at, $t5, 0x15 /* 03A338 80039738 1020000B */ beqz $at, .L80039768 /* 03A33C 8003973C 000D6880 */ sll $t5, $t5, 2 -/* 03A340 80039740 3C01800E */ lui $at, 0x800e +/* 03A340 80039740 3C01800E */ lui $at, %hi(D_800E6070) # $at, 0x800e /* 03A344 80039744 002D0821 */ addu $at, $at, $t5 -/* 03A348 80039748 8C2D6070 */ lw $t5, 0x6070($at) +/* 03A348 80039748 8C2D6070 */ lw $t5, %lo(D_800E6070)($at) /* 03A34C 8003974C 00000000 */ nop /* 03A350 80039750 01A00008 */ jr $t5 /* 03A354 80039754 00000000 */ nop @@ -307,9 +307,9 @@ glabel func_80039330 /* 03A398 80039798 10200384 */ beqz $at, .L8003A5AC /* 03A39C 8003979C 24030004 */ li $v1, 4 /* 03A3A0 800397A0 000F7880 */ sll $t7, $t7, 2 -/* 03A3A4 800397A4 3C01800E */ lui $at, 0x800e +/* 03A3A4 800397A4 3C01800E */ lui $at, %hi(D_800E60C4) # $at, 0x800e /* 03A3A8 800397A8 002F0821 */ addu $at, $at, $t7 -/* 03A3AC 800397AC 8C2F60C4 */ lw $t7, 0x60c4($at) +/* 03A3AC 800397AC 8C2F60C4 */ lw $t7, %lo(D_800E60C4)($at) /* 03A3B0 800397B0 00000000 */ nop /* 03A3B4 800397B4 01E00008 */ jr $t7 /* 03A3B8 800397B8 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003E630.s b/asm/non_matchings/unknown_032760/func_8003E630.s index a6cd11cc..a686c27c 100644 --- a/asm/non_matchings/unknown_032760/func_8003E630.s +++ b/asm/non_matchings/unknown_032760/func_8003E630.s @@ -8,9 +8,9 @@ glabel func_8003E630 /* 03F248 8003E648 2DC1000C */ sltiu $at, $t6, 0xc /* 03F24C 8003E64C 1020000D */ beqz $at, .L8003E684 /* 03F250 8003E650 000E7080 */ sll $t6, $t6, 2 -/* 03F254 8003E654 3C01800E */ lui $at, 0x800e +/* 03F254 8003E654 3C01800E */ lui $at, %hi(D_800E61C0) # $at, 0x800e /* 03F258 8003E658 002E0821 */ addu $at, $at, $t6 -/* 03F25C 8003E65C 8C2E61C0 */ lw $t6, 0x61c0($at) +/* 03F25C 8003E65C 8C2E61C0 */ lw $t6, %lo(D_800E61C0)($at) /* 03F260 8003E660 00000000 */ nop /* 03F264 8003E664 01C00008 */ jr $t6 /* 03F268 8003E668 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80040C54.s b/asm/non_matchings/unknown_032760/func_80040C54.s index 4e64b555..121ccd18 100644 --- a/asm/non_matchings/unknown_032760/func_80040C54.s +++ b/asm/non_matchings/unknown_032760/func_80040C54.s @@ -51,9 +51,9 @@ glabel func_80040C54 /* 04190C 80040D0C 2C410005 */ sltiu $at, $v0, 5 /* 041910 80040D10 102002C9 */ beqz $at, .L80041838 /* 041914 80040D14 0002C880 */ sll $t9, $v0, 2 -/* 041918 80040D18 3C01800E */ lui $at, 0x800e +/* 041918 80040D18 3C01800E */ lui $at, %hi(D_800E6228) # $at, 0x800e /* 04191C 80040D1C 00390821 */ addu $at, $at, $t9 -/* 041920 80040D20 8C396228 */ lw $t9, 0x6228($at) +/* 041920 80040D20 8C396228 */ lw $t9, %lo(D_800E6228)($at) /* 041924 80040D24 00000000 */ nop /* 041928 80040D28 03200008 */ jr $t9 /* 04192C 80040D2C 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index 1e46259c..deb0f56c 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -28,9 +28,9 @@ glabel func_800422F0 /* 042F54 80042354 2DE10005 */ sltiu $at, $t7, 5 /* 042F58 80042358 10200186 */ beqz $at, .L80042974 /* 042F5C 8004235C 000F7880 */ sll $t7, $t7, 2 -/* 042F60 80042360 3C01800E */ lui $at, 0x800e +/* 042F60 80042360 3C01800E */ lui $at, %hi(D_800E6258) # $at, 0x800e /* 042F64 80042364 002F0821 */ addu $at, $at, $t7 -/* 042F68 80042368 8C2F6258 */ lw $t7, 0x6258($at) +/* 042F68 80042368 8C2F6258 */ lw $t7, %lo(D_800E6258)($at) /* 042F6C 8004236C 00000000 */ nop /* 042F70 80042370 01E00008 */ jr $t7 /* 042F74 80042374 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index a318f05a..1f888a4a 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -142,9 +142,9 @@ glabel func_8004447C /* 045288 80044688 10200245 */ beqz $at, .L80044FA0 /* 04528C 8004468C 24050001 */ li $a1, 1 /* 045290 80044690 000D6880 */ sll $t5, $t5, 2 -/* 045294 80044694 3C01800E */ lui $at, 0x800e +/* 045294 80044694 3C01800E */ lui $at, %hi(D_800E6318) # $at, 0x800e /* 045298 80044698 002D0821 */ addu $at, $at, $t5 -/* 04529C 8004469C 8C2D6318 */ lw $t5, 0x6318($at) +/* 04529C 8004469C 8C2D6318 */ lw $t5, %lo(D_800E6318)($at) /* 0452A0 800446A0 00000000 */ nop /* 0452A4 800446A4 01A00008 */ jr $t5 /* 0452A8 800446A8 00000000 */ nop @@ -382,9 +382,9 @@ glabel func_8004447C /* 045608 80044A08 2DA10006 */ sltiu $at, $t5, 6 /* 04560C 80044A0C 10200033 */ beqz $at, .L80044ADC /* 045610 80044A10 000D6880 */ sll $t5, $t5, 2 -/* 045614 80044A14 3C01800E */ lui $at, 0x800e +/* 045614 80044A14 3C01800E */ lui $at, %hi(D_800E6334) # $at, 0x800e /* 045618 80044A18 002D0821 */ addu $at, $at, $t5 -/* 04561C 80044A1C 8C2D6334 */ lw $t5, 0x6334($at) +/* 04561C 80044A1C 8C2D6334 */ lw $t5, %lo(D_800E6334)($at) /* 045620 80044A20 00000000 */ nop /* 045624 80044A24 01A00008 */ jr $t5 /* 045628 80044A28 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index 5a79fb42..b4e4d33a 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -283,9 +283,9 @@ glabel func_800452A0 /* 04627C 8004567C 2F210008 */ sltiu $at, $t9, 8 /* 046280 80045680 10200018 */ beqz $at, .L800456E4 /* 046284 80045684 0019C880 */ sll $t9, $t9, 2 -/* 046288 80045688 3C01800E */ lui $at, 0x800e +/* 046288 80045688 3C01800E */ lui $at, %hi(D_800E6358) # $at, 0x800e /* 04628C 8004568C 00390821 */ addu $at, $at, $t9 -/* 046290 80045690 8C396358 */ lw $t9, 0x6358($at) +/* 046290 80045690 8C396358 */ lw $t9, %lo(D_800E6358)($at) /* 046294 80045694 00000000 */ nop /* 046298 80045698 03200008 */ jr $t9 /* 04629C 8004569C 00000000 */ nop @@ -579,9 +579,9 @@ glabel func_800452A0 /* 0466B8 80045AB8 2D810008 */ sltiu $at, $t4, 8 /* 0466BC 80045ABC 10200050 */ beqz $at, .L80045C00 /* 0466C0 80045AC0 000C6080 */ sll $t4, $t4, 2 -/* 0466C4 80045AC4 3C01800E */ lui $at, 0x800e +/* 0466C4 80045AC4 3C01800E */ lui $at, %hi(D_800E637C) # $at, 0x800e /* 0466C8 80045AC8 002C0821 */ addu $at, $at, $t4 -/* 0466CC 80045ACC 8C2C637C */ lw $t4, 0x637c($at) +/* 0466CC 80045ACC 8C2C637C */ lw $t4, %lo(D_800E637C)($at) /* 0466D0 80045AD0 00000000 */ nop /* 0466D4 80045AD4 01800008 */ jr $t4 /* 0466D8 80045AD8 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80048C7C.s b/asm/non_matchings/unknown_043920/func_80048C7C.s index 10898d31..23ff83bc 100644 --- a/asm/non_matchings/unknown_043920/func_80048C7C.s +++ b/asm/non_matchings/unknown_043920/func_80048C7C.s @@ -47,9 +47,9 @@ glabel func_80048C7C /* 04991C 80048D1C 2F210006 */ sltiu $at, $t9, 6 /* 049920 80048D20 1020004B */ beqz $at, .L80048E50 /* 049924 80048D24 0019C880 */ sll $t9, $t9, 2 -/* 049928 80048D28 3C01800E */ lui $at, 0x800e +/* 049928 80048D28 3C01800E */ lui $at, %hi(D_800E646C) # $at, 0x800e /* 04992C 80048D2C 00390821 */ addu $at, $at, $t9 -/* 049930 80048D30 8C39646C */ lw $t9, 0x646c($at) +/* 049930 80048D30 8C39646C */ lw $t9, %lo(D_800E646C)($at) /* 049934 80048D34 00000000 */ nop /* 049938 80048D38 03200008 */ jr $t9 /* 04993C 80048D3C 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index ae35bd18..722bcafd 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -911,9 +911,9 @@ glabel func_8004DE38 /* 04F760 8004EB60 2D21000E */ sltiu $at, $t1, 0xe /* 04F764 8004EB64 10200088 */ beqz $at, .L8004ED88 /* 04F768 8004EB68 00094880 */ sll $t1, $t1, 2 -/* 04F76C 8004EB6C 3C01800E */ lui $at, 0x800e +/* 04F76C 8004EB6C 3C01800E */ lui $at, %hi(D_800E65B0) # $at, 0x800e /* 04F770 8004EB70 00290821 */ addu $at, $at, $t1 -/* 04F774 8004EB74 8C2965B0 */ lw $t1, 0x65b0($at) +/* 04F774 8004EB74 8C2965B0 */ lw $t1, %lo(D_800E65B0)($at) /* 04F778 8004EB78 00000000 */ nop /* 04F77C 8004EB7C 01200008 */ jr $t1 /* 04F780 8004EB80 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8005250C.s b/asm/non_matchings/unknown_043920/func_8005250C.s index 0735218f..548a6596 100644 --- a/asm/non_matchings/unknown_043920/func_8005250C.s +++ b/asm/non_matchings/unknown_043920/func_8005250C.s @@ -92,9 +92,9 @@ glabel func_8005250C /* 053254 80052654 2D410008 */ sltiu $at, $t2, 8 /* 053258 80052658 102000C7 */ beqz $at, .L80052978 /* 05325C 8005265C 000A5080 */ sll $t2, $t2, 2 -/* 053260 80052660 3C01800E */ lui $at, 0x800e +/* 053260 80052660 3C01800E */ lui $at, %hi(D_800E66D0) # $at, 0x800e /* 053264 80052664 002A0821 */ addu $at, $at, $t2 -/* 053268 80052668 8C2A66D0 */ lw $t2, 0x66d0($at) +/* 053268 80052668 8C2A66D0 */ lw $t2, %lo(D_800E66D0)($at) /* 05326C 8005266C 00000000 */ nop /* 053270 80052670 01400008 */ jr $t2 /* 053274 80052674 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80053E9C.s b/asm/non_matchings/unknown_043920/func_80053E9C.s index 807c177b..d7571a2f 100644 --- a/asm/non_matchings/unknown_043920/func_80053E9C.s +++ b/asm/non_matchings/unknown_043920/func_80053E9C.s @@ -88,9 +88,9 @@ glabel func_80053E9C /* 054BCC 80053FCC 2DE10006 */ sltiu $at, $t7, 6 /* 054BD0 80053FD0 1020004A */ beqz $at, .L800540FC /* 054BD4 80053FD4 000F7880 */ sll $t7, $t7, 2 -/* 054BD8 80053FD8 3C01800E */ lui $at, 0x800e +/* 054BD8 80053FD8 3C01800E */ lui $at, %hi(D_800E67A4) # $at, 0x800e /* 054BDC 80053FDC 002F0821 */ addu $at, $at, $t7 -/* 054BE0 80053FE0 8C2F67A4 */ lw $t7, 0x67a4($at) +/* 054BE0 80053FE0 8C2F67A4 */ lw $t7, %lo(D_800E67A4)($at) /* 054BE4 80053FE4 00000000 */ nop /* 054BE8 80053FE8 01E00008 */ jr $t7 /* 054BEC 80053FEC 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80055EC0.s b/asm/non_matchings/unknown_043920/func_80055EC0.s index 8425dcdc..3c6d41f9 100644 --- a/asm/non_matchings/unknown_043920/func_80055EC0.s +++ b/asm/non_matchings/unknown_043920/func_80055EC0.s @@ -308,9 +308,9 @@ glabel func_80055EC0 /* 056F38 80056338 102000B9 */ beqz $at, .L80056620 /* 056F3C 8005633C 0100C825 */ move $t9, $t0 /* 056F40 80056340 0019C880 */ sll $t9, $t9, 2 -/* 056F44 80056344 3C01800E */ lui $at, 0x800e +/* 056F44 80056344 3C01800E */ lui $at, %hi(D_800E6854) # $at, 0x800e /* 056F48 80056348 00390821 */ addu $at, $at, $t9 -/* 056F4C 8005634C 8C396854 */ lw $t9, 0x6854($at) +/* 056F4C 8005634C 8C396854 */ lw $t9, %lo(D_800E6854)($at) /* 056F50 80056350 00000000 */ nop /* 056F54 80056354 03200008 */ jr $t9 /* 056F58 80056358 00000000 */ nop @@ -628,9 +628,9 @@ glabel func_80055EC0 /* 057404 80056804 1020001F */ beqz $at, .L80056884 /* 057408 80056808 E46A0010 */ swc1 $f10, 0x10($v1) /* 05740C 8005680C 000E7080 */ sll $t6, $t6, 2 -/* 057410 80056810 3C01800E */ lui $at, 0x800e +/* 057410 80056810 3C01800E */ lui $at, %hi(D_800E6894) # $at, 0x800e /* 057414 80056814 002E0821 */ addu $at, $at, $t6 -/* 057418 80056818 8C2E6894 */ lw $t6, 0x6894($at) +/* 057418 80056818 8C2E6894 */ lw $t6, %lo(D_800E6894)($at) /* 05741C 8005681C 00000000 */ nop /* 057420 80056820 01C00008 */ jr $t6 /* 057424 80056824 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80057A40.s b/asm/non_matchings/unknown_043920/func_80057A40.s index f79d15a7..e434abbd 100644 --- a/asm/non_matchings/unknown_043920/func_80057A40.s +++ b/asm/non_matchings/unknown_043920/func_80057A40.s @@ -97,9 +97,9 @@ glabel func_80057A40 /* 058798 80057B98 2F010008 */ sltiu $at, $t8, 8 /* 05879C 80057B9C 1020004C */ beqz $at, .L80057CD0 /* 0587A0 80057BA0 0018C080 */ sll $t8, $t8, 2 -/* 0587A4 80057BA4 3C01800E */ lui $at, 0x800e +/* 0587A4 80057BA4 3C01800E */ lui $at, %hi(D_800E68D0) # $at, 0x800e /* 0587A8 80057BA8 00380821 */ addu $at, $at, $t8 -/* 0587AC 80057BAC 8C3868D0 */ lw $t8, 0x68d0($at) +/* 0587AC 80057BAC 8C3868D0 */ lw $t8, %lo(D_800E68D0)($at) /* 0587B0 80057BB0 00000000 */ nop /* 0587B4 80057BB4 03000008 */ jr $t8 /* 0587B8 80057BB8 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index a152a3db..47ebf5de 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -585,9 +585,9 @@ glabel func_8005A6F0 /* 05BB5C 8005AF5C 10200094 */ beqz $at, .L8005B1B0 /* 05BB60 8005AF60 2442D52C */ addiu $v0, %lo(D_8011D52C) # addiu $v0, $v0, -0x2ad4 /* 05BB64 8005AF64 0019C880 */ sll $t9, $t9, 2 -/* 05BB68 8005AF68 3C01800E */ lui $at, 0x800e +/* 05BB68 8005AF68 3C01800E */ lui $at, %hi(D_800E6968) # $at, 0x800e /* 05BB6C 8005AF6C 00390821 */ addu $at, $at, $t9 -/* 05BB70 8005AF70 8C396968 */ lw $t9, 0x6968($at) +/* 05BB70 8005AF70 8C396968 */ lw $t9, %lo(D_800E6968)($at) /* 05BB74 8005AF74 00000000 */ nop /* 05BB78 8005AF78 03200008 */ jr $t9 /* 05BB7C 8005AF7C 00000000 */ nop diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index 4782b6a2..57b4e74f 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -249,9 +249,9 @@ glabel func_8005D820 .L8005DBCC: /* 05E7CC 8005DBCC 1020004F */ beqz $at, .L8005DD0C /* 05E7D0 8005DBD0 00037880 */ sll $t7, $v1, 2 -/* 05E7D4 8005DBD4 3C01800E */ lui $at, 0x800e +/* 05E7D4 8005DBD4 3C01800E */ lui $at, %hi(D_800E6A70) # $at, 0x800e /* 05E7D8 8005DBD8 002F0821 */ addu $at, $at, $t7 -/* 05E7DC 8005DBDC 8C2F6A70 */ lw $t7, 0x6a70($at) +/* 05E7DC 8005DBDC 8C2F6A70 */ lw $t7, %lo(D_800E6A70)($at) /* 05E7E0 8005DBE0 00000000 */ nop /* 05E7E4 8005DBE4 01E00008 */ jr $t7 /* 05E7E8 8005DBE8 00000000 */ nop diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index f35bee2d..962ac2f9 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -264,9 +264,9 @@ glabel func_8005EA90 .L8005EE7C: /* 05FA7C 8005EE7C 1020004F */ beqz $at, .L8005EFBC /* 05FA80 8005EE80 00035880 */ sll $t3, $v1, 2 -/* 05FA84 8005EE84 3C01800E */ lui $at, 0x800e +/* 05FA84 8005EE84 3C01800E */ lui $at, %hi(D_800E6AD0) # $at, 0x800e /* 05FA88 8005EE88 002B0821 */ addu $at, $at, $t3 -/* 05FA8C 8005EE8C 8C2B6AD0 */ lw $t3, 0x6ad0($at) +/* 05FA8C 8005EE8C 8C2B6AD0 */ lw $t3, %lo(D_800E6AD0)($at) /* 05FA90 8005EE90 00000000 */ nop /* 05FA94 8005EE94 01600008 */ jr $t3 /* 05FA98 8005EE98 00000000 */ nop diff --git a/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s index b95db91a..274affe9 100644 --- a/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s @@ -77,9 +77,9 @@ glabel __CSPHandleMIDIMsg /* 063814 80062C14 2DC10061 */ sltiu $at, $t6, 0x61 /* 063818 80062C18 102002EC */ beqz $at, .L800637CC /* 06381C 80062C1C 000E7080 */ sll $t6, $t6, 2 -/* 063820 80062C20 3C01800E */ lui $at, 0x800e +/* 063820 80062C20 3C01800E */ lui $at, %hi(D_800E6CE0) # $at, 0x800e /* 063824 80062C24 002E0821 */ addu $at, $at, $t6 -/* 063828 80062C28 8C2E6CE0 */ lw $t6, 0x6ce0($at) +/* 063828 80062C28 8C2E6CE0 */ lw $t6, %lo(D_800E6CE0)($at) /* 06382C 80062C2C 00000000 */ nop /* 063830 80062C30 01C00008 */ jr $t6 /* 063834 80062C34 00000000 */ nop diff --git a/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s b/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s index 6644f6ae..84b3e8cf 100644 --- a/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s @@ -14,9 +14,9 @@ glabel __CSPHandleNextSeqEvent /* 06366C 80062A6C 2DE10014 */ sltiu $at, $t7, 0x14 /* 063670 80062A70 1020001F */ beqz $at, .L80062AF0 /* 063674 80062A74 000F7880 */ sll $t7, $t7, 2 -/* 063678 80062A78 3C01800E */ lui $at, 0x800e +/* 063678 80062A78 3C01800E */ lui $at, %hi(D_800E6C90) # $at, 0x800e /* 06367C 80062A7C 002F0821 */ addu $at, $at, $t7 -/* 063680 80062A80 8C2F6C90 */ lw $t7, 0x6c90($at) +/* 063680 80062A80 8C2F6C90 */ lw $t7, %lo(D_800E6C90)($at) /* 063684 80062A84 00000000 */ nop /* 063688 80062A88 01E00008 */ jr $t7 /* 06368C 80062A8C 00000000 */ nop diff --git a/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s b/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s index 152dcef5..c87b2c10 100644 --- a/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s +++ b/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s @@ -23,9 +23,9 @@ glabel __CSPVoiceHandler /* 063058 80062458 2DE10018 */ sltiu $at, $t7, 0x18 /* 06305C 8006245C 10200146 */ beqz $at, .L80062978 /* 063060 80062460 000F7880 */ sll $t7, $t7, 2 -/* 063064 80062464 3C01800E */ lui $at, 0x800e +/* 063064 80062464 3C01800E */ lui $at, %hi(D_800E6C30) # $at, 0x800e /* 063068 80062468 002F0821 */ addu $at, $at, $t7 -/* 06306C 8006246C 8C2F6C30 */ lw $t7, 0x6c30($at) +/* 06306C 8006246C 8C2F6C30 */ lw $t7, %lo(D_800E6C30)($at) /* 063070 80062470 00000000 */ nop /* 063074 80062474 01E00008 */ jr $t7 /* 063078 80062478 00000000 */ nop diff --git a/asm/non_matchings/unknown_064830/alFxNew.s b/asm/non_matchings/unknown_064830/alFxNew.s index e690b30d..5b9746e2 100644 --- a/asm/non_matchings/unknown_064830/alFxNew.s +++ b/asm/non_matchings/unknown_064830/alFxNew.s @@ -45,9 +45,9 @@ glabel alFxNew /* 0656B4 80064AB4 1020001C */ beqz $at, .L80064B28 /* 0656B8 80064AB8 2673D028 */ addiu $s3, %lo(D_800DD028) # addiu $s3, $s3, -0x2fd8 /* 0656BC 80064ABC 00094880 */ sll $t1, $t1, 2 -/* 0656C0 80064AC0 3C01800E */ lui $at, 0x800e +/* 0656C0 80064AC0 3C01800E */ lui $at, %hi(D_800E6EA0) # $at, 0x800e /* 0656C4 80064AC4 00290821 */ addu $at, $at, $t1 -/* 0656C8 80064AC8 8C296EA0 */ lw $t1, 0x6ea0($at) +/* 0656C8 80064AC8 8C296EA0 */ lw $t1, %lo(D_800E6EA0)($at) /* 0656CC 80064ACC 00000000 */ nop /* 0656D0 80064AD0 01200008 */ jr $t1 /* 0656D4 80064AD4 00000000 */ nop diff --git a/asm/non_matchings/unknown_064830/alFxParamHdl.s b/asm/non_matchings/unknown_064830/alFxParamHdl.s index 9519152d..00d6eec5 100644 --- a/asm/non_matchings/unknown_064830/alFxParamHdl.s +++ b/asm/non_matchings/unknown_064830/alFxParamHdl.s @@ -8,9 +8,9 @@ glabel alFxParamHdl /* 064BC4 80063FC4 10200093 */ beqz $at, .L80064214 /* 064BC8 80063FC8 00803825 */ move $a3, $a0 /* 064BCC 80063FCC 000E7080 */ sll $t6, $t6, 2 -/* 064BD0 80063FD0 3C01800E */ lui $at, 0x800e +/* 064BD0 80063FD0 3C01800E */ lui $at, %hi(D_800E6E70) # $at, 0x800e /* 064BD4 80063FD4 002E0821 */ addu $at, $at, $t6 -/* 064BD8 80063FD8 8C2E6E70 */ lw $t6, 0x6e70($at) +/* 064BD8 80063FD8 8C2E6E70 */ lw $t6, %lo(D_800E6E70)($at) /* 064BDC 80063FDC 00000000 */ nop /* 064BE0 80063FE0 01C00008 */ jr $t6 /* 064BE4 80063FE4 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index 62904546..80705520 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -158,9 +158,9 @@ glabel func_8006CCF0 /* 06DB38 8006CF38 1020003A */ beqz $at, .L8006D024 /* 06DB3C 8006CF3C AFA20044 */ sw $v0, 0x44($sp) /* 06DB40 8006CF40 000C6080 */ sll $t4, $t4, 2 -/* 06DB44 8006CF44 3C01800E */ lui $at, 0x800e +/* 06DB44 8006CF44 3C01800E */ lui $at, %hi(D_800E7154) # $at, 0x800e /* 06DB48 8006CF48 002C0821 */ addu $at, $at, $t4 -/* 06DB4C 8006CF4C 8C2C7154 */ lw $t4, 0x7154($at) +/* 06DB4C 8006CF4C 8C2C7154 */ lw $t4, %lo(D_800E7154)($at) /* 06DB50 8006CF50 00000000 */ nop /* 06DB54 8006CF54 01800008 */ jr $t4 /* 06DB58 8006CF58 00000000 */ nop @@ -249,9 +249,9 @@ glabel func_8006CCF0 /* 06DC94 8006D094 1020004A */ beqz $at, .L8006D1C0 /* 06DC98 8006D098 AFA20044 */ sw $v0, 0x44($sp) /* 06DC9C 8006D09C 000D6880 */ sll $t5, $t5, 2 -/* 06DCA0 8006D0A0 3C01800E */ lui $at, 0x800e +/* 06DCA0 8006D0A0 3C01800E */ lui $at, %hi(D_800E7188) # $at, 0x800e /* 06DCA4 8006D0A4 002D0821 */ addu $at, $at, $t5 -/* 06DCA8 8006D0A8 8C2D7188 */ lw $t5, 0x7188($at) +/* 06DCA8 8006D0A8 8C2D7188 */ lw $t5, %lo(D_800E7188)($at) /* 06DCAC 8006D0AC 00000000 */ nop /* 06DCB0 8006D0B0 01A00008 */ jr $t5 /* 06DCB4 8006D0B4 00000000 */ nop @@ -612,9 +612,9 @@ glabel func_8006CCF0 /* 06E1D8 8006D5D8 10200095 */ beqz $at, .L8006D830 /* 06E1DC 8006D5DC A2000000 */ sb $zero, ($s0) /* 06E1E0 8006D5E0 0019C880 */ sll $t9, $t9, 2 -/* 06E1E4 8006D5E4 3C01800E */ lui $at, 0x800e +/* 06E1E4 8006D5E4 3C01800E */ lui $at, %hi(D_800E71B8) # $at, 0x800e /* 06E1E8 8006D5E8 00390821 */ addu $at, $at, $t9 -/* 06E1EC 8006D5EC 8C3971B8 */ lw $t9, 0x71b8($at) +/* 06E1EC 8006D5EC 8C3971B8 */ lw $t9, %lo(D_800E71B8)($at) /* 06E1F0 8006D5F0 00000000 */ nop /* 06E1F4 8006D5F4 03200008 */ jr $t9 /* 06E1F8 8006D5F8 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index a9903794..5d7a9d0b 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -121,9 +121,9 @@ glabel func_8006DCF8 /* 06EAC4 8006DEC4 2DC1000E */ sltiu $at, $t6, 0xe /* 06EAC8 8006DEC8 10200085 */ beqz $at, .L8006E0E0 /* 06EACC 8006DECC 000E7080 */ sll $t6, $t6, 2 -/* 06EAD0 8006DED0 3C01800E */ lui $at, 0x800e +/* 06EAD0 8006DED0 3C01800E */ lui $at, %hi(D_800E71D8) # $at, 0x800e /* 06EAD4 8006DED4 002E0821 */ addu $at, $at, $t6 -/* 06EAD8 8006DED8 8C2E71D8 */ lw $t6, 0x71d8($at) +/* 06EAD8 8006DED8 8C2E71D8 */ lw $t6, %lo(D_800E71D8)($at) /* 06EADC 8006DEDC 00000000 */ nop /* 06EAE0 8006DEE0 01C00008 */ jr $t6 /* 06EAE4 8006DEE4 00000000 */ nop diff --git a/asm/non_matchings/unknown_079F50/__scSchedule.s b/asm/non_matchings/unknown_079F50/__scSchedule.s index d400f3b9..a494d917 100644 --- a/asm/non_matchings/unknown_079F50/__scSchedule.s +++ b/asm/non_matchings/unknown_079F50/__scSchedule.s @@ -55,9 +55,9 @@ glabel __scSchedule /* 07AD98 8007A198 2DE10007 */ sltiu $at, $t7, 7 /* 07AD9C 8007A19C 10200041 */ beqz $at, .L8007A2A4 /* 07ADA0 8007A1A0 000F7880 */ sll $t7, $t7, 2 -/* 07ADA4 8007A1A4 3C01800E */ lui $at, 0x800e +/* 07ADA4 8007A1A4 3C01800E */ lui $at, %hi(D_800E7970) # $at, 0x800e /* 07ADA8 8007A1A8 002F0821 */ addu $at, $at, $t7 -/* 07ADAC 8007A1AC 8C2F7970 */ lw $t7, 0x7970($at) +/* 07ADAC 8007A1AC 8C2F7970 */ lw $t7, %lo(D_800E7970)($at) /* 07ADB0 8007A1B0 00000000 */ nop /* 07ADB4 8007A1B4 01E00008 */ jr $t7 /* 07ADB8 8007A1B8 00000000 */ nop diff --git a/asm/non_matchings/unknown_07AF10/func_8007A550.s b/asm/non_matchings/unknown_07AF10/func_8007A550.s index 318983e8..9fd96b03 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A550.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A550.s @@ -16,11 +16,11 @@ glabel func_8007A550 .L8007A584: /* 07B184 8007A584 3C0E8012 */ lui $t6, %hi(D_801262CC) # $t6, 0x8012 /* 07B188 8007A588 8DCE62CC */ lw $t6, %lo(D_801262CC)($t6) -/* 07B18C 8007A58C 3C01800E */ lui $at, 0x800e +/* 07B18C 8007A58C 3C01800E */ lui $at, %hi(D_800E7B0C) # $at, 0x800e /* 07B190 8007A590 31CF0007 */ andi $t7, $t6, 7 /* 07B194 8007A594 000F7880 */ sll $t7, $t7, 2 /* 07B198 8007A598 002F0821 */ addu $at, $at, $t7 -/* 07B19C 8007A59C 8C2F7B0C */ lw $t7, 0x7b0c($at) +/* 07B19C 8007A59C 8C2F7B0C */ lw $t7, %lo(D_800E7B0C)($at) /* 07B1A0 8007A5A0 00000000 */ nop /* 07B1A4 8007A5A4 01E00008 */ jr $t7 /* 07B1A8 8007A5A8 00000000 */ nop diff --git a/data/dkr.data.s b/data/dkr.data.s index 443d5cc9..a1bc8ad1 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -8969,6 +8969,7 @@ glabel D_800E49EC .aligned_text "Don't worry - game should cope OK\n" .aligned_text "WARNING: Attempt to stop NULL sound aborted\n" +glabel D_800E4BB0 .word 0x800035C4 .word 0x80003A0C .word 0x80004090 @@ -9256,6 +9257,8 @@ glabel D_800E514C glabel D_800E5150 .word 0x3EA8F5C3 + +glabel D_800E5154 .word 0x8000D974 .word 0x8000D974 .word 0x8000D974 @@ -9277,6 +9280,8 @@ glabel D_800E5180 glabel D_800E5184 .word 0x3F36C8B4 + +glabel D_800E5188 .word 0x8000E104 .word 0x8000E0E4 .word 0x8000E0F4 @@ -9292,6 +9297,8 @@ glabel D_800E51AC glabel D_800E51B0 .word 0x3F36C8B4 + +glabel D_800E51B4 .word 0x8000ECD8 .word 0x8000EDE0 .word 0x8000EDE0 @@ -9331,6 +9338,8 @@ glabel D_800E51B0 .word 0x8000EDE0 .word 0x8000EDE0 .word 0x8000ED54 + +glabel D_800E5250 .word 0x80010374 .word 0x800105F8 .word 0x800105F8 @@ -9447,6 +9456,8 @@ glabel D_800E51B0 .word 0x800105F8 .word 0x800105F8 .word 0x8001044C + +glabel D_800E5420 .word 0x8001063C .word 0x8001063C .word 0x80010664 @@ -9575,6 +9586,8 @@ glabel D_800E5580 glabel D_800E5584 .word 0x3F7AE148 + +glabel D_800E5588 .word 0x80014B80 .word 0x80014CCC .word 0x80014E18 @@ -9737,6 +9750,8 @@ glabel D_800E5680 glabel D_800E5684 .word 0x9999999A + +glabel D_800E5688 .word 0x80023614 .word 0x800238A8 .word 0x80023808 @@ -9856,6 +9871,8 @@ glabel D_800E5684 .word 0x800238A8 .word 0x800237CC .word 0x80023790 + +glabel D_800E5864 .word 0x80023908 .word 0x80023918 .word 0x80023928 @@ -9974,6 +9991,8 @@ glabel D_800E5684 .word 0x80023DE8 .word 0x80023E18 .word 0x80023CC8 + +glabel D_800E5A3C .word 0x80023E5C .word 0x80023E64 .word 0x80023F40 @@ -10090,6 +10109,8 @@ glabel D_800E5684 .word 0x80023F3C .word 0x80023EEC .word 0x80023F14 + +glabel D_800E5C0C .word 0x80023FA4 .word 0x80023FB8 .word 0x80023FCC @@ -10295,6 +10316,8 @@ glabel D_800E5EB8 glabel D_800E5EBC .word 0x00000000 + +glabel D_800E5EC0 .word 0x8002AB40 .word 0x8002AB40 .word 0x8002AB54 @@ -10369,6 +10392,8 @@ glabel D_800E5F70 .word 0x00000000 .word 0x00000000 .word 0x00000000 + +glabel D_800E5F80 .word 0x80033A70 .word 0x80033AA4 .word 0x80033AE4 @@ -10492,6 +10517,8 @@ glabel D_800E6068 glabel D_800E606C .word 0x00000000 + +glabel D_800E6070 .word 0x80039758 .word 0x80039758 .word 0x80039758 @@ -10513,6 +10540,8 @@ glabel D_800E606C .word 0x80039768 .word 0x80039758 .word 0x80039758 + +glabel D_800E60C4 .word 0x800397BC .word 0x80039978 .word 0x80039AE0 @@ -10633,6 +10662,7 @@ glabel D_800E61B8 glabel D_800E61BC .word 0x9999999A +glabel D_800E61C0; .word 0x8003E66C .word 0x8003E66C .word 0x8003E67C @@ -10687,6 +10717,8 @@ glabel D_800E6220 glabel D_800E6224 .word 0x3FCCCCCD + +glabel D_800E6228; .word 0x80040D30 .word 0x80040E54 .word 0x80040E54 @@ -10711,6 +10743,8 @@ glabel D_800E6250 glabel D_800E6254 .word 0x33333333 + +glabel D_800E6258 .word 0x80042378 .word 0x800426B8 .word 0x80042898 @@ -10818,6 +10852,8 @@ glabel D_800E6310 glabel D_800E6314 .word 0x33333333 + +glabel D_800E6318 .word 0x800446AC .word 0x80044A04 .word 0x80044A04 @@ -10825,6 +10861,8 @@ glabel D_800E6314 .word 0x80044A04 .word 0x80044F54 .word 0x80044A04 + +glabel D_800E6334 .word 0x80044A2C .word 0x80044A44 .word 0x80044A60 @@ -10838,6 +10876,8 @@ glabel D_800E6350 glabel D_800E6354 .word 0x00000000 + +glabel D_800E6358 .word 0x800456A0 .word 0x800456A8 .word 0x800456B0 @@ -10849,6 +10889,8 @@ glabel D_800E6354 glabel D_800E6378 .word 0x49742400 + +glabel D_800E637C .word 0x80045ADC .word 0x80045AF8 .word 0x80045B30 @@ -11005,6 +11047,8 @@ glabel D_800E6464 glabel D_800E6468 .word 0x3DE147AE + +glabel D_800E646C .word 0x80048D40 .word 0x80048D40 .word 0x80048E50 @@ -11226,6 +11270,8 @@ glabel D_800E65A8 glabel D_800E65AC .word 0xC61C4000 + +glabel D_800E65B0 .word 0x8004EB84 .word 0x8004EBBC .word 0x8004EBD8 @@ -11410,6 +11456,8 @@ glabel D_800E66C8 glabel D_800E66CC .word 0x9999999A + +glabel D_800E66D0 .word 0x80052678 .word 0x80052978 .word 0x80052978 @@ -11545,6 +11593,8 @@ glabel D_800E679C glabel D_800E67A0 .word 0x3DCCCCCD + +glabel D_800E67A4 .word 0x80053FF0 .word 0x8005406C .word 0x800540FC @@ -11661,6 +11711,8 @@ glabel D_800E684C glabel D_800E6850 .word 0x44BB8000 + +glabel D_800E6854 .word 0x8005635C .word 0x80056370 .word 0x80056380 @@ -11677,6 +11729,8 @@ glabel D_800E6850 .word 0x800565E0 .word 0x80056600 .word 0x800563EC + +glabel D_800E6894 .word 0x80056828 .word 0x80056834 .word 0x80056840 @@ -11698,6 +11752,8 @@ glabel D_800E68C8 glabel D_800E68CC .word 0x3CCCCCCD + +glabel D_800E68D0 .word 0x80057BBC .word 0x80057BE4 .word 0x80057CD0 @@ -11794,6 +11850,8 @@ glabel D_800E6960 glabel D_800E6964 .word 0x00000000 + +glabel D_800E6968 .word 0x8005AF80 .word 0x8005AFD8 .word 0x8005B004 @@ -11952,6 +12010,8 @@ glabel D_800E6A68 glabel D_800E6A6C .word 0xCCCCCCCD + +glabel D_800E6A70 .word 0x8005DBEC .word 0x8005DC10 .word 0x8005DC48 @@ -12012,6 +12072,8 @@ glabel D_800E6AC8 glabel D_800E6ACC .word 0xCCCCCCCD + +glabel D_800E6AD0 .word 0x8005EE9C .word 0x8005EEC0 .word 0x8005EEF8 @@ -12065,6 +12127,7 @@ glabel D_800E6B14 .aligned_text "CSP: oh oh \n" +glabel D_800E6C30 .word 0x8006247C .word 0x80062978 .word 0x800626F8 @@ -12089,6 +12152,8 @@ glabel D_800E6B14 .word 0x800626F8 .word 0x80062564 .word 0x80062668 + +glabel D_800E6C90 .word 0x80062A90 .word 0x80062AF0 .word 0x80062AA8 @@ -12109,6 +12174,8 @@ glabel D_800E6B14 .word 0x80062AE8 .word 0x80062AE8 .word 0x80062AE8 + +glabel D_800E6CE0 .word 0x80063068 .word 0x800637CC .word 0x800637CC @@ -12209,6 +12276,8 @@ glabel D_800E6B14 .word 0x00000000 .word 0x00000000 .word 0x00000000 + +glabel D_800E6E70 .word 0x80063FE8 .word 0x8006401C .word 0x8006407C @@ -12226,6 +12295,7 @@ glabel D_800E6E94 .word 0x00000000 .word 0x00000000 +glabel D_800E6EA0 .word 0x80064AD8 .word 0x80064AE4 .word 0x80064AFC @@ -12310,6 +12380,7 @@ glabel D_800E7134 .aligned_text "PLN" .aligned_text "Swapping\n" +glabel D_800E7154 .word 0x8006CF68 .word 0x8006CF5C .word 0x8006D024 @@ -12323,6 +12394,8 @@ glabel D_800E7134 .word 0x8006CFEC .word 0x8006D000 .word 0x8006D014 + +glabel D_800E7188 .word 0x8006D0B8 .word 0x8006D0C4 .word 0x8006D108 @@ -12335,6 +12408,8 @@ glabel D_800E7134 .word 0x8006D1C0 .word 0x8006D1C0 .word 0x8006D164 + +glabel D_800E71B8 .word 0x8006D5FC .word 0x8006D614 .word 0x8006D62C @@ -12347,6 +12422,8 @@ glabel D_800E7134 .word 0x8006E00C .word 0x8006E054 .word 0x8006E0E0 + +glabel D_800E71D8 .word 0x8006DEE8 .word 0x8006E0E0 .word 0x8006E0E0 @@ -12530,6 +12607,8 @@ glabel D_800E77F4 glabel D_800E796C .word 0x48E4E1C0 + +glabel D_800E7970 .word 0x8007A2A4 .word 0x8007A248 .word 0x8007A1BC @@ -12560,6 +12639,7 @@ glabel D_800E7B04 glabel D_800E7B08 .word 0x3FAAAAAB +glabel D_800E7B0C .word 0x8007A5AC .word 0x8007A5D0 .word 0x8007A658 diff --git a/undefined_syms.txt b/undefined_syms.txt index fc8c3371..9a51ae94 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -801,6 +801,7 @@ D_800E49E0 = 0x800E49E0; D_800E49E4 = 0x800E49E4; D_800E49E8 = 0x800E49E8; D_800E49EC = 0x800E49EC; +D_800E4BB0 = 0x800E4BB0; D_800E4BF0 = 0x800E4BF0; D_800E4BF8 = 0x800E4BF8; D_800E4BFC = 0x800E4BFC; @@ -878,12 +879,17 @@ 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; @@ -903,6 +909,7 @@ D_800E5578 = 0x800E5578; D_800E557C = 0x800E557C; D_800E5580 = 0x800E5580; D_800E5584 = 0x800E5584; +D_800E5588 = 0x800E5588; D_800E55B8 = 0x800E55B8; D_800E55BC = 0x800E55BC; D_800E55C0 = 0x800E55C0; @@ -952,6 +959,10 @@ 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; @@ -978,6 +989,7 @@ D_800E5EB0 = 0x800E5EB0; D_800E5EB4 = 0x800E5EB4; D_800E5EB8 = 0x800E5EB8; D_800E5EBC = 0x800E5EBC; +D_800E5EC0 = 0x800E5EC0; D_800E5F40 = 0x800E5F40; D_800E5F44 = 0x800E5F44; D_800E5F48 = 0x800E5F48; @@ -991,6 +1003,7 @@ D_800E5F64 = 0x800E5F64; D_800E5F68 = 0x800E5F68; D_800E5F6C = 0x800E5F6C; D_800E5F70 = 0x800E5F70; +D_800E5F80 = 0x800E5F80; D_800E5FA0 = 0x800E5FA0; D_800E5FB4 = 0x800E5FB4; D_800E5FC8 = 0x800E5FC8; @@ -1028,6 +1041,8 @@ 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; @@ -1056,6 +1071,7 @@ D_800E61AC = 0x800E61AC; D_800E61B0 = 0x800E61B0; D_800E61B8 = 0x800E61B8; D_800E61BC = 0x800E61BC; +D_800E61C0 = 0x800E61C0; D_800E61F0 = 0x800E61F0; D_800E61F4 = 0x800E61F4; D_800E61F8 = 0x800E61F8; @@ -1070,12 +1086,14 @@ 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; @@ -1109,9 +1127,13 @@ 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; @@ -1160,6 +1182,7 @@ D_800E645C = 0x800E645C; D_800E6460 = 0x800E6460; D_800E6464 = 0x800E6464; D_800E6468 = 0x800E6468; +D_800E646C = 0x800E646C; D_800E6488 = 0x800E6488; D_800E648C = 0x800E648C; D_800E6490 = 0x800E6490; @@ -1230,6 +1253,7 @@ D_800E65A0 = 0x800E65A0; D_800E65A4 = 0x800E65A4; D_800E65A8 = 0x800E65A8; D_800E65AC = 0x800E65AC; +D_800E65B0 = 0x800E65B0; D_800E65E8 = 0x800E65E8; D_800E65EC = 0x800E65EC; D_800E65F0 = 0x800E65F0; @@ -1286,6 +1310,7 @@ D_800E66BC = 0x800E66BC; D_800E66C0 = 0x800E66C0; D_800E66C8 = 0x800E66C8; D_800E66CC = 0x800E66CC; +D_800E66D0 = 0x800E66D0; D_800E66F0 = 0x800E66F0; D_800E66F4 = 0x800E66F4; D_800E66F8 = 0x800E66F8; @@ -1327,6 +1352,7 @@ D_800E6794 = 0x800E6794; D_800E6798 = 0x800E6798; D_800E679C = 0x800E679C; D_800E67A0 = 0x800E67A0; +D_800E67A4 = 0x800E67A4; D_800E67C0 = 0x800E67C0; D_800E67C4 = 0x800E67C4; D_800E67C8 = 0x800E67C8; @@ -1363,9 +1389,12 @@ 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; @@ -1395,6 +1424,7 @@ D_800E6954 = 0x800E6954; D_800E6958 = 0x800E6958; D_800E6960 = 0x800E6960; D_800E6964 = 0x800E6964; +D_800E6968 = 0x800E6968; D_800E69A0 = 0x800E69A0; D_800E69A4 = 0x800E69A4; D_800E69A8 = 0x800E69A8; @@ -1441,6 +1471,7 @@ D_800E6A60 = 0x800E6A60; D_800E6A64 = 0x800E6A64; D_800E6A68 = 0x800E6A68; D_800E6A6C = 0x800E6A6C; +D_800E6A70 = 0x800E6A70; D_800E6A88 = 0x800E6A88; D_800E6A8C = 0x800E6A8C; D_800E6A90 = 0x800E6A90; @@ -1459,6 +1490,7 @@ D_800E6AC0 = 0x800E6AC0; D_800E6AC4 = 0x800E6AC4; D_800E6AC8 = 0x800E6AC8; D_800E6ACC = 0x800E6ACC; +D_800E6AD0 = 0x800E6AD0; D_800E6AE8 = 0x800E6AE8; D_800E6AEC = 0x800E6AEC; D_800E6AF0 = 0x800E6AF0; @@ -1469,8 +1501,13 @@ 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; @@ -1487,6 +1524,10 @@ 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; @@ -1524,10 +1565,12 @@ 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_800E8210 = 0x800E8210;