From a002199f3bfbc5f7a6ccaa5c63aa5df333b74454 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 13:52:28 -0700 Subject: [PATCH] Added glabels for negative offsets --- asm/gzip/gzip_inflate_stored.s | 4 +- .../unknown_005740/func_80006FC8.s | 4 +- .../unknown_00BC20/func_8000B750.s | 12 +-- .../unknown_00BC20/func_8000C8F8.s | 4 +- .../unknown_00BC20/func_8000CC7C.s | 31 ++++---- .../unknown_00BC20/func_8000E2B4.s | 3 +- .../unknown_00BC20/func_8000E4E8.s | 8 +- .../unknown_00BC20/func_8000E79C.s | 4 +- .../unknown_00BC20/func_8000E898.s | 4 +- .../unknown_00BC20/func_800135B8.s | 12 +-- .../unknown_00BC20/func_80013DCC.s | 4 +- .../unknown_0255E0/func_8002581C.s | 8 +- .../unknown_0255E0/func_8002D384.s | 12 +-- .../unknown_0255E0/func_8002D670.s | 12 +-- .../unknown_0255E0/func_8002D8DC.s | 12 +-- .../unknown_032760/func_8003C2E4.s | 8 +- .../unknown_043920/func_80042D20.s | 12 +-- .../unknown_043920/func_8004447C.s | 12 +-- .../unknown_043920/func_80050A28.s | 32 ++++---- .../unknown_043920/func_80059BF0.s | 4 +- .../unknown_043920/func_80059E40.s | 8 +- .../unknown_05CEF0/func_8005CA78.s | 4 +- .../unknown_05F690/func_800619F4.s | 4 +- .../unknown_064830/func_8006492C.s | 4 +- .../unknown_066AA0/func_80068158.s | 4 +- .../unknown_066AA0/func_800682AC.s | 4 +- .../unknown_078050/func_80078190.s | 4 +- .../unknown_07B870/func_8007B374.s | 4 +- .../unknown_080500/DrawMenuText.s | 4 +- .../unknown_080500/MenuCreditsLoop.s | 4 +- asm/non_matchings/unknown_080500/MenuInit.s | 4 +- asm/non_matchings/unknown_080500/MenuLoop.s | 4 +- .../unknown_080500/MenuSaveOptionsLoop.s | 4 +- .../unknown_080500/func_800853D0.s | 4 +- .../unknown_080500/func_80085B9C.s | 4 +- .../unknown_080500/func_800867D4.s | 4 +- .../unknown_080500/func_80086AFC.s | 4 +- .../unknown_080500/func_80087734.s | 12 +-- .../unknown_080500/func_80087F14.s | 4 +- .../unknown_080500/func_800890AC.s | 2 +- .../unknown_080500/func_80092188.s | 4 +- .../unknown_080500/func_80094D28.s | 4 +- .../unknown_080500/func_80095624.s | 4 +- .../unknown_080500/func_80095728.s | 4 +- .../unknown_080500/func_800998E0.s | 2 +- .../unknown_080500/func_8009CFEC.s | 4 +- .../unknown_080500/func_8009D360.s | 4 +- .../unknown_080500/func_8009DB3C.s | 8 +- .../unknown_09F8F0/func_800A0EB4.s | 4 +- .../unknown_09F8F0/func_800A4154.s | 2 +- .../unknown_09F8F0/func_800A4F50.s | 2 +- .../unknown_09F8F0/func_800A6254.s | 4 +- .../unknown_09F8F0/func_800A6E30.s | 4 +- .../unknown_09F8F0/func_800A7B68.s | 2 +- .../unknown_0AEE70/func_800B2040.s | 4 +- .../unknown_0AEE70/func_800B4A40.s | 12 +-- .../unknown_0AEE70/func_800B653C.s | 4 +- .../unknown_0AEE70/func_800B76B8.s | 4 +- .../unknown_0AEE70/func_800B7810.s | 4 +- .../unknown_0B8920/func_800B8C04.s | 8 +- .../unknown_0B8920/func_800BCC70.s | 4 +- .../unknown_0B8920/func_800C01D8.s | 4 +- .../unknown_0B8920/func_800C0494.s | 4 +- .../unknown_0B8920/func_800C05C8.s | 4 +- .../unknown_0B8920/func_800C31EC.s | 16 ++-- .../unknown_0B8920/func_800C38B4.s | 4 +- .../unknown_0B8920/func_800C45A4.s | 4 +- asm/unknown_070110/func_8006F564.s | 8 +- data/dkr.data.s | 77 +++++++++++++++++++ lib/asm/exception/__osException.s | 8 +- .../osEepromRead_0CEE80/osEepromRead.s | 4 +- .../osEepromWrite_0CF180/osEepromWrite.s | 4 +- .../unknown_0CA530/osSetIntMask.s | 4 +- .../unknown_0CA9A0/alEnvMixerPull.s | 4 +- .../unknown_0CA9A0/alResampleParam.s | 4 +- .../unknown_0CD820/func_800CCFE0.s | 4 +- .../unknown_0CE370/__osContRamWrite.s | 4 +- .../unknown_0CE8A0/__osContRamRead.s | 4 +- .../unknown_0CF070/__osPackEepReadData.s | 4 +- .../unknown_0CF330/__osPackEepWriteData.s | 4 +- .../unknown_0D3160/__osDevMgrMain.s | 4 +- .../non_matchings/unknown_0D43F0/_Printf.s | 4 +- .../non_matchings/unknown_0D43F0/_Putfld.s | 4 +- src/unknown_00BC20.c | 21 +++-- src/unknown_032760.c | 12 ++- src/unknown_043920.c | 47 +++++++---- tools/python/find_glabels.py | 6 +- undefined_syms.txt | 59 ++++++++++++++ 88 files changed, 444 insertions(+), 266 deletions(-) diff --git a/asm/gzip/gzip_inflate_stored.s b/asm/gzip/gzip_inflate_stored.s index 66c96937..47aca107 100644 --- a/asm/gzip/gzip_inflate_stored.s +++ b/asm/gzip/gzip_inflate_stored.s @@ -70,7 +70,7 @@ glabel gzip_inflate_stored /* 0C7C28 800C7028 AC2E376C */ sw $t6, %lo(gzip_inflate_output)($at) /* 0C7C2C 800C702C 3C018013 */ lui $at, %hi(gzip_bit_buffer) # $at, 0x8013 /* 0C7C30 800C7030 AC2CAAD0 */ sw $t4, %lo(gzip_bit_buffer)($at) -/* 0C7C34 800C7034 3C018013 */ lui $at, 0x8013 +/* 0C7C34 800C7034 3C018013 */ lui $at, %hi(gzip_num_bits) # $at, 0x8013 /* 0C7C38 800C7038 03E00008 */ jr $ra -/* 0C7C3C 800C703C AC2DAAD4 */ sw $t5, -0x552c($at) +/* 0C7C3C 800C703C AC2DAAD4 */ sw $t5, %lo(gzip_num_bits)($at) diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index a92ab216..4e051b36 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -1085,9 +1085,9 @@ glabel func_80006FC8 /* 008B74 80007F74 27BD00C8 */ addiu $sp, $sp, 0xc8 /* 008B78 80007F78 240E0001 */ li $t6, 1 -/* 008B7C 80007F7C 3C01800E */ lui $at, 0x800e +/* 008B7C 80007F7C 3C01800E */ lui $at, %hi(D_800DC6D0) # $at, 0x800e /* 008B80 80007F80 03E00008 */ jr $ra -/* 008B84 80007F84 A02EC6D0 */ sb $t6, -0x3930($at) +/* 008B84 80007F84 A02EC6D0 */ sb $t6, %lo(D_800DC6D0)($at) /* 008B88 80007F88 3C01800E */ lui $at, 0x800e /* 008B8C 80007F8C 03E00008 */ jr $ra diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s index 268c266a..2118aef7 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B750.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s @@ -62,12 +62,12 @@ glabel func_8000B750 /* 00C42C 8000B82C 24620048 */ addiu $v0, $v1, 0x48 .L8000B830: /* 00C430 8000B830 104000A1 */ beqz $v0, .L8000BAB8 -/* 00C434 8000B834 3C018012 */ lui $at, 0x8012 +/* 00C434 8000B834 3C018012 */ lui $at, %hi(D_8011B048) # $at, 0x8012 /* 00C438 8000B838 00300821 */ addu $at, $at, $s0 -/* 00C43C 8000B83C A026B048 */ sb $a2, -0x4fb8($at) -/* 00C440 8000B840 3C018012 */ lui $at, 0x8012 +/* 00C43C 8000B83C A026B048 */ sb $a2, %lo(D_8011B048)($at) +/* 00C440 8000B840 3C018012 */ lui $at, %hi(D_8011B058) # $at, 0x8012 /* 00C444 8000B844 00300821 */ addu $at, $at, $s0 -/* 00C448 8000B848 A025B058 */ sb $a1, -0x4fa8($at) +/* 00C448 8000B848 A025B058 */ sb $a1, %lo(D_8011B058)($at) /* 00C44C 8000B84C 906F0070 */ lbu $t7, 0x70($v1) /* 00C450 8000B850 24010002 */ li $at, 2 /* 00C454 8000B854 15E10070 */ bne $t7, $at, .L8000BA18 @@ -130,13 +130,13 @@ glabel func_8000B750 /* 00C530 8000B930 E7AA0060 */ swc1 $f10, 0x60($sp) /* 00C534 8000B934 C4520008 */ lwc1 $f18, 8($v0) /* 00C538 8000B938 8D190000 */ lw $t9, ($t0) -/* 00C53C 8000B93C 3C18800E */ lui $t8, 0x800e +/* 00C53C 8000B93C 3C18800E */ lui $t8, %hi(D_800DC74C) # $t8, 0x800e /* 00C540 8000B940 00037880 */ sll $t7, $v1, 2 /* 00C544 8000B944 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00C548 8000B948 030FC021 */ addu $t8, $t8, $t7 /* 00C54C 8000B94C 00196880 */ sll $t5, $t9, 2 /* 00C550 8000B950 44818000 */ mtc1 $at, $f16 -/* 00C554 8000B954 8F18C74C */ lw $t8, -0x38b4($t8) +/* 00C554 8000B954 8F18C74C */ lw $t8, %lo(D_800DC74C)($t8) /* 00C558 8000B958 01B96821 */ addu $t5, $t5, $t9 /* 00C55C 8000B95C A7AE0050 */ sh $t6, 0x50($sp) /* 00C560 8000B960 000D6840 */ sll $t5, $t5, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s index ae949dd5..78d7c101 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s @@ -67,7 +67,7 @@ glabel func_8000C8F8 /* 00D5EC 8000C9EC 018D8821 */ addu $s1, $t4, $t5 /* 00D5F0 8000C9F0 244E0010 */ addiu $t6, $v0, 0x10 /* 00D5F4 8000C9F4 018F9021 */ addu $s2, $t4, $t7 -/* 00D5F8 8000C9F8 3C018012 */ lui $at, 0x8012 +/* 00D5F8 8000C9F8 3C018012 */ lui $at, %hi(D_8011AEA8) # $at, 0x8012 /* 00D5FC 8000C9FC ACA20000 */ sw $v0, ($a1) /* 00D600 8000CA00 AE2E0000 */ sw $t6, ($s1) /* 00D604 8000CA04 AE400000 */ sw $zero, ($s2) @@ -76,7 +76,7 @@ glabel func_8000C8F8 /* 00D610 8000CA10 AFA50028 */ sw $a1, 0x28($sp) /* 00D614 8000CA14 24040014 */ li $a0, 20 /* 00D618 8000CA18 0C01DB16 */ jal func_80076C58 -/* 00D61C 8000CA1C AC38AEA8 */ sw $t8, -0x5158($at) +/* 00D61C 8000CA1C AC38AEA8 */ sw $t8, %lo(D_8011AEA8)($at) /* 00D620 8000CA20 8C590000 */ lw $t9, ($v0) /* 00D624 8000CA24 2405FFFF */ li $a1, -1 /* 00D628 8000CA28 00403025 */ move $a2, $v0 diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index f73a9928..8ddce0fe 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -615,15 +615,17 @@ glabel func_8000CC7C /* 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) -/* 00E12C 8000D52C 3C1E800E */ lui $fp, 0x800e +# 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 /* 00E134 8000D534 03CFF021 */ addu $fp, $fp, $t7 -/* 00E138 8000D538 83DEC820 */ lb $fp, -0x37e0($fp) +/* 00E138 8000D538 83DEC820 */ lb $fp, %lo(D_800DC820)($fp) /* 00E13C 8000D53C 10000028 */ b .L8000D5E0 /* 00E140 8000D540 00000000 */ nop .L8000D544: /* 00E144 8000D544 8318AD25 */ lb $t8, %lo(D_8011AD25)($t8) -/* 00E148 8000D548 3C1E800E */ lui $fp, 0x800e +# 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 /* 00E150 8000D550 03CDF021 */ addu $fp, $fp, $t5 /* 00E154 8000D554 83DEC821 */ lb $fp, -0x37df($fp) @@ -671,20 +673,20 @@ glabel func_8000CC7C /* 00E1E8 8000D5E8 86C3000E */ lh $v1, 0xe($s6) /* 00E1EC 8000D5EC 24010002 */ li $at, 2 /* 00E1F0 8000D5F0 17010010 */ bne $t8, $at, .L8000D634 -/* 00E1F4 8000D5F4 3C0D800E */ lui $t5, 0x800e +/* 00E1F4 8000D5F4 3C0D800E */ lui $t5, %hi(D_800DC840) # $t5, 0x800e /* 00E1F8 8000D5F8 01B06821 */ addu $t5, $t5, $s0 -/* 00E1FC 8000D5FC 81ADC840 */ lb $t5, -0x37c0($t5) +/* 00E1FC 8000D5FC 81ADC840 */ lb $t5, %lo(D_800DC840)($t5) /* 00E200 8000D600 001E7080 */ sll $t6, $fp, 2 /* 00E204 8000D604 01DE7021 */ addu $t6, $t6, $fp /* 00E208 8000D608 000DC840 */ sll $t9, $t5, 1 /* 00E20C 8000D60C 000E7880 */ sll $t7, $t6, 2 /* 00E210 8000D610 032FC021 */ addu $t8, $t9, $t7 /* 00E214 8000D614 00146880 */ sll $t5, $s4, 2 -/* 00E218 8000D618 3C02800E */ lui $v0, 0x800e +/* 00E218 8000D618 3C02800E */ lui $v0, %hi(D_800DC7A8) # $v0, 0x800e /* 00E21C 8000D61C 00581021 */ addu $v0, $v0, $t8 /* 00E220 8000D620 01B46823 */ subu $t5, $t5, $s4 /* 00E224 8000D624 000D68C0 */ sll $t5, $t5, 3 -/* 00E228 8000D628 8442C7A8 */ lh $v0, -0x3858($v0) +/* 00E228 8000D628 8442C7A8 */ lh $v0, %lo(D_800DC7A8)($v0) /* 00E22C 8000D62C 1000001A */ b .L8000D698 /* 00E230 8000D630 02ED3821 */ addu $a3, $s7, $t5 .L8000D634: @@ -695,7 +697,7 @@ glabel func_8000CC7C /* 00E244 8000D644 001EC080 */ sll $t8, $fp, 2 /* 00E248 8000D648 031EC021 */ addu $t8, $t8, $fp /* 00E24C 8000D64C 00186880 */ sll $t5, $t8, 2 -/* 00E250 8000D650 3C02800E */ lui $v0, 0x800e +/* 00E250 8000D650 3C02800E */ lui $v0, %hi(D_800DC7A8) # $v0, 0x800e /* 00E254 8000D654 00007012 */ mflo $t6 /* 00E258 8000D658 02EE3821 */ addu $a3, $s7, $t6 /* 00E25C 8000D65C 80F90059 */ lb $t9, 0x59($a3) @@ -703,11 +705,12 @@ glabel func_8000CC7C /* 00E264 8000D664 00197840 */ sll $t7, $t9, 1 /* 00E268 8000D668 01ED7021 */ addu $t6, $t7, $t5 /* 00E26C 8000D66C 004E1021 */ addu $v0, $v0, $t6 -/* 00E270 8000D670 8442C7A8 */ lh $v0, -0x3858($v0) +/* 00E270 8000D670 8442C7A8 */ lh $v0, %lo(D_800DC7A8)($v0) /* 00E274 8000D674 10000009 */ b .L8000D69C /* 00E278 8000D678 304F0100 */ andi $t7, $v0, 0x100 .L8000D67C: -/* 00E27C 8000D67C 3C02800E */ lui $v0, 0x800e +# Indexing into D_800DC7B8 starting at index 37? +/* 00E27C 8000D67C 3C02800E */ lui $v0, %hi(D_800DC7B8) # $v0, 0x800e /* 00E280 8000D680 0014C080 */ sll $t8, $s4, 2 /* 00E284 8000D684 0314C023 */ subu $t8, $t8, $s4 /* 00E288 8000D688 00591021 */ addu $v0, $v0, $t9 @@ -1046,9 +1049,9 @@ glabel func_8000CC7C /* 00E73C 8000DB3C 000D7080 */ sll $t6, $t5, 2 /* 00E740 8000DB40 0019C040 */ sll $t8, $t9, 1 /* 00E744 8000DB44 030EC821 */ addu $t9, $t8, $t6 -/* 00E748 8000DB48 3C02800E */ lui $v0, 0x800e +/* 00E748 8000DB48 3C02800E */ lui $v0, %hi(D_800DC7A8) # $v0, 0x800e /* 00E74C 8000DB4C 00591021 */ addu $v0, $v0, $t9 -/* 00E750 8000DB50 8442C7A8 */ lh $v0, -0x3858($v0) +/* 00E750 8000DB50 8442C7A8 */ lh $v0, %lo(D_800DC7A8)($v0) /* 00E754 8000DB54 02C02025 */ move $a0, $s6 /* 00E758 8000DB58 304F0100 */ andi $t7, $v0, 0x100 /* 00E75C 8000DB5C 000F6843 */ sra $t5, $t7, 1 @@ -1090,12 +1093,12 @@ glabel func_8000CC7C /* 00E7E8 8000DBE8 10400029 */ beqz $v0, .L8000DC90 /* 00E7EC 8000DBEC 3C188012 */ lui $t8, %hi(D_8011AE84) # $t8, 0x8012 /* 00E7F0 8000DBF0 8718AE84 */ lh $t8, %lo(D_8011AE84)($t8) -/* 00E7F4 8000DBF4 3C02800E */ lui $v0, 0x800e +/* 00E7F4 8000DBF4 3C02800E */ lui $v0, %hi(D_800DC7B8) # $v0, 0x800e /* 00E7F8 8000DBF8 00187080 */ sll $t6, $t8, 2 /* 00E7FC 8000DBFC 01D87021 */ addu $t6, $t6, $t8 /* 00E800 8000DC00 000EC880 */ sll $t9, $t6, 2 /* 00E804 8000DC04 00591021 */ addu $v0, $v0, $t9 -/* 00E808 8000DC08 8442C7B8 */ lh $v0, -0x3848($v0) +/* 00E808 8000DC08 8442C7B8 */ lh $v0, %lo(D_800DC7B8)($v0) /* 00E80C 8000DC0C 02C02025 */ move $a0, $s6 /* 00E810 8000DC10 304F0100 */ andi $t7, $v0, 0x100 /* 00E814 8000DC14 000F6843 */ sra $t5, $t7, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index 00d8379f..e995fcb1 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -34,7 +34,8 @@ glabel func_8000E2B4 /* 00EF34 8000E334 00000000 */ nop .L8000E338: /* 00EF38 8000E338 00046040 */ sll $t4, $a0, 1 -/* 00EF3C 8000E33C 3C03800E */ lui $v1, 0x800e +# Indexing into D_800DC7B8 starting at index 37? +/* 00EF3C 8000E33C 3C03800E */ lui $v1, %hi(D_800DC7B8) # $v1, 0x800e /* 00EF40 8000E340 006C1821 */ addu $v1, $v1, $t4 /* 00EF44 8000E344 8463C802 */ lh $v1, -0x37fe($v1) /* 00EF48 8000E348 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000E4E8.s b/asm/non_matchings/unknown_00BC20/func_8000E4E8.s index 2a7123d6..27ad212e 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E4E8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E4E8.s @@ -1,19 +1,19 @@ glabel func_8000E4E8 /* 00F0E8 8000E4E8 00041880 */ sll $v1, $a0, 2 -/* 00F0EC 8000E4EC 3C028012 */ lui $v0, 0x8012 +/* 00F0EC 8000E4EC 3C028012 */ lui $v0, %hi(D_8011AEB0) # $v0, 0x8012 /* 00F0F0 8000E4F0 3C0E8012 */ lui $t6, %hi(D_8011AEA0) # $t6, 0x8012 /* 00F0F4 8000E4F4 00431021 */ addu $v0, $v0, $v1 /* 00F0F8 8000E4F8 25CEAEA0 */ addiu $t6, %lo(D_8011AEA0) # addiu $t6, $t6, -0x5160 -/* 00F0FC 8000E4FC 8C42AEB0 */ lw $v0, -0x5150($v0) +/* 00F0FC 8000E4FC 8C42AEB0 */ lw $v0, %lo(D_8011AEB0)($v0) /* 00F100 8000E500 006E2821 */ addu $a1, $v1, $t6 /* 00F104 8000E504 8CAF0000 */ lw $t7, ($a1) -/* 00F108 8000E508 3C198012 */ lui $t9, 0x8012 +/* 00F108 8000E508 3C198012 */ lui $t9, %hi(D_8011AE98) # $t9, 0x8012 /* 00F10C 8000E50C AC40000C */ sw $zero, 0xc($v0) /* 00F110 8000E510 AC400008 */ sw $zero, 8($v0) /* 00F114 8000E514 AC400004 */ sw $zero, 4($v0) /* 00F118 8000E518 AC4F0000 */ sw $t7, ($v0) /* 00F11C 8000E51C 0323C821 */ addu $t9, $t9, $v1 -/* 00F120 8000E520 8F39AE98 */ lw $t9, -0x5168($t9) +/* 00F120 8000E520 8F39AE98 */ lw $t9, %lo(D_8011AE98)($t9) /* 00F124 8000E524 8CB80000 */ lw $t8, ($a1) /* 00F128 8000E528 24020010 */ li $v0, 16 /* 00F12C 8000E52C 00003825 */ move $a3, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_8000E79C.s b/asm/non_matchings/unknown_00BC20/func_8000E79C.s index 01b254bb..05e6e641 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E79C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E79C.s @@ -4,13 +4,13 @@ glabel func_8000E79C /* 00F3A4 8000E7A4 3C188012 */ lui $t8, %hi(D_8011AEA0) # $t8, 0x8012 /* 00F3A8 8000E7A8 00064080 */ sll $t0, $a2, 2 /* 00F3AC 8000E7AC 2718AEA0 */ addiu $t8, %lo(D_8011AEA0) # addiu $t8, $t8, -0x5160 -/* 00F3B0 8000E7B0 3C0D8012 */ lui $t5, 0x8012 +/* 00F3B0 8000E7B0 3C0D8012 */ lui $t5, %hi(D_8011AEB0) # $t5, 0x8012 /* 00F3B4 8000E7B4 90820001 */ lbu $v0, 1($a0) /* 00F3B8 8000E7B8 90A30001 */ lbu $v1, 1($a1) /* 00F3BC 8000E7BC 01A86821 */ addu $t5, $t5, $t0 /* 00F3C0 8000E7C0 01184821 */ addu $t1, $t0, $t8 /* 00F3C4 8000E7C4 8D390000 */ lw $t9, ($t1) -/* 00F3C8 8000E7C8 8DADAEB0 */ lw $t5, -0x5150($t5) +/* 00F3C8 8000E7C8 8DADAEB0 */ lw $t5, %lo(D_8011AEB0)($t5) /* 00F3CC 8000E7CC 304E003F */ andi $t6, $v0, 0x3f /* 00F3D0 8000E7D0 306F003F */ andi $t7, $v1, 0x3f /* 00F3D4 8000E7D4 01EE082A */ slt $at, $t7, $t6 diff --git a/asm/non_matchings/unknown_00BC20/func_8000E898.s b/asm/non_matchings/unknown_00BC20/func_8000E898.s index c37a9ed5..55746447 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E898.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E898.s @@ -4,10 +4,10 @@ glabel func_8000E898 /* 00F4A0 8000E8A0 00053080 */ sll $a2, $a1, 2 /* 00F4A4 8000E8A4 90820001 */ lbu $v0, 1($a0) /* 00F4A8 8000E8A8 00CF3821 */ addu $a3, $a2, $t7 -/* 00F4AC 8000E8AC 3C188012 */ lui $t8, 0x8012 +/* 00F4AC 8000E8AC 3C188012 */ lui $t8, %hi(D_8011AE98) # $t8, 0x8012 /* 00F4B0 8000E8B0 8CE80000 */ lw $t0, ($a3) /* 00F4B4 8000E8B4 0306C021 */ addu $t8, $t8, $a2 -/* 00F4B8 8000E8B8 8F18AE98 */ lw $t8, -0x5168($t8) +/* 00F4B8 8000E8B8 8F18AE98 */ lw $t8, %lo(D_8011AE98)($t8) /* 00F4BC 8000E8BC 304E003F */ andi $t6, $v0, 0x3f /* 00F4C0 8000E8C0 010EC821 */ addu $t9, $t0, $t6 /* 00F4C4 8000E8C4 01C01025 */ move $v0, $t6 diff --git a/asm/non_matchings/unknown_00BC20/func_800135B8.s b/asm/non_matchings/unknown_00BC20/func_800135B8.s index 41061444..7a8e2b3e 100644 --- a/asm/non_matchings/unknown_00BC20/func_800135B8.s +++ b/asm/non_matchings/unknown_00BC20/func_800135B8.s @@ -4,11 +4,11 @@ glabel func_800135B8 /* 0141C0 800135C0 AFB10020 */ sw $s1, 0x20($sp) /* 0141C4 800135C4 AFB0001C */ sw $s0, 0x1c($sp) /* 0141C8 800135C8 8C90007C */ lw $s0, 0x7c($a0) -/* 0141CC 800135CC 3C028012 */ lui $v0, 0x8012 +/* 0141CC 800135CC 3C028012 */ lui $v0, %hi(D_8011B048) # $v0, 0x8012 /* 0141D0 800135D0 00107703 */ sra $t6, $s0, 0x1c /* 0141D4 800135D4 31D0000F */ andi $s0, $t6, 0xf /* 0141D8 800135D8 00501021 */ addu $v0, $v0, $s0 -/* 0141DC 800135DC 9042B048 */ lbu $v0, -0x4fb8($v0) +/* 0141DC 800135DC 9042B048 */ lbu $v0, %lo(D_8011B048)($v0) /* 0141E0 800135E0 8C910064 */ lw $s1, 0x64($a0) /* 0141E4 800135E4 10400006 */ beqz $v0, .L80013600 /* 0141E8 800135E8 00802825 */ move $a1, $a0 @@ -146,20 +146,20 @@ glabel func_800135B8 /* 0143E0 800137E0 8C84B008 */ lw $a0, %lo(D_8011B008)($a0) /* 0143E4 800137E4 00037B83 */ sra $t7, $v1, 0xe /* 0143E8 800137E8 31F83FFF */ andi $t8, $t7, 0x3fff -/* 0143EC 800137EC 3C0E800E */ lui $t6, 0x800e +/* 0143EC 800137EC 3C0E800E */ lui $t6, %hi(D_800DC74C) # $t6, 0x800e /* 0143F0 800137F0 00046080 */ sll $t4, $a0, 2 /* 0143F4 800137F4 01CC7021 */ addu $t6, $t6, $t4 /* 0143F8 800137F8 0018C880 */ sll $t9, $t8, 2 -/* 0143FC 800137FC 8DCEC74C */ lw $t6, -0x38b4($t6) +/* 0143FC 800137FC 8DCEC74C */ lw $t6, %lo(D_800DC74C)($t6) /* 014400 80013800 0338C821 */ addu $t9, $t9, $t8 /* 014404 80013804 0019C840 */ sll $t9, $t9, 1 /* 014408 80013808 01802025 */ move $a0, $t4 -/* 01440C 8001380C 3C0C800E */ lui $t4, 0x800e +/* 01440C 8001380C 3C0C800E */ lui $t4, %hi(D_800DC754) # $t4, 0x800e /* 014410 80013810 01D94021 */ addu $t0, $t6, $t9 /* 014414 80013814 01846021 */ addu $t4, $t4, $a0 /* 014418 80013818 010B3021 */ addu $a2, $t0, $t3 /* 01441C 8001381C 306D3FFF */ andi $t5, $v1, 0x3fff -/* 014420 80013820 8D8CC754 */ lw $t4, -0x38ac($t4) +/* 014420 80013820 8D8CC754 */ lw $t4, %lo(D_800DC754)($t4) /* 014424 80013824 8E020000 */ lw $v0, ($s0) /* 014428 80013828 000D7900 */ sll $t7, $t5, 4 /* 01442C 8001382C 30CE0006 */ andi $t6, $a2, 6 diff --git a/asm/non_matchings/unknown_00BC20/func_80013DCC.s b/asm/non_matchings/unknown_00BC20/func_80013DCC.s index e5bb4711..5831bdd9 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013DCC.s +++ b/asm/non_matchings/unknown_00BC20/func_80013DCC.s @@ -8,12 +8,12 @@ glabel func_80013DCC /* 0149E4 80013DE4 AFA60060 */ sw $a2, 0x60($sp) /* 0149E8 80013DE8 AFA70064 */ sw $a3, 0x64($sp) /* 0149EC 80013DEC 8CEB0064 */ lw $t3, 0x64($a3) -/* 0149F0 80013DF0 3C188012 */ lui $t8, 0x8012 +/* 0149F0 80013DF0 3C188012 */ lui $t8, %hi(D_8011B07B) # $t8, 0x8012 /* 0149F4 80013DF4 81680002 */ lb $t0, 2($t3) /* 0149F8 80013DF8 3C10800E */ lui $s0, %hi(D_800DC764) # $s0, 0x800e /* 0149FC 80013DFC 00087880 */ sll $t7, $t0, 2 /* 014A00 80013E00 030FC021 */ addu $t8, $t8, $t7 -/* 014A04 80013E04 9318B07B */ lbu $t8, -0x4f85($t8) +/* 014A04 80013E04 9318B07B */ lbu $t8, %lo(D_8011B07B)($t8) /* 014A08 80013E08 2610C764 */ addiu $s0, %lo(D_800DC764) # addiu $s0, $s0, -0x389c /* 014A0C 80013E0C 1300009C */ beqz $t8, .L80014080 /* 014A10 80013E10 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_8002581C.s b/asm/non_matchings/unknown_0255E0/func_8002581C.s index 7b01b41e..3a7450b4 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002581C.s +++ b/asm/non_matchings/unknown_0255E0/func_8002581C.s @@ -344,17 +344,17 @@ glabel func_8002581C /* 026938 80025D38 2484D4B4 */ addiu $a0, %lo(D_8011D4B4) # addiu $a0, $a0, -0x2b4c /* 02693C 80025D3C 80820000 */ lb $v0, ($a0) /* 026940 80025D40 8D0C0000 */ lw $t4, ($t0) -/* 026944 80025D44 3C188012 */ lui $t8, 0x8012 +/* 026944 80025D44 3C188012 */ lui $t8, %hi(D_8011D480) # $t8, 0x8012 /* 026948 80025D48 00021880 */ sll $v1, $v0, 2 /* 02694C 80025D4C 0303C021 */ addu $t8, $t8, $v1 -/* 026950 80025D50 8F18D480 */ lw $t8, -0x2b80($t8) +/* 026950 80025D50 8F18D480 */ lw $t8, %lo(D_8011D480)($t8) /* 026954 80025D54 85930000 */ lh $s3, ($t4) /* 026958 80025D58 3C0E8012 */ lui $t6, %hi(D_8011B0A8) # $t6, 0x8012 -/* 02695C 80025D5C 3C0A8012 */ lui $t2, 0x8012 +/* 02695C 80025D5C 3C0A8012 */ lui $t2, %hi(D_8011D490) # $t2, 0x8012 /* 026960 80025D60 8DCEB0A8 */ lw $t6, %lo(D_8011B0A8)($t6) /* 026964 80025D64 3C018012 */ lui $at, %hi(D_8011B0A8) # $at, 0x8012 /* 026968 80025D68 01435021 */ addu $t2, $t2, $v1 -/* 02696C 80025D6C 8D4AD490 */ lw $t2, -0x2b70($t2) +/* 02696C 80025D6C 8D4AD490 */ lw $t2, %lo(D_8011D490)($t2) /* 026970 80025D70 3C0F8012 */ lui $t7, %hi(D_8011B0AC) # $t7, 0x8012 /* 026974 80025D74 AC38B0A8 */ sw $t8, %lo(D_8011B0A8)($at) /* 026978 80025D78 8DEFB0AC */ lw $t7, %lo(D_8011B0AC)($t7) diff --git a/asm/non_matchings/unknown_0255E0/func_8002D384.s b/asm/non_matchings/unknown_0255E0/func_8002D384.s index 534a43a8..4199dd14 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002D384.s +++ b/asm/non_matchings/unknown_0255E0/func_8002D384.s @@ -37,20 +37,20 @@ glabel func_8002D384 /* 02E010 8002D410 AC990000 */ sw $t9, ($a0) .L8002D414: /* 02E014 8002D414 8C820000 */ lw $v0, ($a0) -/* 02E018 8002D418 3C0E8012 */ lui $t6, 0x8012 +/* 02E018 8002D418 3C0E8012 */ lui $t6, %hi(D_8011D350) # $t6, 0x8012 /* 02E01C 8002D41C 00026880 */ sll $t5, $v0, 2 /* 02E020 8002D420 01CD7021 */ addu $t6, $t6, $t5 -/* 02E024 8002D424 8DCED350 */ lw $t6, -0x2cb0($t6) +/* 02E024 8002D424 8DCED350 */ lw $t6, %lo(D_8011D350)($t6) /* 02E028 8002D428 84F30008 */ lh $s3, 8($a3) -/* 02E02C 8002D42C 3C0F8012 */ lui $t7, 0x8012 +/* 02E02C 8002D42C 3C0F8012 */ lui $t7, %hi(D_8011D320) # $t7, 0x8012 /* 02E030 8002D430 01ED7821 */ addu $t7, $t7, $t5 /* 02E034 8002D434 AE8E0000 */ sw $t6, ($s4) -/* 02E038 8002D438 8DEFD320 */ lw $t7, -0x2ce0($t7) +/* 02E038 8002D438 8DEFD320 */ lw $t7, %lo(D_8011D320)($t7) /* 02E03C 8002D43C 3C018012 */ lui $at, %hi(D_8011D330) # $at, 0x8012 -/* 02E040 8002D440 3C188012 */ lui $t8, 0x8012 +/* 02E040 8002D440 3C188012 */ lui $t8, %hi(D_8011D338) # $t8, 0x8012 /* 02E044 8002D444 030DC021 */ addu $t8, $t8, $t5 /* 02E048 8002D448 AC2FD330 */ sw $t7, %lo(D_8011D330)($at) -/* 02E04C 8002D44C 8F18D338 */ lw $t8, -0x2cc8($t8) +/* 02E04C 8002D44C 8F18D338 */ lw $t8, %lo(D_8011D338)($t8) /* 02E050 8002D450 8E990000 */ lw $t9, ($s4) /* 02E054 8002D454 3C178012 */ lui $s7, %hi(D_8011D348) # $s7, 0x8012 /* 02E058 8002D458 26F7D348 */ addiu $s7, %lo(D_8011D348) # addiu $s7, $s7, -0x2cb8 diff --git a/asm/non_matchings/unknown_0255E0/func_8002D670.s b/asm/non_matchings/unknown_0255E0/func_8002D670.s index 33dfe6cb..4619a57e 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002D670.s +++ b/asm/non_matchings/unknown_0255E0/func_8002D670.s @@ -51,22 +51,22 @@ glabel func_8002D670 /* 02E334 8002D734 00000000 */ nop .L8002D738: /* 02E338 8002D738 8E020000 */ lw $v0, ($s0) -/* 02E33C 8002D73C 3C198012 */ lui $t9, 0x8012 +/* 02E33C 8002D73C 3C198012 */ lui $t9, %hi(D_8011D350) # $t9, 0x8012 /* 02E340 8002D740 0002C080 */ sll $t8, $v0, 2 /* 02E344 8002D744 0338C821 */ addu $t9, $t9, $t8 -/* 02E348 8002D748 8F39D350 */ lw $t9, -0x2cb0($t9) +/* 02E348 8002D748 8F39D350 */ lw $t9, %lo(D_8011D350)($t9) /* 02E34C 8002D74C 3C138012 */ lui $s3, %hi(D_8011D360) # $s3, 0x8012 /* 02E350 8002D750 2673D360 */ addiu $s3, %lo(D_8011D360) # addiu $s3, $s3, -0x2ca0 -/* 02E354 8002D754 3C0D8012 */ lui $t5, 0x8012 +/* 02E354 8002D754 3C0D8012 */ lui $t5, %hi(D_8011D320) # $t5, 0x8012 /* 02E358 8002D758 01B86821 */ addu $t5, $t5, $t8 /* 02E35C 8002D75C AE790000 */ sw $t9, ($s3) -/* 02E360 8002D760 8DADD320 */ lw $t5, -0x2ce0($t5) +/* 02E360 8002D760 8DADD320 */ lw $t5, %lo(D_8011D320)($t5) /* 02E364 8002D764 3C158012 */ lui $s5, %hi(D_8011D330) # $s5, 0x8012 /* 02E368 8002D768 26B5D330 */ addiu $s5, %lo(D_8011D330) # addiu $s5, $s5, -0x2cd0 -/* 02E36C 8002D76C 3C0E8012 */ lui $t6, 0x8012 +/* 02E36C 8002D76C 3C0E8012 */ lui $t6, %hi(D_8011D338) # $t6, 0x8012 /* 02E370 8002D770 01D87021 */ addu $t6, $t6, $t8 /* 02E374 8002D774 AEAD0000 */ sw $t5, ($s5) -/* 02E378 8002D778 8DCED338 */ lw $t6, -0x2cc8($t6) +/* 02E378 8002D778 8DCED338 */ lw $t6, %lo(D_8011D338)($t6) /* 02E37C 8002D77C 3C168012 */ lui $s6, %hi(D_8011D348) # $s6, 0x8012 /* 02E380 8002D780 8FAF0044 */ lw $t7, 0x44($sp) /* 02E384 8002D784 26D6D348 */ addiu $s6, %lo(D_8011D348) # addiu $s6, $s6, -0x2cb8 diff --git a/asm/non_matchings/unknown_0255E0/func_8002D8DC.s b/asm/non_matchings/unknown_0255E0/func_8002D8DC.s index e1245e71..eec621d1 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002D8DC.s +++ b/asm/non_matchings/unknown_0255E0/func_8002D8DC.s @@ -30,19 +30,19 @@ glabel func_8002D8DC /* 02E54C 8002D94C AC780000 */ sw $t8, ($v1) .L8002D950: /* 02E550 8002D950 8C620000 */ lw $v0, ($v1) -/* 02E554 8002D954 3C088012 */ lui $t0, 0x8012 +/* 02E554 8002D954 3C088012 */ lui $t0, %hi(D_8011D320) # $t0, 0x8012 /* 02E558 8002D958 0002C880 */ sll $t9, $v0, 2 /* 02E55C 8002D95C 01194021 */ addu $t0, $t0, $t9 -/* 02E560 8002D960 8D08D320 */ lw $t0, -0x2ce0($t0) -/* 02E564 8002D964 3C098012 */ lui $t1, 0x8012 +/* 02E560 8002D960 8D08D320 */ lw $t0, %lo(D_8011D320)($t0) +/* 02E564 8002D964 3C098012 */ lui $t1, %hi(D_8011D338) # $t1, 0x8012 /* 02E568 8002D968 3C018012 */ lui $at, %hi(D_8011D330) # $at, 0x8012 /* 02E56C 8002D96C 01394821 */ addu $t1, $t1, $t9 -/* 02E570 8002D970 8D29D338 */ lw $t1, -0x2cc8($t1) -/* 02E574 8002D974 3C0A8012 */ lui $t2, 0x8012 +/* 02E570 8002D970 8D29D338 */ lw $t1, %lo(D_8011D338)($t1) +/* 02E574 8002D974 3C0A8012 */ lui $t2, %hi(D_8011D350) # $t2, 0x8012 /* 02E578 8002D978 AC28D330 */ sw $t0, %lo(D_8011D330)($at) /* 02E57C 8002D97C 3C018012 */ lui $at, %hi(D_8011D348) # $at, 0x8012 /* 02E580 8002D980 01595021 */ addu $t2, $t2, $t9 -/* 02E584 8002D984 8D4AD350 */ lw $t2, -0x2cb0($t2) +/* 02E584 8002D984 8D4AD350 */ lw $t2, %lo(D_8011D350)($t2) /* 02E588 8002D988 AC29D348 */ sw $t1, %lo(D_8011D348)($at) /* 02E58C 8002D98C 3C018012 */ lui $at, %hi(D_8011D360) # $at, 0x8012 /* 02E590 8002D990 AC2AD360 */ sw $t2, %lo(D_8011D360)($at) diff --git a/asm/non_matchings/unknown_032760/func_8003C2E4.s b/asm/non_matchings/unknown_032760/func_8003C2E4.s index 0d9275ca..524e488a 100644 --- a/asm/non_matchings/unknown_032760/func_8003C2E4.s +++ b/asm/non_matchings/unknown_032760/func_8003C2E4.s @@ -13,16 +13,16 @@ glabel func_8003C2E4 /* 03CF10 8003C310 15C00007 */ bnez $t6, .L8003C330 /* 03CF14 8003C314 00000000 */ nop /* 03CF18 8003C318 904F0016 */ lbu $t7, 0x16($v0) -/* 03CF1C 8003C31C 3C18800E */ lui $t8, 0x800e +/* 03CF1C 8003C31C 3C18800E */ lui $t8, %hi(D_800DCA94) # $t8, 0x800e /* 03CF20 8003C320 030FC021 */ addu $t8, $t8, $t7 -/* 03CF24 8003C324 8318CA94 */ lb $t8, -0x356c($t8) +/* 03CF24 8003C324 8318CA94 */ lb $t8, %lo(D_800DCA94)($t8) /* 03CF28 8003C328 10000007 */ b .L8003C348 /* 03CF2C 8003C32C A238003A */ sb $t8, 0x3a($s1) .L8003C330: /* 03CF30 8003C330 90590016 */ lbu $t9, 0x16($v0) -/* 03CF34 8003C334 3C08800E */ lui $t0, 0x800e +/* 03CF34 8003C334 3C08800E */ lui $t0, %hi(D_800DCA9C) # $t0, 0x800e /* 03CF38 8003C338 01194021 */ addu $t0, $t0, $t9 -/* 03CF3C 8003C33C 8108CA9C */ lb $t0, -0x3564($t0) +/* 03CF3C 8003C33C 8108CA9C */ lb $t0, %lo(D_800DCA9C)($t0) /* 03CF40 8003C340 00000000 */ nop /* 03CF44 8003C344 A228003A */ sb $t0, 0x3a($s1) .L8003C348: diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index c39052e8..e2fd4cda 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -380,9 +380,9 @@ glabel func_80042D20 /* 043EB0 800432B0 45010009 */ bc1t .L800432D8 /* 043EB4 800432B4 00000000 */ nop /* 043EB8 800432B8 860E01AE */ lh $t6, 0x1ae($s0) -/* 043EBC 800432BC 3C18800E */ lui $t8, 0x800e +/* 043EBC 800432BC 3C18800E */ lui $t8, %hi(D_800DCDA0) # $t8, 0x800e /* 043EC0 800432C0 030EC021 */ addu $t8, $t8, $t6 -/* 043EC4 800432C4 8318CDA0 */ lb $t8, -0x3260($t8) +/* 043EC4 800432C4 8318CDA0 */ lb $t8, %lo(D_800DCDA0)($t8) /* 043EC8 800432C8 3C018012 */ lui $at, %hi(D_8011D544) # $at, 0x8012 /* 043ECC 800432CC A21801CA */ sb $t8, 0x1ca($s0) /* 043ED0 800432D0 C420D544 */ lwc1 $f0, %lo(D_8011D544)($at) @@ -572,10 +572,10 @@ glabel func_80042D20 /* 04417C 8004357C A2000172 */ sb $zero, 0x172($s0) .L80043580: /* 044180 80043580 820F01D3 */ lb $t7, 0x1d3($s0) -/* 044184 80043584 3C19800E */ lui $t9, 0x800e +/* 044184 80043584 3C19800E */ lui $t9, %hi(D_800DCD90) # $t9, 0x800e /* 044188 80043588 15E00016 */ bnez $t7, .L800435E4 /* 04418C 8004358C 032AC821 */ addu $t9, $t9, $t2 -/* 044190 80043590 8339CD90 */ lb $t9, -0x3270($t9) +/* 044190 80043590 8339CD90 */ lb $t9, %lo(D_800DCD90)($t9) /* 044194 80043594 24010004 */ li $at, 4 /* 044198 80043598 17210012 */ bne $t9, $at, .L800435E4 /* 04419C 8004359C 00000000 */ nop @@ -826,12 +826,12 @@ glabel func_80042D20 /* 044538 80043938 3C018012 */ lui $at, %hi(D_8011D544) # $at, 0x8012 /* 04453C 8004393C C424D544 */ lwc1 $f4, %lo(D_8011D544)($at) /* 044540 80043940 44808000 */ mtc1 $zero, $f16 -/* 044544 80043944 3C0F800E */ lui $t7, 0x800e +/* 044544 80043944 3C0F800E */ lui $t7, %hi(D_800DCDA8) # $t7, 0x800e /* 044548 80043948 46048032 */ c.eq.s $f16, $f4 /* 04454C 8004394C 01ED7821 */ addu $t7, $t7, $t5 /* 044550 80043950 4500000F */ bc1f .L80043990 /* 044554 80043954 8FA30058 */ lw $v1, 0x58($sp) -/* 044558 80043958 81EFCDA8 */ lb $t7, -0x3258($t7) +/* 044558 80043958 81EFCDA8 */ lb $t7, %lo(D_800DCDA8)($t7) /* 04455C 8004395C 00000000 */ nop /* 044560 80043960 A20F01CA */ sb $t7, 0x1ca($s0) /* 044564 80043964 87A4003C */ lh $a0, 0x3c($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 1f888a4a..7be83839 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -358,11 +358,11 @@ glabel func_8004447C /* 0455B0 800449B0 0500000C */ bltz $t0, .L800449E4 /* 0455B4 800449B4 240F0002 */ li $t7, 2 /* 0455B8 800449B8 82180002 */ lb $t8, 2($s0) -/* 0455BC 800449BC 3C018012 */ lui $at, 0x8012 +/* 0455BC 800449BC 3C018012 */ lui $at, %hi(D_8011D58C) # $at, 0x8012 /* 0455C0 800449C0 A20801CF */ sb $t0, 0x1cf($s0) /* 0455C4 800449C4 00280821 */ addu $at, $at, $t0 /* 0455C8 800449C8 270C0001 */ addiu $t4, $t8, 1 -/* 0455CC 800449CC A02CD58C */ sb $t4, -0x2a74($at) +/* 0455CC 800449CC A02CD58C */ sb $t4, %lo(D_8011D58C)($at) /* 0455D0 800449D0 240D0004 */ li $t5, 4 /* 0455D4 800449D4 240E04B0 */ li $t6, 1200 /* 0455D8 800449D8 A20D01CD */ sb $t5, 0x1cd($s0) @@ -416,9 +416,9 @@ glabel func_8004447C /* 04568C 80044A8C 10000013 */ b .L80044ADC /* 045690 80044A90 A020D58C */ sb $zero, -0x2a74($at) /* 045694 80044A94 820F0002 */ lb $t7, 2($s0) -/* 045698 80044A98 3C198012 */ lui $t9, 0x8012 +/* 045698 80044A98 3C198012 */ lui $t9, %hi(D_8011D58C) # $t9, 0x8012 /* 04569C 80044A9C 032FC821 */ addu $t9, $t9, $t7 -/* 0456A0 80044AA0 8339D58C */ lb $t9, -0x2a74($t9) +/* 0456A0 80044AA0 8339D58C */ lb $t9, %lo(D_8011D58C)($t9) /* 0456A4 80044AA4 00000000 */ nop /* 0456A8 80044AA8 13200005 */ beqz $t9, .L80044AC0 /* 0456AC 80044AAC 00000000 */ nop @@ -785,9 +785,9 @@ glabel func_8004447C /* 045BCC 80044FCC 11A10005 */ beq $t5, $at, .L80044FE4 /* 045BD0 80044FD0 00404025 */ move $t0, $v0 /* 045BD4 80044FD4 806E0212 */ lb $t6, 0x212($v1) -/* 045BD8 80044FD8 3C018012 */ lui $at, 0x8012 +/* 045BD8 80044FD8 3C018012 */ lui $at, %hi(D_8011D5B4) # $at, 0x8012 /* 045BDC 80044FDC 00250821 */ addu $at, $at, $a1 -/* 045BE0 80044FE0 A02ED5B4 */ sb $t6, -0x2a4c($at) +/* 045BE0 80044FE0 A02ED5B4 */ sb $t6, %lo(D_8011D5B4)($at) .L80044FE4: /* 045BE4 80044FE4 3C0F8012 */ lui $t7, %hi(D_8011D5B4) # $t7, 0x8012 /* 045BE8 80044FE8 82190002 */ lb $t9, 2($s0) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index a413e6a6..aa2e06f4 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -27,10 +27,10 @@ glabel func_80050A28 /* 051688 80050A88 15C00041 */ bnez $t6, .L80050B90 /* 05168C 80050A8C 2508D528 */ addiu $t0, %lo(D_8011D528) # addiu $t0, $t0, -0x2ad8 /* 051690 80050A90 820F01E7 */ lb $t7, 0x1e7($s0) -/* 051694 80050A94 3C19800E */ lui $t9, 0x800e +/* 051694 80050A94 3C19800E */ lui $t9, %hi(D_800DCDB0) # $t9, 0x800e /* 051698 80050A98 31F8001F */ andi $t8, $t7, 0x1f /* 05169C 80050A9C 0338C821 */ addu $t9, $t9, $t8 -/* 0516A0 80050AA0 8339CDB0 */ lb $t9, -0x3250($t9) +/* 0516A0 80050AA0 8339CDB0 */ lb $t9, %lo(D_800DCDB0)($t9) /* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E663C) # $at, 0x800e /* 0516A8 80050AA8 44995000 */ mtc1 $t9, $f10 /* 0516AC 80050AAC C4276638 */ lwc1 $f7, %lo(D_800E6638)($at) @@ -748,11 +748,11 @@ glabel func_80050A28 /* 0520D8 800514D8 46087380 */ add.s $f14, $f14, $f8 .L800514DC: /* 0520DC 800514DC 3C01800E */ lui $at, 0x800e -/* 0520E0 800514E0 3C0D800E */ lui $t5, 0x800e +/* 0520E0 800514E0 3C0D800E */ lui $t5, %hi(D_800DCC34) # $t5, 0x800e /* 0520E4 800514E4 00230821 */ addu $at, $at, $v1 /* 0520E8 800514E8 01A36821 */ addu $t5, $t5, $v1 /* 0520EC 800514EC C426CBE8 */ lwc1 $f6, -0x3418($at) -/* 0520F0 800514F0 8DADCC34 */ lw $t5, -0x33cc($t5) +/* 0520F0 800514F0 8DADCC34 */ lw $t5, %lo(D_800DCC34)($t5) /* 0520F4 800514F4 8FAC0068 */ lw $t4, 0x68($sp) /* 0520F8 800514F8 0122082A */ slt $at, $t1, $v0 /* 0520FC 800514FC 018D7021 */ addu $t6, $t4, $t5 @@ -1119,9 +1119,9 @@ glabel func_80050A28 /* 052650 80051A50 284100FF */ slti $at, $v0, 0xff /* 052654 80051A54 10200008 */ beqz $at, .L80051A78 /* 052658 80051A58 00025080 */ sll $t2, $v0, 2 -/* 05265C 80051A5C 3C0B800E */ lui $t3, 0x800e +/* 05265C 80051A5C 3C0B800E */ lui $t3, %hi(D_800DCCF4) # $t3, 0x800e /* 052660 80051A60 016A5821 */ addu $t3, $t3, $t2 -/* 052664 80051A64 8D6BCCF4 */ lw $t3, -0x330c($t3) +/* 052664 80051A64 8D6BCCF4 */ lw $t3, %lo(D_800DCCF4)($t3) /* 052668 80051A68 8CD80074 */ lw $t8, 0x74($a2) /* 05266C 80051A6C 00000000 */ nop /* 052670 80051A70 030BC825 */ or $t9, $t8, $t3 @@ -1132,9 +1132,9 @@ glabel func_80050A28 /* 052680 80051A80 284100FF */ slti $at, $v0, 0xff /* 052684 80051A84 10200008 */ beqz $at, .L80051AA8 /* 052688 80051A88 00026880 */ sll $t5, $v0, 2 -/* 05268C 80051A8C 3C0E800E */ lui $t6, 0x800e +/* 05268C 80051A8C 3C0E800E */ lui $t6, %hi(D_800DCCF4) # $t6, 0x800e /* 052690 80051A90 01CD7021 */ addu $t6, $t6, $t5 -/* 052694 80051A94 8DCECCF4 */ lw $t6, -0x330c($t6) +/* 052694 80051A94 8DCECCF4 */ lw $t6, %lo(D_800DCCF4)($t6) /* 052698 80051A98 8CCC0074 */ lw $t4, 0x74($a2) /* 05269C 80051A9C 000E7840 */ sll $t7, $t6, 1 /* 0526A0 80051AA0 018F5025 */ or $t2, $t4, $t7 @@ -1150,24 +1150,24 @@ glabel func_80050A28 /* 0526C4 80051AC4 45000018 */ bc1f .L80051B28 /* 0526C8 80051AC8 0009C080 */ sll $t8, $t1, 2 /* 0526CC 80051ACC 920201DE */ lbu $v0, 0x1de($s0) -/* 0526D0 80051AD0 3C19800E */ lui $t9, 0x800e +/* 0526D0 80051AD0 3C19800E */ lui $t9, %hi(D_800DCD40) # $t9, 0x800e /* 0526D4 80051AD4 284100FF */ slti $at, $v0, 0xff /* 0526D8 80051AD8 10200007 */ beqz $at, .L80051AF8 /* 0526DC 80051ADC 00025880 */ sll $t3, $v0, 2 /* 0526E0 80051AE0 032BC821 */ addu $t9, $t9, $t3 -/* 0526E4 80051AE4 8F39CD40 */ lw $t9, -0x32c0($t9) +/* 0526E4 80051AE4 8F39CD40 */ lw $t9, %lo(D_800DCD40)($t9) /* 0526E8 80051AE8 8CD80074 */ lw $t8, 0x74($a2) /* 0526EC 80051AEC 00000000 */ nop /* 0526F0 80051AF0 03196825 */ or $t5, $t8, $t9 /* 0526F4 80051AF4 ACCD0074 */ sw $t5, 0x74($a2) .L80051AF8: /* 0526F8 80051AF8 920201DF */ lbu $v0, 0x1df($s0) -/* 0526FC 80051AFC 3C0F800E */ lui $t7, 0x800e +/* 0526FC 80051AFC 3C0F800E */ lui $t7, %hi(D_800DCD40) # $t7, 0x800e /* 052700 80051B00 284100FF */ slti $at, $v0, 0xff /* 052704 80051B04 10200007 */ beqz $at, .L80051B24 /* 052708 80051B08 00026080 */ sll $t4, $v0, 2 /* 05270C 80051B0C 01EC7821 */ addu $t7, $t7, $t4 -/* 052710 80051B10 8DEFCD40 */ lw $t7, -0x32c0($t7) +/* 052710 80051B10 8DEFCD40 */ lw $t7, %lo(D_800DCD40)($t7) /* 052714 80051B14 8CCE0074 */ lw $t6, 0x74($a2) /* 052718 80051B18 000F5040 */ sll $t2, $t7, 1 /* 05271C 80051B1C 01CA5825 */ or $t3, $t6, $t2 @@ -1175,11 +1175,11 @@ glabel func_80050A28 .L80051B24: /* 052724 80051B24 0009C080 */ sll $t8, $t1, 2 .L80051B28: -/* 052728 80051B28 3C09800E */ lui $t1, 0x800e +/* 052728 80051B28 3C09800E */ lui $t1, %hi(D_800DCC80) # $t1, 0x800e /* 05272C 80051B2C 8E020018 */ lw $v0, 0x18($s0) /* 052730 80051B30 01384821 */ addu $t1, $t1, $t8 /* 052734 80051B34 8FA60078 */ lw $a2, 0x78($sp) -/* 052738 80051B38 8D29CC80 */ lw $t1, -0x3380($t1) +/* 052738 80051B38 8D29CC80 */ lw $t1, %lo(D_800DCC80)($t1) /* 05273C 80051B3C 14400011 */ bnez $v0, .L80051B84 /* 052740 80051B40 00000000 */ nop /* 052744 80051B44 1120000F */ beqz $t1, .L80051B84 @@ -1593,9 +1593,9 @@ glabel func_80050A28 /* 052D48 80052148 240100FF */ li $at, 255 /* 052D4C 8005214C 1041000A */ beq $v0, $at, .L80052178 /* 052D50 80052150 0002C840 */ sll $t9, $v0, 1 -/* 052D54 80052154 3C0D800E */ lui $t5, 0x800e +/* 052D54 80052154 3C0D800E */ lui $t5, %hi(D_800DCCCC) # $t5, 0x800e /* 052D58 80052158 01B96821 */ addu $t5, $t5, $t9 -/* 052D5C 8005215C 95ADCCCC */ lhu $t5, -0x3334($t5) +/* 052D5C 8005215C 95ADCCCC */ lhu $t5, %lo(D_800DCCCC)($t5) /* 052D60 80052160 3C018012 */ lui $at, %hi(D_8011D550) # $at, 0x8012 /* 052D64 80052164 A42DD550 */ sh $t5, %lo(D_8011D550)($at) /* 052D68 80052168 820C01E0 */ lb $t4, 0x1e0($s0) diff --git a/asm/non_matchings/unknown_043920/func_80059BF0.s b/asm/non_matchings/unknown_043920/func_80059BF0.s index 43f369df..40904677 100644 --- a/asm/non_matchings/unknown_043920/func_80059BF0.s +++ b/asm/non_matchings/unknown_043920/func_80059BF0.s @@ -71,12 +71,12 @@ glabel func_80059BF0 /* 05A8FC 80059CFC 14400044 */ bnez $v0, .L80059E10 /* 05A900 80059D00 254AD59C */ addiu $t2, %lo(D_8011D59C) # addiu $t2, $t2, -0x2a64 /* 05A904 80059D04 81590000 */ lb $t9, ($t2) -/* 05A908 80059D08 3C018012 */ lui $at, 0x8012 +/* 05A908 80059D08 3C018012 */ lui $at, %hi(D_8011D5A8) # $at, 0x8012 /* 05A90C 80059D0C 00197040 */ sll $t6, $t9, 1 /* 05A910 80059D10 002E0821 */ addu $at, $at, $t6 /* 05A914 80059D14 24180001 */ li $t8, 1 /* 05A918 80059D18 1000003D */ b .L80059E10 -/* 05A91C 80059D1C A438D5A8 */ sh $t8, -0x2a58($at) +/* 05A91C 80059D1C A438D5A8 */ sh $t8, %lo(D_8011D5A8)($at) .L80059D20: /* 05A920 80059D20 00EB0019 */ multu $a3, $t3 /* 05A924 80059D24 0005C880 */ sll $t9, $a1, 2 diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index 4c9b9b7f..1b0be27a 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -38,13 +38,13 @@ glabel func_80059E40 /* 05AACC 80059ECC 462020A0 */ cvt.s.d $f2, $f4 .L80059ED0: /* 05AAD0 80059ED0 4459F800 */ cfc1 $t9, $31 -/* 05AAD4 80059ED4 3C0D8012 */ lui $t5, 0x8012 +/* 05AAD4 80059ED4 3C0D8012 */ lui $t5, %hi(D_8011D5A0) # $t5, 0x8012 /* 05AAD8 80059ED8 37210003 */ ori $at, $t9, 3 /* 05AADC 80059EDC 38210002 */ xori $at, $at, 2 /* 05AAE0 80059EE0 44C1F800 */ ctc1 $at, $31 /* 05AAE4 80059EE4 01AE6821 */ addu $t5, $t5, $t6 /* 05AAE8 80059EE8 460011A4 */ cvt.w.s $f6, $f2 -/* 05AAEC 80059EEC 85ADD5A0 */ lh $t5, -0x2a60($t5) +/* 05AAEC 80059EEC 85ADD5A0 */ lh $t5, %lo(D_8011D5A0)($t5) /* 05AAF0 80059EF0 44033000 */ mfc1 $v1, $f6 /* 05AAF4 80059EF4 25AFFFFE */ addiu $t7, $t5, -2 /* 05AAF8 80059EF8 44D9F800 */ ctc1 $t9, $31 @@ -75,10 +75,10 @@ glabel func_80059E40 /* 05AB58 80059F58 2469FFFF */ addiu $t1, $v1, -1 .L80059F5C: /* 05AB5C 80059F5C 0005C880 */ sll $t9, $a1, 2 -/* 05AB60 80059F60 3C1F8012 */ lui $ra, 0x8012 +/* 05AB60 80059F60 3C1F8012 */ lui $ra, %hi(D_8011D590) # $ra, 0x8012 /* 05AB64 80059F64 03F9F821 */ addu $ra, $ra, $t9 /* 05AB68 80059F68 00097080 */ sll $t6, $t1, 2 -/* 05AB6C 80059F6C 8FFFD590 */ lw $ra, -0x2a70($ra) +/* 05AB6C 80059F6C 8FFFD590 */ lw $ra, %lo(D_8011D590)($ra) /* 05AB70 80059F70 01C97023 */ subu $t6, $t6, $t1 /* 05AB74 80059F74 000E7080 */ sll $t6, $t6, 2 /* 05AB78 80059F78 27A70084 */ addiu $a3, $sp, 0x84 diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CA78.s b/asm/non_matchings/unknown_05CEF0/func_8005CA78.s index fe8e25ea..47fc6f79 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CA78.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CA78.s @@ -1,5 +1,5 @@ glabel func_8005CA78 -/* 05D678 8005CA78 3C018012 */ lui $at, 0x8012 +/* 05D678 8005CA78 3C018012 */ lui $at, %hi(D_8011D5C8) # $at, 0x8012 /* 05D67C 8005CA7C 03E00008 */ jr $ra -/* 05D680 8005CA80 AC24D5C8 */ sw $a0, -0x2a38($at) +/* 05D680 8005CA80 AC24D5C8 */ sw $a0, %lo(D_8011D5C8)($at) diff --git a/asm/non_matchings/unknown_05F690/func_800619F4.s b/asm/non_matchings/unknown_05F690/func_800619F4.s index aa9d71f3..8b705f48 100644 --- a/asm/non_matchings/unknown_05F690/func_800619F4.s +++ b/asm/non_matchings/unknown_05F690/func_800619F4.s @@ -1,5 +1,5 @@ glabel func_800619F4 -/* 0625F4 800619F4 3C018012 */ lui $at, 0x8012 +/* 0625F4 800619F4 3C018012 */ lui $at, %hi(D_8011D640) # $at, 0x8012 /* 0625F8 800619F8 03E00008 */ jr $ra -/* 0625FC 800619FC AC24D640 */ sw $a0, -0x29c0($at) +/* 0625FC 800619FC AC24D640 */ sw $a0, %lo(D_8011D640)($at) diff --git a/asm/non_matchings/unknown_064830/func_8006492C.s b/asm/non_matchings/unknown_064830/func_8006492C.s index 15d1505d..e8c0a85a 100644 --- a/asm/non_matchings/unknown_064830/func_8006492C.s +++ b/asm/non_matchings/unknown_064830/func_8006492C.s @@ -1,8 +1,8 @@ glabel func_8006492C -/* 06552C 8006492C 3C01800E */ lui $at, 0x800e +/* 06552C 8006492C 3C01800E */ lui $at, %hi(D_800DCEB0) # $at, 0x800e /* 065530 80064930 AFA40000 */ sw $a0, ($sp) /* 065534 80064934 03E00008 */ jr $ra -/* 065538 80064938 A024CEB0 */ sb $a0, -0x3150($at) +/* 065538 80064938 A024CEB0 */ sb $a0, %lo(D_800DCEB0)($at) /* 06553C 8006493C 3C02800E */ lui $v0, %hi(D_800DCEB0) # $v0, 0x800e /* 065540 80064940 9042CEB0 */ lbu $v0, %lo(D_800DCEB0)($v0) diff --git a/asm/non_matchings/unknown_066AA0/func_80068158.s b/asm/non_matchings/unknown_066AA0/func_80068158.s index 500ddc23..504b091c 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, 0x800e +/* 068DB4 800681B4 3C19800E */ lui $t9, %hi(D_800DD094) # $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, -0x2f6c($t9) +/* 068DD0 800681D0 8F39D094 */ lw $t9, %lo(D_800DD094)($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 b95eebf0..40eb5197 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, 0x800e +/* 068ED0 800682D0 3C19800E */ lui $t9, %hi(D_800DD094) # $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, -0x2f6c($t9) +/* 068EEC 800682EC 8F39D094 */ lw $t9, %lo(D_800DD094)($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/asm/non_matchings/unknown_078050/func_80078190.s b/asm/non_matchings/unknown_078050/func_80078190.s index dd452cd3..73d4576c 100644 --- a/asm/non_matchings/unknown_078050/func_80078190.s +++ b/asm/non_matchings/unknown_078050/func_80078190.s @@ -423,10 +423,10 @@ glabel func_80078190 /* 0793D4 800787D4 AC265F38 */ sw $a2, %lo(D_80125F38)($at) /* 0793D8 800787D8 3C018012 */ lui $at, %hi(D_80125F3C) # $at, 0x8012 /* 0793DC 800787DC AC275F3C */ sw $a3, %lo(D_80125F3C)($at) -/* 0793E0 800787E0 3C01800E */ lui $at, 0x800e +/* 0793E0 800787E0 3C01800E */ lui $at, %hi(D_800DE4CC) # $at, 0x800e /* 0793E4 800787E4 24080001 */ li $t0, 1 /* 0793E8 800787E8 03E00008 */ jr $ra -/* 0793EC 800787EC AC28E4CC */ sw $t0, -0x1b34($at) +/* 0793EC 800787EC AC28E4CC */ sw $t0, %lo(D_800DE4CC)($at) /* 0793F0 800787F0 3C01800E */ lui $at, 0x800e /* 0793F4 800787F4 03E00008 */ jr $ra diff --git a/asm/non_matchings/unknown_07B870/func_8007B374.s b/asm/non_matchings/unknown_07B870/func_8007B374.s index e8c8f569..4fc5af7e 100644 --- a/asm/non_matchings/unknown_07B870/func_8007B374.s +++ b/asm/non_matchings/unknown_07B870/func_8007B374.s @@ -1,7 +1,7 @@ glabel func_8007B374 -/* 07BF74 8007B374 3C01800E */ lui $at, 0x800e +/* 07BF74 8007B374 3C01800E */ lui $at, %hi(D_800DE7C0) # $at, 0x800e /* 07BF78 8007B378 03E00008 */ jr $ra -/* 07BF7C 8007B37C AC24E7C0 */ sw $a0, -0x1840($at) +/* 07BF7C 8007B37C AC24E7C0 */ sw $a0, %lo(D_800DE7C0)($at) /* 07BF80 8007B380 04800006 */ bltz $a0, .L8007B39C /* 07BF84 8007B384 3C0E8012 */ lui $t6, %hi(D_80126330) # $t6, 0x8012 diff --git a/asm/non_matchings/unknown_080500/DrawMenuText.s b/asm/non_matchings/unknown_080500/DrawMenuText.s index 74568de2..e7cb83bf 100644 --- a/asm/non_matchings/unknown_080500/DrawMenuText.s +++ b/asm/non_matchings/unknown_080500/DrawMenuText.s @@ -125,9 +125,9 @@ glabel DrawMenuText /* 082FC4 800823C4 2D810008 */ sltiu $at, $t4, 8 /* 082FC8 800823C8 10200117 */ beqz $at, .L80082828 /* 082FCC 800823CC 000C6080 */ sll $t4, $t4, 2 -/* 082FD0 800823D0 3C01800F */ lui $at, 0x800f +/* 082FD0 800823D0 3C01800F */ lui $at, %hi(D_800E836C) # $at, 0x800f /* 082FD4 800823D4 002C0821 */ addu $at, $at, $t4 -/* 082FD8 800823D8 8C2C836C */ lw $t4, -0x7c94($at) +/* 082FD8 800823D8 8C2C836C */ lw $t4, %lo(D_800E836C)($at) /* 082FDC 800823DC 00000000 */ nop /* 082FE0 800823E0 01800008 */ jr $t4 /* 082FE4 800823E4 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index 946a192f..3fcde973 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -508,9 +508,9 @@ glabel MenuCreditsLoop /* 09C674 8009BA74 2D410005 */ sltiu $at, $t2, 5 /* 09C678 8009BA78 10200062 */ beqz $at, .L8009BC04 /* 09C67C 8009BA7C 000A5080 */ sll $t2, $t2, 2 -/* 09C680 8009BA80 3C01800F */ lui $at, 0x800f +/* 09C680 8009BA80 3C01800F */ lui $at, %hi(D_800E8574) # $at, 0x800f /* 09C684 8009BA84 002A0821 */ addu $at, $at, $t2 -/* 09C688 8009BA88 8C2A8574 */ lw $t2, -0x7a8c($at) +/* 09C688 8009BA88 8C2A8574 */ lw $t2, %lo(D_800E8574)($at) /* 09C68C 8009BA8C 00000000 */ nop /* 09C690 8009BA90 01400008 */ jr $t2 /* 09C694 8009BA94 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuInit.s b/asm/non_matchings/unknown_080500/MenuInit.s index f96f9859..87cffeae 100644 --- a/asm/non_matchings/unknown_080500/MenuInit.s +++ b/asm/non_matchings/unknown_080500/MenuInit.s @@ -26,9 +26,9 @@ glabel MenuInit /* 082030 80081430 2DE1001D */ sltiu $at, $t7, 0x1d /* 082034 80081434 10200055 */ beqz $at, .L8008158C /* 082038 80081438 000F7880 */ sll $t7, $t7, 2 -/* 08203C 8008143C 3C01800F */ lui $at, 0x800f +/* 08203C 8008143C 3C01800F */ lui $at, %hi(D_800E8284) # $at, 0x800f /* 082040 80081440 002F0821 */ addu $at, $at, $t7 -/* 082044 80081444 8C2F8284 */ lw $t7, -0x7d7c($at) +/* 082044 80081444 8C2F8284 */ lw $t7, %lo(D_800E8284)($at) /* 082048 80081448 00000000 */ nop /* 08204C 8008144C 01E00008 */ jr $t7 /* 082050 80081450 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuLoop.s b/asm/non_matchings/unknown_080500/MenuLoop.s index dfdd45cd..e6f0b39c 100644 --- a/asm/non_matchings/unknown_080500/MenuLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoop.s @@ -24,9 +24,9 @@ glabel MenuLoop /* 0821FC 800815FC 2D81001D */ sltiu $at, $t4, 0x1d /* 082200 80081600 1020006A */ beqz $at, .L800817AC /* 082204 80081604 000C6080 */ sll $t4, $t4, 2 -/* 082208 80081608 3C01800F */ lui $at, 0x800f +/* 082208 80081608 3C01800F */ lui $at, %hi(D_800E82F8) # $at, 0x800f /* 08220C 8008160C 002C0821 */ addu $at, $at, $t4 -/* 082210 80081610 8C2C82F8 */ lw $t4, -0x7d08($at) +/* 082210 80081610 8C2C82F8 */ lw $t4, %lo(D_800E82F8)($at) /* 082214 80081614 00000000 */ nop /* 082218 80081618 01800008 */ jr $t4 /* 08221C 8008161C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s index a456b56f..0c951e72 100644 --- a/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuSaveOptionsLoop.s @@ -113,9 +113,9 @@ glabel MenuSaveOptionsLoop .L80087CF8: /* 0888F8 80087CF8 1020005D */ beqz $at, .L80087E70 /* 0888FC 80087CFC 00027880 */ sll $t7, $v0, 2 -/* 088900 80087D00 3C01800F */ lui $at, 0x800f +/* 088900 80087D00 3C01800F */ lui $at, %hi(D_800E84B0) # $at, 0x800f /* 088904 80087D04 002F0821 */ addu $at, $at, $t7 -/* 088908 80087D08 8C2F84B0 */ lw $t7, -0x7b50($at) +/* 088908 80087D08 8C2F84B0 */ lw $t7, %lo(D_800E84B0)($at) /* 08890C 80087D0C 00000000 */ nop /* 088910 80087D10 01E00008 */ jr $t7 /* 088914 80087D14 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index 376f1dc4..80180396 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -12,9 +12,9 @@ glabel func_800853D0 /* 085FF8 800853F8 2F01000A */ sltiu $at, $t8, 0xa /* 085FFC 800853FC 1020010A */ beqz $at, .L80085828 /* 086000 80085400 0018C080 */ sll $t8, $t8, 2 -/* 086004 80085404 3C01800F */ lui $at, 0x800f +/* 086004 80085404 3C01800F */ lui $at, %hi(D_800E83B8) # $at, 0x800f /* 086008 80085408 00380821 */ addu $at, $at, $t8 -/* 08600C 8008540C 8C3883B8 */ lw $t8, -0x7c48($at) +/* 08600C 8008540C 8C3883B8 */ lw $t8, %lo(D_800E83B8)($at) /* 086010 80085410 00000000 */ nop /* 086014 80085414 03000008 */ jr $t8 /* 086018 80085418 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80085B9C.s b/asm/non_matchings/unknown_080500/func_80085B9C.s index 30940882..f5d2ff6e 100644 --- a/asm/non_matchings/unknown_080500/func_80085B9C.s +++ b/asm/non_matchings/unknown_080500/func_80085B9C.s @@ -10,11 +10,11 @@ glabel func_80085B9C /* 0867BC 80085BBC AFA40068 */ sw $a0, 0x68($sp) /* 0867C0 80085BC0 3C038012 */ lui $v1, %hi(D_801263E0) # $v1, 0x8012 /* 0867C4 80085BC4 8C6363E0 */ lw $v1, %lo(D_801263E0)($v1) -/* 0867C8 80085BC8 3C01800F */ lui $at, 0x800f +/* 0867C8 80085BC8 3C01800F */ lui $at, %hi(D_800E83E0) # $at, 0x800f /* 0867CC 80085BCC 306E0007 */ andi $t6, $v1, 7 /* 0867D0 80085BD0 000E7080 */ sll $t6, $t6, 2 /* 0867D4 80085BD4 002E0821 */ addu $at, $at, $t6 -/* 0867D8 80085BD8 8C2E83E0 */ lw $t6, -0x7c20($at) +/* 0867D8 80085BD8 8C2E83E0 */ lw $t6, %lo(D_800E83E0)($at) /* 0867DC 80085BDC 3054FFFF */ andi $s4, $v0, 0xffff /* 0867E0 80085BE0 00009825 */ move $s3, $zero /* 0867E4 80085BE4 00003025 */ move $a2, $zero diff --git a/asm/non_matchings/unknown_080500/func_800867D4.s b/asm/non_matchings/unknown_080500/func_800867D4.s index cb42d7c6..a7548a7c 100644 --- a/asm/non_matchings/unknown_080500/func_800867D4.s +++ b/asm/non_matchings/unknown_080500/func_800867D4.s @@ -17,9 +17,9 @@ glabel func_800867D4 /* 087410 80086810 2D010005 */ sltiu $at, $t0, 5 /* 087414 80086814 1020007D */ beqz $at, .L80086A0C /* 087418 80086818 00084080 */ sll $t0, $t0, 2 -/* 08741C 8008681C 3C01800F */ lui $at, 0x800f +/* 08741C 8008681C 3C01800F */ lui $at, %hi(D_800E8400) # $at, 0x800f /* 087420 80086820 00280821 */ addu $at, $at, $t0 -/* 087424 80086824 8C288400 */ lw $t0, -0x7c00($at) +/* 087424 80086824 8C288400 */ lw $t0, %lo(D_800E8400)($at) /* 087428 80086828 00000000 */ nop /* 08742C 8008682C 01000008 */ jr $t0 /* 087430 80086830 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80086AFC.s b/asm/non_matchings/unknown_080500/func_80086AFC.s index 9d937664..98f72cee 100644 --- a/asm/non_matchings/unknown_080500/func_80086AFC.s +++ b/asm/non_matchings/unknown_080500/func_80086AFC.s @@ -15,9 +15,9 @@ glabel func_80086AFC /* 087730 80086B30 2D41000A */ sltiu $at, $t2, 0xa /* 087734 80086B34 102001A3 */ beqz $at, .L800871C4 /* 087738 80086B38 000A5080 */ sll $t2, $t2, 2 -/* 08773C 80086B3C 3C01800F */ lui $at, 0x800f +/* 08773C 80086B3C 3C01800F */ lui $at, %hi(D_800E8418) # $at, 0x800f /* 087740 80086B40 002A0821 */ addu $at, $at, $t2 -/* 087744 80086B44 8C2A8418 */ lw $t2, -0x7be8($at) +/* 087744 80086B44 8C2A8418 */ lw $t2, %lo(D_800E8418)($at) /* 087748 80086B48 00000000 */ nop /* 08774C 80086B4C 01400008 */ jr $t2 /* 087750 80086B50 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80087734.s b/asm/non_matchings/unknown_080500/func_80087734.s index e6fcb539..4b96be67 100644 --- a/asm/non_matchings/unknown_080500/func_80087734.s +++ b/asm/non_matchings/unknown_080500/func_80087734.s @@ -99,9 +99,9 @@ glabel func_80087734 /* 088498 80087898 2DE10009 */ sltiu $at, $t7, 9 /* 08849C 8008789C 10200014 */ beqz $at, .L800878F0 /* 0884A0 800878A0 000F7880 */ sll $t7, $t7, 2 -/* 0884A4 800878A4 3C01800F */ lui $at, 0x800f +/* 0884A4 800878A4 3C01800F */ lui $at, %hi(D_800E8440) # $at, 0x800f /* 0884A8 800878A8 002F0821 */ addu $at, $at, $t7 -/* 0884AC 800878AC 8C2F8440 */ lw $t7, -0x7bc0($at) +/* 0884AC 800878AC 8C2F8440 */ lw $t7, %lo(D_800E8440)($at) /* 0884B0 800878B0 00000000 */ nop /* 0884B4 800878B4 01E00008 */ jr $t7 /* 0884B8 800878B8 00000000 */ nop @@ -130,9 +130,9 @@ glabel func_80087734 /* 08850C 8008790C 2D810009 */ sltiu $at, $t4, 9 /* 088510 80087910 10200014 */ beqz $at, .L80087964 /* 088514 80087914 000C6080 */ sll $t4, $t4, 2 -/* 088518 80087918 3C01800F */ lui $at, 0x800f +/* 088518 80087918 3C01800F */ lui $at, %hi(D_800E8464) # $at, 0x800f /* 08851C 8008791C 002C0821 */ addu $at, $at, $t4 -/* 088520 80087920 8C2C8464 */ lw $t4, -0x7b9c($at) +/* 088520 80087920 8C2C8464 */ lw $t4, %lo(D_800E8464)($at) /* 088524 80087924 00000000 */ nop /* 088528 80087928 01800008 */ jr $t4 /* 08852C 8008792C 00000000 */ nop @@ -161,9 +161,9 @@ glabel func_80087734 /* 088580 80087980 2D61000A */ sltiu $at, $t3, 0xa /* 088584 80087984 10200072 */ beqz $at, .L80087B50 /* 088588 80087988 000B5880 */ sll $t3, $t3, 2 -/* 08858C 8008798C 3C01800F */ lui $at, 0x800f +/* 08858C 8008798C 3C01800F */ lui $at, %hi(D_800E8488) # $at, 0x800f /* 088590 80087990 002B0821 */ addu $at, $at, $t3 -/* 088594 80087994 8C2B8488 */ lw $t3, -0x7b78($at) +/* 088594 80087994 8C2B8488 */ lw $t3, %lo(D_800E8488)($at) /* 088598 80087998 00000000 */ nop /* 08859C 8008799C 01600008 */ jr $t3 /* 0885A0 800879A0 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80087F14.s b/asm/non_matchings/unknown_080500/func_80087F14.s index 1a9478bf..54685ed2 100644 --- a/asm/non_matchings/unknown_080500/func_80087F14.s +++ b/asm/non_matchings/unknown_080500/func_80087F14.s @@ -41,7 +41,7 @@ glabel func_80087F14 /* 088BAC 80087FAC 8FAE0074 */ lw $t6, 0x74($sp) /* 088BB0 80087FB0 A2150000 */ sb $s5, ($s0) /* 088BB4 80087FB4 11C00005 */ beqz $t6, .L80087FCC -/* 088BB8 80087FB8 3C188012 */ lui $t8, %hi(D_80126A60) #$t8, 0x8012 +/* 088BB8 80087FB8 3C188012 */ lui $t8, %hi(D_80126A60) # $t8, 0x8012 /* 088BBC 80087FBC 8FAF0070 */ lw $t7, 0x70($sp) /* 088BC0 80087FC0 00000000 */ nop /* 088BC4 80087FC4 15E00008 */ bnez $t7, .L80087FE8 @@ -121,7 +121,7 @@ glabel func_80087F14 /* 088CC4 800880C4 10000024 */ b .L80088158 /* 088CC8 800880C8 8FAF0090 */ lw $t7, 0x90($sp) .L800880CC: -/* 088CCC 800880CC 3C188012 */ lui $t8, %hi(D_80126A30) #$t8, 0x8012 +/* 088CCC 800880CC 3C188012 */ lui $t8, %hi(D_80126A30) # $t8, 0x8012 /* 088CD0 800880D0 0302C021 */ addu $t8, $t8, $v0 /* 088CD4 800880D4 93186A30 */ lbu $t8, %lo(D_80126A30)($t8) /* 088CD8 800880D8 8FB90094 */ lw $t9, 0x94($sp) diff --git a/asm/non_matchings/unknown_080500/func_800890AC.s b/asm/non_matchings/unknown_080500/func_800890AC.s index c78525bd..b84cb301 100644 --- a/asm/non_matchings/unknown_080500/func_800890AC.s +++ b/asm/non_matchings/unknown_080500/func_800890AC.s @@ -236,7 +236,7 @@ glabel func_800890AC /* 08A010 80089410 AFB80034 */ sw $t8, 0x34($sp) .L80089414: /* 08A014 80089414 10400013 */ beqz $v0, .L80089464 -/* 08A018 80089418 3C028012 */ lui $v0, %hi(D_80126B60) #$v0, 0x8012 +/* 08A018 80089418 3C028012 */ lui $v0, %hi(D_80126B60) # $v0, 0x8012 /* 08A01C 8008941C 00431021 */ addu $v0, $v0, $v1 /* 08A020 80089420 90426B60 */ lbu $v0, %lo(D_80126B60)($v0) /* 08A024 80089424 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 0c9ef3da..7d309e49 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -189,9 +189,9 @@ glabel func_80092188 /* 093048 80092448 102001B3 */ beqz $at, .L80092B18 /* 09304C 8009244C AFA00034 */ sw $zero, 0x34($sp) /* 093050 80092450 000F7880 */ sll $t7, $t7, 2 -/* 093054 80092454 3C01800F */ lui $at, 0x800f +/* 093054 80092454 3C01800F */ lui $at, %hi(D_800E84F4) # $at, 0x800f /* 093058 80092458 002F0821 */ addu $at, $at, $t7 -/* 09305C 8009245C 8C2F84F4 */ lw $t7, -0x7b0c($at) +/* 09305C 8009245C 8C2F84F4 */ lw $t7, %lo(D_800E84F4)($at) /* 093060 80092460 00000000 */ nop /* 093064 80092464 01E00008 */ jr $t7 /* 093068 80092468 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index ea0e7827..0214dbf9 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -37,9 +37,9 @@ glabel func_80094D28 /* 0959AC 80094DAC 2D410006 */ sltiu $at, $t2, 6 /* 0959B0 80094DB0 102001F5 */ beqz $at, .L80095588 /* 0959B4 80094DB4 000A5080 */ sll $t2, $t2, 2 -/* 0959B8 80094DB8 3C01800F */ lui $at, 0x800f +/* 0959B8 80094DB8 3C01800F */ lui $at, %hi(D_800E8508) # $at, 0x800f /* 0959BC 80094DBC 002A0821 */ addu $at, $at, $t2 -/* 0959C0 80094DC0 8C2A8508 */ lw $t2, -0x7af8($at) +/* 0959C0 80094DC0 8C2A8508 */ lw $t2, %lo(D_800E8508)($at) /* 0959C4 80094DC4 00000000 */ nop /* 0959C8 80094DC8 01400008 */ jr $t2 /* 0959CC 80094DCC 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80095624.s b/asm/non_matchings/unknown_080500/func_80095624.s index b4cf6620..26fc935c 100644 --- a/asm/non_matchings/unknown_080500/func_80095624.s +++ b/asm/non_matchings/unknown_080500/func_80095624.s @@ -4,9 +4,9 @@ glabel func_80095624 /* 09622C 8009562C 2DE10009 */ sltiu $at, $t7, 9 /* 096230 80095630 10200025 */ beqz $at, .L800956C8 /* 096234 80095634 000F7880 */ sll $t7, $t7, 2 -/* 096238 80095638 3C01800F */ lui $at, 0x800f +/* 096238 80095638 3C01800F */ lui $at, %hi(D_800E8524) # $at, 0x800f /* 09623C 8009563C 002F0821 */ addu $at, $at, $t7 -/* 096240 80095640 8C2F8524 */ lw $t7, -0x7adc($at) +/* 096240 80095640 8C2F8524 */ lw $t7, %lo(D_800E8524)($at) /* 096244 80095644 00000000 */ nop /* 096248 80095648 01E00008 */ jr $t7 /* 09624C 8009564C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 0b343c60..54937b76 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -139,9 +139,9 @@ glabel func_80095728 /* 096524 80095924 2F010009 */ sltiu $at, $t8, 9 /* 096528 80095928 1020037A */ beqz $at, .L80096714 /* 09652C 8009592C 0018C080 */ sll $t8, $t8, 2 -/* 096530 80095930 3C01800F */ lui $at, 0x800f +/* 096530 80095930 3C01800F */ lui $at, %hi(D_800E8548) # $at, 0x800f /* 096534 80095934 00380821 */ addu $at, $at, $t8 -/* 096538 80095938 8C388548 */ lw $t8, -0x7ab8($at) +/* 096538 80095938 8C388548 */ lw $t8, %lo(D_800E8548)($at) /* 09653C 8009593C 00000000 */ nop /* 096540 80095940 03000008 */ jr $t8 /* 096544 80095944 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_800998E0.s b/asm/non_matchings/unknown_080500/func_800998E0.s index 115d49e9..42518e10 100644 --- a/asm/non_matchings/unknown_080500/func_800998E0.s +++ b/asm/non_matchings/unknown_080500/func_800998E0.s @@ -15,7 +15,7 @@ glabel func_800998E0 /* 09A514 80099914 0C000741 */ jal func_80001D04 /* 09A518 80099918 AFA60020 */ sw $a2, 0x20($sp) /* 09A51C 8009991C 8FA60020 */ lw $a2, 0x20($sp) -/* 09A520 80099920 3C108012 */ lui $s0, %hi(D_80126540) #$s0, 0x8012 +/* 09A520 80099920 3C108012 */ lui $s0, %hi(D_80126540) # $s0, 0x8012 /* 09A524 80099924 02068021 */ addu $s0, $s0, $a2 /* 09A528 80099928 92106540 */ lbu $s0, %lo(D_80126540)($s0) /* 09A52C 8009992C 3C048012 */ lui $a0, %hi(D_801264D0) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_8009CFEC.s b/asm/non_matchings/unknown_080500/func_8009CFEC.s index c1dea90d..988bd1e0 100644 --- a/asm/non_matchings/unknown_080500/func_8009CFEC.s +++ b/asm/non_matchings/unknown_080500/func_8009CFEC.s @@ -47,9 +47,9 @@ glabel func_8009CFEC /* 09DC94 8009D094 2D210006 */ sltiu $at, $t1, 6 /* 09DC98 8009D098 1020001A */ beqz $at, .L8009D104 /* 09DC9C 8009D09C 00094880 */ sll $t1, $t1, 2 -/* 09DCA0 8009D0A0 3C01800F */ lui $at, 0x800f +/* 09DCA0 8009D0A0 3C01800F */ lui $at, %hi(D_800E8588) # $at, 0x800f /* 09DCA4 8009D0A4 00290821 */ addu $at, $at, $t1 -/* 09DCA8 8009D0A8 8C298588 */ lw $t1, -0x7a78($at) +/* 09DCA8 8009D0A8 8C298588 */ lw $t1, %lo(D_800E8588)($at) /* 09DCAC 8009D0AC 00000000 */ nop /* 09DCB0 8009D0B0 01200008 */ jr $t1 /* 09DCB4 8009D0B4 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_8009D360.s b/asm/non_matchings/unknown_080500/func_8009D360.s index f4b7a322..4cabb56b 100644 --- a/asm/non_matchings/unknown_080500/func_8009D360.s +++ b/asm/non_matchings/unknown_080500/func_8009D360.s @@ -176,9 +176,9 @@ glabel func_8009D360 /* 09E1F4 8009D5F4 2DA10010 */ sltiu $at, $t5, 0x10 /* 09E1F8 8009D5F8 102000FA */ beqz $at, .L8009D9E4 /* 09E1FC 8009D5FC 000D6880 */ sll $t5, $t5, 2 -/* 09E200 8009D600 3C01800F */ lui $at, 0x800f +/* 09E200 8009D600 3C01800F */ lui $at, %hi(D_800E85A0) # $at, 0x800f /* 09E204 8009D604 002D0821 */ addu $at, $at, $t5 -/* 09E208 8009D608 8C2D85A0 */ lw $t5, -0x7a60($at) +/* 09E208 8009D608 8C2D85A0 */ lw $t5, %lo(D_800E85A0)($at) /* 09E20C 8009D60C 00000000 */ nop /* 09E210 8009D610 01A00008 */ jr $t5 /* 09E214 8009D614 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_8009DB3C.s b/asm/non_matchings/unknown_080500/func_8009DB3C.s index 04ea63e8..71ca863e 100644 --- a/asm/non_matchings/unknown_080500/func_8009DB3C.s +++ b/asm/non_matchings/unknown_080500/func_8009DB3C.s @@ -71,9 +71,9 @@ glabel func_8009DB3C /* 09E83C 8009DC3C 102001CF */ beqz $at, .L8009E37C /* 09E840 8009DC40 AFA20040 */ sw $v0, 0x40($sp) /* 09E844 8009DC44 00037880 */ sll $t7, $v1, 2 -/* 09E848 8009DC48 3C01800F */ lui $at, 0x800f +/* 09E848 8009DC48 3C01800F */ lui $at, %hi(D_800E85E0) # $at, 0x800f /* 09E84C 8009DC4C 002F0821 */ addu $at, $at, $t7 -/* 09E850 8009DC50 8C2F85E0 */ lw $t7, -0x7a20($at) +/* 09E850 8009DC50 8C2F85E0 */ lw $t7, %lo(D_800E85E0)($at) /* 09E854 8009DC54 00000000 */ nop /* 09E858 8009DC58 01E00008 */ jr $t7 /* 09E85C 8009DC5C 00000000 */ nop @@ -510,9 +510,9 @@ glabel func_8009DB3C .L8009E2B0: /* 09EEB0 8009E2B0 10200028 */ beqz $at, .L8009E354 /* 09EEB4 8009E2B4 00035080 */ sll $t2, $v1, 2 -/* 09EEB8 8009E2B8 3C01800F */ lui $at, 0x800f +/* 09EEB8 8009E2B8 3C01800F */ lui $at, %hi(D_800E860C) # $at, 0x800f /* 09EEBC 8009E2BC 002A0821 */ addu $at, $at, $t2 -/* 09EEC0 8009E2C0 8C2A860C */ lw $t2, -0x79f4($at) +/* 09EEC0 8009E2C0 8C2A860C */ lw $t2, %lo(D_800E860C)($at) /* 09EEC4 8009E2C4 00000000 */ nop /* 09EEC8 8009E2C8 01400008 */ jr $t2 /* 09EECC 8009E2CC 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s b/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s index 48c6fbe2..f1a250ab 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s @@ -22,9 +22,9 @@ glabel func_800A0EB4 /* 0A1B04 800A0F04 1020002D */ beqz $at, .L800A0FBC /* 0A1B08 800A0F08 26100420 */ addiu $s0, $s0, 0x420 /* 0A1B0C 800A0F0C 00094880 */ sll $t1, $t1, 2 -/* 0A1B10 800A0F10 3C01800F */ lui $at, 0x800f +/* 0A1B10 800A0F10 3C01800F */ lui $at, %hi(D_800E86F8) # $at, 0x800f /* 0A1B14 800A0F14 00290821 */ addu $at, $at, $t1 -/* 0A1B18 800A0F18 8C2986F8 */ lw $t1, -0x7908($at) +/* 0A1B18 800A0F18 8C2986F8 */ lw $t1, %lo(D_800E86F8)($at) /* 0A1B1C 800A0F1C 00000000 */ nop /* 0A1B20 800A0F20 01200008 */ jr $t1 /* 0A1B24 800A0F24 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4154.s b/asm/non_matchings/unknown_09F8F0/func_800A4154.s index 9767ed53..f154caa7 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A4154.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A4154.s @@ -9,7 +9,7 @@ glabel func_800A4154 /* 0A4D70 800A4170 1041002B */ beq $v0, $at, .L800A4220 /* 0A4D74 800A4174 3C038012 */ lui $v1, %hi(D_80126D0C) # $v1, 0x8012 /* 0A4D78 800A4178 8C636D0C */ lw $v1, %lo(D_80126D0C)($v1) -/* 0A4D7C 800A417C 3C19800E */ lui $t9, %hi(D_800E2794) #$t9, 0x800e +/* 0A4D7C 800A417C 3C19800E */ lui $t9, %hi(D_800E2794) # $t9, 0x800e /* 0A4D80 800A4180 1860000F */ blez $v1, .L800A41C0 /* 0A4D84 800A4184 00037880 */ sll $t7, $v1, 2 /* 0A4D88 800A4188 01E2C021 */ addu $t8, $t7, $v0 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A4F50.s b/asm/non_matchings/unknown_09F8F0/func_800A4F50.s index e93a9ec8..11dbb9a0 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A4F50.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A4F50.s @@ -27,7 +27,7 @@ glabel func_800A4F50 /* 0A5BB0 800A4FB0 8FAD0018 */ lw $t5, 0x18($sp) /* 0A5BB4 800A4FB4 00026080 */ sll $t4, $v0, 2 /* 0A5BB8 800A4FB8 85AF0000 */ lh $t7, ($t5) -/* 0A5BBC 800A4FBC 3C18800E */ lui $t8, %hi(D_800E2794) #$t8, 0x800e +/* 0A5BBC 800A4FBC 3C18800E */ lui $t8, %hi(D_800E2794) # $t8, 0x800e /* 0A5BC0 800A4FC0 018F7021 */ addu $t6, $t4, $t7 /* 0A5BC4 800A4FC4 030EC021 */ addu $t8, $t8, $t6 /* 0A5BC8 800A4FC8 93182794 */ lbu $t8, %lo(D_800E2794)($t8) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 0d6cf905..850b9374 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -92,9 +92,9 @@ glabel func_800A6254 /* 0A6FB4 800A63B4 2F210005 */ sltiu $at, $t9, 5 /* 0A6FB8 800A63B8 10200278 */ beqz $at, .L800A6D9C /* 0A6FBC 800A63BC 0019C880 */ sll $t9, $t9, 2 -/* 0A6FC0 800A63C0 3C01800F */ lui $at, 0x800f +/* 0A6FC0 800A63C0 3C01800F */ lui $at, %hi(D_800E8744) # $at, 0x800f /* 0A6FC4 800A63C4 00390821 */ addu $at, $at, $t9 -/* 0A6FC8 800A63C8 8C398744 */ lw $t9, -0x78bc($at) +/* 0A6FC8 800A63C8 8C398744 */ lw $t9, %lo(D_800E8744)($at) /* 0A6FCC 800A63CC 00000000 */ nop /* 0A6FD0 800A63D0 03200008 */ jr $t9 /* 0A6FD4 800A63D4 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6E30.s b/asm/non_matchings/unknown_09F8F0/func_800A6E30.s index 94c535e2..e6bab691 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6E30.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6E30.s @@ -9,9 +9,9 @@ glabel func_800A6E30 /* 0A7A4C 800A6E4C 2DC10005 */ sltiu $at, $t6, 5 /* 0A7A50 800A6E50 102000CA */ beqz $at, .L800A717C /* 0A7A54 800A6E54 000E7080 */ sll $t6, $t6, 2 -/* 0A7A58 800A6E58 3C01800F */ lui $at, 0x800f +/* 0A7A58 800A6E58 3C01800F */ lui $at, %hi(D_800E8768) # $at, 0x800f /* 0A7A5C 800A6E5C 002E0821 */ addu $at, $at, $t6 -/* 0A7A60 800A6E60 8C2E8768 */ lw $t6, -0x7898($at) +/* 0A7A60 800A6E60 8C2E8768 */ lw $t6, %lo(D_800E8768)($at) /* 0A7A64 800A6E64 00000000 */ nop /* 0A7A68 800A6E68 01C00008 */ jr $t6 /* 0A7A6C 800A6E6C 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7B68.s b/asm/non_matchings/unknown_09F8F0/func_800A7B68.s index 5f3e27dd..be48514a 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A7B68.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A7B68.s @@ -9,7 +9,7 @@ glabel func_800A7B68 /* 0A8784 800A7B84 00803025 */ move $a2, $a0 /* 0A8788 800A7B88 848F0000 */ lh $t7, ($a0) /* 0A878C 800A7B8C 00077080 */ sll $t6, $a3, 2 -/* 0A8790 800A7B90 3C19800E */ lui $t9, %hi(D_800E2794) #$t9, 0x800e +/* 0A8790 800A7B90 3C19800E */ lui $t9, %hi(D_800E2794) # $t9, 0x800e /* 0A8794 800A7B94 01CFC021 */ addu $t8, $t6, $t7 /* 0A8798 800A7B98 0338C821 */ addu $t9, $t9, $t8 /* 0A879C 800A7B9C 93392794 */ lbu $t9, %lo(D_800E2794)($t9) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B2040.s b/asm/non_matchings/unknown_0AEE70/func_800B2040.s index cf36f45b..3a2ec19f 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B2040.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B2040.s @@ -14,9 +14,9 @@ glabel func_800B2040 /* 0B2C6C 800B206C 2C410005 */ sltiu $at, $v0, 5 /* 0B2C70 800B2070 10200077 */ beqz $at, .L800B2250 /* 0B2C74 800B2074 00027080 */ sll $t6, $v0, 2 -/* 0B2C78 800B2078 3C01800F */ lui $at, 0x800f +/* 0B2C78 800B2078 3C01800F */ lui $at, %hi(D_800E8BDC) # $at, 0x800f /* 0B2C7C 800B207C 002E0821 */ addu $at, $at, $t6 -/* 0B2C80 800B2080 8C2E8BDC */ lw $t6, -0x7424($at) +/* 0B2C80 800B2080 8C2E8BDC */ lw $t6, %lo(D_800E8BDC)($at) /* 0B2C84 800B2084 00000000 */ nop /* 0B2C88 800B2088 01C00008 */ jr $t6 /* 0B2C8C 800B208C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B4A40.s b/asm/non_matchings/unknown_0AEE70/func_800B4A40.s index abd868d2..9389eb08 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B4A40.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B4A40.s @@ -88,9 +88,9 @@ glabel func_800B4A40 /* 0B5780 800B4B80 10200011 */ beqz $at, .L800B4BC8 /* 0B5784 800B4B84 256B0001 */ addiu $t3, $t3, 1 /* 0B5788 800B4B88 0018C080 */ sll $t8, $t8, 2 -/* 0B578C 800B4B8C 3C01800F */ lui $at, 0x800f +/* 0B578C 800B4B8C 3C01800F */ lui $at, %hi(D_800E8CAC) # $at, 0x800f /* 0B5790 800B4B90 00380821 */ addu $at, $at, $t8 -/* 0B5794 800B4B94 8C388CAC */ lw $t8, -0x7354($at) +/* 0B5794 800B4B94 8C388CAC */ lw $t8, %lo(D_800E8CAC)($at) /* 0B5798 800B4B98 00000000 */ nop /* 0B579C 800B4B9C 03000008 */ jr $t8 /* 0B57A0 800B4BA0 00000000 */ nop @@ -225,9 +225,9 @@ glabel func_800B4A40 /* 0B596C 800B4D6C 10200015 */ beqz $at, .L800B4DC4 /* 0B5970 800B4D70 256B0001 */ addiu $t3, $t3, 1 /* 0B5974 800B4D74 0019C880 */ sll $t9, $t9, 2 -/* 0B5978 800B4D78 3C01800F */ lui $at, 0x800f +/* 0B5978 800B4D78 3C01800F */ lui $at, %hi(D_800E8CF0) # $at, 0x800f /* 0B597C 800B4D7C 00390821 */ addu $at, $at, $t9 -/* 0B5980 800B4D80 8C398CF0 */ lw $t9, -0x7310($at) +/* 0B5980 800B4D80 8C398CF0 */ lw $t9, %lo(D_800E8CF0)($at) /* 0B5984 800B4D84 00000000 */ nop /* 0B5988 800B4D88 03200008 */ jr $t9 /* 0B598C 800B4D8C 00000000 */ nop @@ -270,9 +270,9 @@ glabel func_800B4A40 /* 0B5A14 800B4E14 102003FD */ beqz $at, .L800B5E0C /* 0B5A18 800B4E18 A3B3019A */ sb $s3, 0x19a($sp) /* 0B5A1C 800B4E1C 000E7080 */ sll $t6, $t6, 2 -/* 0B5A20 800B4E20 3C01800F */ lui $at, 0x800f +/* 0B5A20 800B4E20 3C01800F */ lui $at, %hi(D_800E8D88) # $at, 0x800f /* 0B5A24 800B4E24 002E0821 */ addu $at, $at, $t6 -/* 0B5A28 800B4E28 8C2E8D88 */ lw $t6, -0x7278($at) +/* 0B5A28 800B4E28 8C2E8D88 */ lw $t6, %lo(D_800E8D88)($at) /* 0B5A2C 800B4E2C 00000000 */ nop /* 0B5A30 800B4E30 01C00008 */ jr $t6 /* 0B5A34 800B4E34 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B653C.s b/asm/non_matchings/unknown_0AEE70/func_800B653C.s index 28ea44d0..f4f4dc0f 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B653C.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B653C.s @@ -35,9 +35,9 @@ glabel func_800B653C /* 0B71BC 800B65BC 2DC10005 */ sltiu $at, $t6, 5 /* 0B71C0 800B65C0 102000AE */ beqz $at, .L800B687C /* 0B71C4 800B65C4 000E7080 */ sll $t6, $t6, 2 -/* 0B71C8 800B65C8 3C01800F */ lui $at, 0x800f +/* 0B71C8 800B65C8 3C01800F */ lui $at, %hi(D_800E8E58) # $at, 0x800f /* 0B71CC 800B65CC 002E0821 */ addu $at, $at, $t6 -/* 0B71D0 800B65D0 8C2E8E58 */ lw $t6, -0x71a8($at) +/* 0B71D0 800B65D0 8C2E8E58 */ lw $t6, %lo(D_800E8E58)($at) /* 0B71D4 800B65D4 00000000 */ nop /* 0B71D8 800B65D8 01C00008 */ jr $t6 /* 0B71DC 800B65DC 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B76B8.s b/asm/non_matchings/unknown_0AEE70/func_800B76B8.s index a0357d1f..63f50f37 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B76B8.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B76B8.s @@ -3,9 +3,9 @@ glabel func_800B76B8 /* 0B82BC 800B76BC 28810003 */ slti $at, $a0, 3 /* 0B82C0 800B76C0 10200004 */ beqz $at, .L800B76D4 /* 0B82C4 800B76C4 00047080 */ sll $t6, $a0, 2 -/* 0B82C8 800B76C8 3C018013 */ lui $at, 0x8013 +/* 0B82C8 800B76C8 3C018013 */ lui $at, %hi(D_80129FB0) # $at, 0x8013 /* 0B82CC 800B76CC 002E0821 */ addu $at, $at, $t6 -/* 0B82D0 800B76D0 AC259FB0 */ sw $a1, -0x6050($at) +/* 0B82D0 800B76D0 AC259FB0 */ sw $a1, %lo(D_80129FB0)($at) .L800B76D4: /* 0B82D4 800B76D4 03E00008 */ jr $ra /* 0B82D8 800B76D8 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B7810.s b/asm/non_matchings/unknown_0AEE70/func_800B7810.s index 0ff3f5ea..bf6dc19e 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B7810.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B7810.s @@ -27,9 +27,9 @@ glabel func_800B7810 /* 0B8474 800B7874 2C410006 */ sltiu $at, $v0, 6 /* 0B8478 800B7878 1020011B */ beqz $at, .L800B7CE8 /* 0B847C 800B787C 00024880 */ sll $t1, $v0, 2 -/* 0B8480 800B7880 3C01800F */ lui $at, 0x800f +/* 0B8480 800B7880 3C01800F */ lui $at, %hi(D_800E913C) # $at, 0x800f /* 0B8484 800B7884 00290821 */ addu $at, $at, $t1 -/* 0B8488 800B7888 8C29913C */ lw $t1, -0x6ec4($at) +/* 0B8488 800B7888 8C29913C */ lw $t1, %lo(D_800E913C)($at) /* 0B848C 800B788C 00000000 */ nop /* 0B8490 800B7890 01200008 */ jr $t1 /* 0B8494 800B7894 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800B8C04.s b/asm/non_matchings/unknown_0B8920/func_800B8C04.s index 00e122fb..84c1ece8 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B8C04.s +++ b/asm/non_matchings/unknown_0B8920/func_800B8C04.s @@ -158,9 +158,9 @@ glabel func_800B8C04 /* 0B9A3C 800B8E3C 00177880 */ sll $t7, $s7, 2 /* 0B9A40 800B8E40 026E082A */ slt $at, $s3, $t6 /* 0B9A44 800B8E44 10200068 */ beqz $at, .L800B8FE8 -/* 0B9A48 800B8E48 3C188013 */ lui $t8, 0x8013 +/* 0B9A48 800B8E48 3C188013 */ lui $t8, %hi(D_8012A0E8) # $t8, 0x8013 /* 0B9A4C 800B8E4C 030FC021 */ addu $t8, $t8, $t7 -/* 0B9A50 800B8E50 8F18A0E8 */ lw $t8, -0x5f18($t8) +/* 0B9A50 800B8E50 8F18A0E8 */ lw $t8, %lo(D_8012A0E8)($t8) /* 0B9A54 800B8E54 24190001 */ li $t9, 1 /* 0B9A58 800B8E58 02797004 */ sllv $t6, $t9, $s3 /* 0B9A5C 800B8E5C 030E7824 */ and $t7, $t8, $t6 @@ -334,9 +334,9 @@ glabel func_800B8C04 /* 0B9CC8 800B90C8 00177880 */ sll $t7, $s7, 2 /* 0B9CCC 800B90CC 0278082A */ slt $at, $s3, $t8 /* 0B9CD0 800B90D0 1020003B */ beqz $at, .L800B91C0 -/* 0B9CD4 800B90D4 3C198013 */ lui $t9, 0x8013 +/* 0B9CD4 800B90D4 3C198013 */ lui $t9, %hi(D_8012A0E8) # $t9, 0x8013 /* 0B9CD8 800B90D8 032FC821 */ addu $t9, $t9, $t7 -/* 0B9CDC 800B90DC 8F39A0E8 */ lw $t9, -0x5f18($t9) +/* 0B9CDC 800B90DC 8F39A0E8 */ lw $t9, %lo(D_8012A0E8)($t9) /* 0B9CE0 800B90E0 240E0001 */ li $t6, 1 /* 0B9CE4 800B90E4 026EC004 */ sllv $t8, $t6, $s3 /* 0B9CE8 800B90E8 03387824 */ and $t7, $t9, $t8 diff --git a/asm/non_matchings/unknown_0B8920/func_800BCC70.s b/asm/non_matchings/unknown_0B8920/func_800BCC70.s index 462ae347..ad586d2c 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BCC70.s +++ b/asm/non_matchings/unknown_0B8920/func_800BCC70.s @@ -214,11 +214,11 @@ glabel func_800BCC70 /* 0BDB98 800BCF98 240F0001 */ li $t7, 1 /* 0BDB9C 800BCF9C 032E2821 */ addu $a1, $t9, $t6 /* 0BDBA0 800BCFA0 90A4000B */ lbu $a0, 0xb($a1) -/* 0BDBA4 800BCFA4 3C0E8013 */ lui $t6, 0x8013 +/* 0BDBA4 800BCFA4 3C0E8013 */ lui $t6, %hi(D_8012A0E8) # $t6, 0x8013 /* 0BDBA8 800BCFA8 0004C880 */ sll $t9, $a0, 2 /* 0BDBAC 800BCFAC 90A3000A */ lbu $v1, 0xa($a1) /* 0BDBB0 800BCFB0 01D97021 */ addu $t6, $t6, $t9 -/* 0BDBB4 800BCFB4 8DCEA0E8 */ lw $t6, -0x5f18($t6) +/* 0BDBB4 800BCFB4 8DCEA0E8 */ lw $t6, %lo(D_8012A0E8)($t6) /* 0BDBB8 800BCFB8 006FC004 */ sllv $t8, $t7, $v1 /* 0BDBBC 800BCFBC 030E7824 */ and $t7, $t8, $t6 /* 0BDBC0 800BCFC0 11E00091 */ beqz $t7, .L800BD208 diff --git a/asm/non_matchings/unknown_0B8920/func_800C01D8.s b/asm/non_matchings/unknown_0B8920/func_800C01D8.s index 15ce5615..9ac29611 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C01D8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C01D8.s @@ -74,9 +74,9 @@ glabel func_800C01D8 /* 0C0EEC 800C02EC 10200062 */ beqz $at, .L800C0478 /* 0C0EF0 800C02F0 A0AD0000 */ sb $t5, ($a1) /* 0C0EF4 800C02F4 000E7080 */ sll $t6, $t6, 2 -/* 0C0EF8 800C02F8 3C01800F */ lui $at, 0x800f +/* 0C0EF8 800C02F8 3C01800F */ lui $at, %hi(D_800E92D0) # $at, 0x800f /* 0C0EFC 800C02FC 002E0821 */ addu $at, $at, $t6 -/* 0C0F00 800C0300 8C2E92D0 */ lw $t6, -0x6d30($at) +/* 0C0F00 800C0300 8C2E92D0 */ lw $t6, %lo(D_800E92D0)($at) /* 0C0F04 800C0304 00000000 */ nop /* 0C0F08 800C0308 01C00008 */ jr $t6 /* 0C0F0C 800C030C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C0494.s b/asm/non_matchings/unknown_0B8920/func_800C0494.s index a5c8f083..0a06d3ac 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C0494.s +++ b/asm/non_matchings/unknown_0B8920/func_800C0494.s @@ -52,9 +52,9 @@ glabel func_800C0494 /* 0C1148 800C0548 2D610007 */ sltiu $at, $t3, 7 /* 0C114C 800C054C 1020001A */ beqz $at, .L800C05B8 /* 0C1150 800C0550 000B5880 */ sll $t3, $t3, 2 -/* 0C1154 800C0554 3C01800F */ lui $at, 0x800f +/* 0C1154 800C0554 3C01800F */ lui $at, %hi(D_800E92EC) # $at, 0x800f /* 0C1158 800C0558 002B0821 */ addu $at, $at, $t3 -/* 0C115C 800C055C 8C2B92EC */ lw $t3, -0x6d14($at) +/* 0C115C 800C055C 8C2B92EC */ lw $t3, %lo(D_800E92EC)($at) /* 0C1160 800C0560 00000000 */ nop /* 0C1164 800C0564 01600008 */ jr $t3 /* 0C1168 800C0568 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C05C8.s b/asm/non_matchings/unknown_0B8920/func_800C05C8.s index 200604a6..c83d1c74 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C05C8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C05C8.s @@ -41,9 +41,9 @@ glabel func_800C05C8 /* 0C125C 800C065C 2F010007 */ sltiu $at, $t8, 7 /* 0C1260 800C0660 10200028 */ beqz $at, .L800C0704 /* 0C1264 800C0664 0018C080 */ sll $t8, $t8, 2 -/* 0C1268 800C0668 3C01800F */ lui $at, 0x800f +/* 0C1268 800C0668 3C01800F */ lui $at, %hi(D_800E9310) # $at, 0x800f /* 0C126C 800C066C 00380821 */ addu $at, $at, $t8 -/* 0C1270 800C0670 8C389310 */ lw $t8, -0x6cf0($at) +/* 0C1270 800C0670 8C389310 */ lw $t8, %lo(D_800E9310)($at) /* 0C1274 800C0674 00000000 */ nop /* 0C1278 800C0678 03000008 */ jr $t8 /* 0C127C 800C067C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C31EC.s b/asm/non_matchings/unknown_0B8920/func_800C31EC.s index 98744ae1..cae54898 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C31EC.s +++ b/asm/non_matchings/unknown_0B8920/func_800C31EC.s @@ -61,18 +61,18 @@ glabel func_800C31EC /* 0C3EC4 800C32C4 3C108013 */ lui $s0, %hi(D_8012A7D4) # $s0, 0x8013 /* 0C3EC8 800C32C8 2610A7D4 */ addiu $s0, %lo(D_8012A7D4) # addiu $s0, $s0, -0x582c /* 0C3ECC 800C32CC 8E0E0000 */ lw $t6, ($s0) -/* 0C3ED0 800C32D0 3C058013 */ lui $a1, 0x8013 +/* 0C3ED0 800C32D0 3C058013 */ lui $a1, %hi(D_8012A7C8) # $a1, 0x8013 /* 0C3ED4 800C32D4 000E7880 */ sll $t7, $t6, 2 /* 0C3ED8 800C32D8 00AF2821 */ addu $a1, $a1, $t7 -/* 0C3EDC 800C32DC 8CA5A7C8 */ lw $a1, -0x5838($a1) +/* 0C3EDC 800C32DC 8CA5A7C8 */ lw $a1, %lo(D_8012A7C8)($a1) /* 0C3EE0 800C32E0 24040006 */ li $a0, 6 /* 0C3EE4 800C32E4 0C01DB9A */ jal func_80076E68 /* 0C3EE8 800C32E8 01093026 */ xor $a2, $t0, $t1 /* 0C3EEC 800C32EC 8E180000 */ lw $t8, ($s0) -/* 0C3EF0 800C32F0 3C0A8013 */ lui $t2, 0x8013 +/* 0C3EF0 800C32F0 3C0A8013 */ lui $t2, %hi(D_8012A7C8) # $t2, 0x8013 /* 0C3EF4 800C32F4 0018C880 */ sll $t9, $t8, 2 /* 0C3EF8 800C32F8 01595021 */ addu $t2, $t2, $t9 -/* 0C3EFC 800C32FC 8D4AA7C8 */ lw $t2, -0x5838($t2) +/* 0C3EFC 800C32FC 8D4AA7C8 */ lw $t2, %lo(D_8012A7C8)($t2) /* 0C3F00 800C3300 3C018013 */ lui $at, %hi(D_8012A7D0) # $at, 0x8013 /* 0C3F04 800C3304 0C030B5B */ jal func_800C2D6C /* 0C3F08 800C3308 AC2AA7D0 */ sw $t2, %lo(D_8012A7D0)($at) @@ -86,19 +86,19 @@ glabel func_800C31EC /* 0C3F24 800C3324 3C108013 */ lui $s0, %hi(D_8012A7A4) # $s0, 0x8013 /* 0C3F28 800C3328 2610A7A4 */ addiu $s0, %lo(D_8012A7A4) # addiu $s0, $s0, -0x585c /* 0C3F2C 800C332C 8E0E0000 */ lw $t6, ($s0) -/* 0C3F30 800C3330 3C058013 */ lui $a1, 0x8013 +/* 0C3F30 800C3330 3C058013 */ lui $a1, %hi(D_8012A798) # $a1, 0x8013 /* 0C3F34 800C3334 000E7880 */ sll $t7, $t6, 2 /* 0C3F38 800C3338 00AF2821 */ addu $a1, $a1, $t7 -/* 0C3F3C 800C333C 8CA5A798 */ lw $a1, -0x5868($a1) +/* 0C3F3C 800C333C 8CA5A798 */ lw $a1, %lo(D_8012A798)($a1) /* 0C3F40 800C3340 24040006 */ li $a0, 6 /* 0C3F44 800C3344 01093026 */ xor $a2, $t0, $t1 /* 0C3F48 800C3348 0C01DB9A */ jal func_80076E68 /* 0C3F4C 800C334C AFA70024 */ sw $a3, 0x24($sp) /* 0C3F50 800C3350 8E030000 */ lw $v1, ($s0) -/* 0C3F54 800C3354 3C198013 */ lui $t9, 0x8013 +/* 0C3F54 800C3354 3C198013 */ lui $t9, %hi(D_8012A798) # $t9, 0x8013 /* 0C3F58 800C3358 0003C080 */ sll $t8, $v1, 2 /* 0C3F5C 800C335C 0338C821 */ addu $t9, $t9, $t8 -/* 0C3F60 800C3360 8F39A798 */ lw $t9, -0x5868($t9) +/* 0C3F60 800C3360 8F39A798 */ lw $t9, %lo(D_8012A798)($t9) /* 0C3F64 800C3364 3C048013 */ lui $a0, %hi(D_8012A7A0) # $a0, 0x8013 /* 0C3F68 800C3368 246A0001 */ addiu $t2, $v1, 1 /* 0C3F6C 800C336C 2484A7A0 */ addiu $a0, %lo(D_8012A7A0) # addiu $a0, $a0, -0x5860 diff --git a/asm/non_matchings/unknown_0B8920/func_800C38B4.s b/asm/non_matchings/unknown_0B8920/func_800C38B4.s index 5d500bd3..841ded4e 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C38B4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C38B4.s @@ -35,9 +35,9 @@ glabel func_800C38B4 /* 0C4534 800C3934 2DE1000A */ sltiu $at, $t7, 0xa /* 0C4538 800C3938 1020009E */ beqz $at, .L800C3BB4 /* 0C453C 800C393C 000F7880 */ sll $t7, $t7, 2 -/* 0C4540 800C3940 3C01800F */ lui $at, 0x800f +/* 0C4540 800C3940 3C01800F */ lui $at, %hi(D_800E9330) # $at, 0x800f /* 0C4544 800C3944 002F0821 */ addu $at, $at, $t7 -/* 0C4548 800C3948 8C2F9330 */ lw $t7, -0x6cd0($at) +/* 0C4548 800C3948 8C2F9330 */ lw $t7, %lo(D_800E9330)($at) /* 0C454C 800C394C 00000000 */ nop /* 0C4550 800C3950 01E00008 */ jr $t7 /* 0C4554 800C3954 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800C45A4.s b/asm/non_matchings/unknown_0B8920/func_800C45A4.s index 8503ae88..02e0c6d5 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C45A4.s +++ b/asm/non_matchings/unknown_0B8920/func_800C45A4.s @@ -308,9 +308,9 @@ glabel func_800C45A4 /* 0C5648 800C4A48 2DE10018 */ sltiu $at, $t7, 0x18 /* 0C564C 800C4A4C 10200026 */ beqz $at, .L800C4AE8 /* 0C5650 800C4A50 000F7880 */ sll $t7, $t7, 2 -/* 0C5654 800C4A54 3C01800F */ lui $at, 0x800f +/* 0C5654 800C4A54 3C01800F */ lui $at, %hi(D_800E9360) # $at, 0x800f /* 0C5658 800C4A58 002F0821 */ addu $at, $at, $t7 -/* 0C565C 800C4A5C 8C2F9360 */ lw $t7, -0x6ca0($at) +/* 0C565C 800C4A5C 8C2F9360 */ lw $t7, %lo(D_800E9360)($at) /* 0C5660 800C4A60 00000000 */ nop /* 0C5664 800C4A64 01E00008 */ jr $t7 /* 0C5668 800C4A68 00000000 */ nop diff --git a/asm/unknown_070110/func_8006F564.s b/asm/unknown_070110/func_8006F564.s index ecc23e66..6020b039 100644 --- a/asm/unknown_070110/func_8006F564.s +++ b/asm/unknown_070110/func_8006F564.s @@ -1,11 +1,11 @@ glabel func_8006F564 -/* 070164 8006F564 3C01800E */ lui $at, 0x800e +/* 070164 8006F564 3C01800E */ lui $at, %hi(D_800DD430) # $at, 0x800e /* 070168 8006F568 03E00008 */ jr $ra -/* 07016C 8006F56C A024D430 */ sb $a0, -0x2bd0($at) +/* 07016C 8006F56C A024D430 */ sb $a0, %lo(D_800DD430)($at) -/* 070170 8006F570 3C02800E */ lui $v0, 0x800e +/* 070170 8006F570 3C02800E */ lui $v0, %hi(D_800DD430) # $v0, 0x800e /* 070174 8006F574 03E00008 */ jr $ra -/* 070178 8006F578 9042D430 */ lbu $v0, -0x2bd0($v0) +/* 070178 8006F578 9042D430 */ lbu $v0, %lo(D_800DD430)($v0) /* 07017C 8006F57C 34080004 */ ori $t0, $zero, 4 /* 070180 8006F580 3C0FFFFF */ lui $t7, 0xffff diff --git a/data/dkr.data.s b/data/dkr.data.s index a1bc8ad1..2d942215 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -12863,6 +12863,7 @@ glabel D_800E824C .aligned_text "loadFrontEndItem() - Item no %d out of range 0-%d\n" +glabel D_800E8284 .word 0x80081464 .word 0x80081454 .word 0x8008158C @@ -12892,6 +12893,8 @@ glabel D_800E824C .word 0x80081574 .word 0x8008158C .word 0x80081584 + +glabel D_800E82F8 .word 0x80081634 .word 0x80081620 .word 0x800817AC @@ -12921,6 +12924,8 @@ glabel D_800E824C .word 0x80081788 .word 0x800817AC .word 0x8008179C + +glabel D_800E836C .word 0x800823E8 .word 0x80082454 .word 0x800824B8 @@ -12958,6 +12963,8 @@ glabel D_800E83AC glabel D_800E83B0 .word 0x3F2B851F .word 0x40351EB8 + +glabel D_800E83B8 .word 0x8008541C .word 0x8008553C .word 0x80085574 @@ -12968,6 +12975,8 @@ glabel D_800E83B0 .word 0x80085774 .word 0x800857C0 .word 0x800857F0 + +glabel D_800E83E0 .word 0x80085C30 .word 0x80085BF8 .word 0x80085BF8 @@ -12976,6 +12985,8 @@ glabel D_800E83B0 .word 0x80085C08 .word 0x80085C14 .word 0x80085C24 + +glabel D_800E8400 .word 0x80086834 .word 0x80086888 .word 0x800868C0 @@ -12984,6 +12995,8 @@ glabel D_800E83B0 glabel D_800E8414 .word 0x3DCCCCCD + +glabel D_800E8418 .word 0x80086B54 .word 0x80086CDC .word 0x80086D54 @@ -12994,6 +13007,8 @@ glabel D_800E8414 .word 0x800871C4 .word 0x800871C4 .word 0x80087158 + +glabel D_800E8440 .word 0x800878D4 .word 0x800878D4 .word 0x800878D4 @@ -13003,6 +13018,8 @@ glabel D_800E8414 .word 0x800878E0 .word 0x800878F0 .word 0x800878D4 + +glabel D_800E8464 .word 0x80087930 .word 0x80087948 .word 0x80087948 @@ -13012,6 +13029,8 @@ glabel D_800E8414 .word 0x80087954 .word 0x80087964 .word 0x80087948 + +glabel D_800E8488 .word 0x800879A4 .word 0x800879A4 .word 0x800879A4 @@ -13022,6 +13041,8 @@ glabel D_800E8414 .word 0x80087B50 .word 0x800879BC .word 0x800879BC + +glabel D_800E84B0 .word 0x80087D18 .word 0x80087D28 .word 0x80087D54 @@ -13055,11 +13076,15 @@ glabel D_800E84EC glabel D_800E84F0 .word 0x3F99999A + +glabel D_800E84F4 .word 0x8009246C .word 0x8009251C .word 0x80092740 .word 0x8009287C .word 0x8009287C + +glabel D_800E8508 .word 0x80094DD0 .word 0x80094FB0 .word 0x80095084 @@ -13069,6 +13094,8 @@ glabel D_800E84F0 glabel D_800E8520 .word 0x3F99999A + +glabel D_800E8524 .word 0x80095650 .word 0x800956C8 .word 0x800956C8 @@ -13078,6 +13105,8 @@ glabel D_800E8520 .word 0x80095680 .word 0x80095698 .word 0x800956B0 + +glabel D_800E8548 .word 0x80095948 .word 0x80095964 .word 0x80095B34 @@ -13093,17 +13122,23 @@ glabel D_800E856C glabel D_800E8570 .word 0x3D99999A + +glabel D_800E8574 .word 0x8009BA98 .word 0x8009BAD8 .word 0x8009BB08 .word 0x8009BB48 .word 0x8009BB9C + +glabel D_800E8588 .word 0x8009D0B8 .word 0x8009D104 .word 0x8009D0C8 .word 0x8009D0D8 .word 0x8009D0E8 .word 0x8009D0F8 + +glabel D_800E85A0 .word 0x8009D944 .word 0x8009D944 .word 0x8009D944 @@ -13120,6 +13155,8 @@ glabel D_800E8570 .word 0x8009D998 .word 0x8009D9B0 .word 0x8009D9B0 + +glabel D_800E85E0 .word 0x8009DC60 .word 0x8009DEF0 .word 0x8009E37C @@ -13131,6 +13168,8 @@ glabel D_800E8570 .word 0x8009E23C .word 0x8009E37C .word 0x8009DC60 + +glabel D_800E860C .word 0x8009E2D0 .word 0x8009E2F4 .word 0x8009E354 @@ -13220,6 +13259,8 @@ glabel D_800E86F0 glabel D_800E86F4 .word 0x33333333 + +glabel D_800E86F8 .word 0x800A0F28 .word 0x800A0F38 .word 0x800A0F48 @@ -13259,6 +13300,8 @@ glabel D_800E873C glabel D_800E8740 .word 0x46C92000 + +glabel D_800E8744 .word 0x800A63D8 .word 0x800A691C .word 0x800A6BCC @@ -13276,6 +13319,8 @@ glabel D_800E8760 glabel D_800E8764 .word 0x9999999A + +glabel D_800E8768 .word 0x800A6E70 .word 0x800A6F3C .word 0x800A7014 @@ -13432,6 +13477,7 @@ glabel D_800E8BD4 glabel D_800E8BD8 .word 0x3DCCCCCD +glabel D_800E8BDC .word 0x800B2250 .word 0x800B20E0 .word 0x800B2138 @@ -13463,6 +13509,7 @@ glabel D_800E8C5C .aligned_text "*** diPrintf Error *** ---> Out of string space. (Print less text!)\n" +glabel D_800E8CAC .word 0x800B4BA4 .word 0x800B4BC8 .word 0x800B4BC8 @@ -13480,6 +13527,8 @@ glabel D_800E8C5C .word 0x800B4BC8 .word 0x800B4BC8 .word 0x800B4BC4 + +glabel D_800E8CF0 .word 0x800B4DB0 .word 0x800B4DC4 .word 0x800B4DC4 @@ -13518,6 +13567,8 @@ glabel D_800E8C5C .word 0x800B4DC4 .word 0x800B4DC4 .word 0x800B4DC0 + +glabel D_800E8D88 .word 0x800B52C4 .word 0x800B5E0C .word 0x800B5794 @@ -13570,6 +13621,8 @@ glabel D_800E8C5C .word 0x800B5E0C .word 0x800B5E0C .word 0x800B4FA4 + +glabel D_800E8E58 .word 0x800B6658 .word 0x800B6740 .word 0x800B6614 @@ -13690,6 +13743,7 @@ glabel D_800E9138 ### End of EPC lockup strings ### +glabel D_800E913C .word 0x800B7898 .word 0x800B7C18 .word 0x800B7C18 @@ -13730,6 +13784,8 @@ glabel D_800E92BC .word 0x47AE147B .word 0x00000000 .word 0x00000000 + +glabel D_800E92D0 .word 0x800C0310 .word 0x800C0320 .word 0x800C0370 @@ -13737,6 +13793,8 @@ glabel D_800E92BC .word 0x800C03D0 .word 0x800C0420 .word 0x800C0470 + +glabel D_800E92EC .word 0x800C056C .word 0x800C0580 .word 0x800C0580 @@ -13750,6 +13808,8 @@ glabel D_800E9308 glabel D_800E930C .word 0x3F99999A + +glabel D_800E9310 .word 0x800C0680 .word 0x800C0694 .word 0x800C06A8 @@ -13760,6 +13820,8 @@ glabel D_800E930C glabel D_800E932C .word 0x3F99999A + +glabel D_800E9330 .word 0x800C3958 .word 0x800C3984 .word 0x800C3A30 @@ -13772,6 +13834,8 @@ glabel D_800E932C .word 0x800C3BA0 .word 0x00000000 .word 0x00000000 + +glabel D_800E9360 .word 0x800C4A88 .word 0x800C4A78 .word 0x800C4AD0 @@ -13892,6 +13956,7 @@ glabel D_800E95A0 glabel D_800E95A8 .aligned_text "env.c" +glabel D_800E95B0 .word 0x800CA870 .word 0x800CA8C4 .word 0x800CA8C4 @@ -13917,6 +13982,8 @@ glabel D_800E95F8 glabel D_800E95FC .word 0x00000000 + +glabel D_800E9600 .word 0x800CC0C0 .word 0x800CC150 .word 0x800CC150 @@ -13937,6 +14004,8 @@ glabel D_800E95FC .word 0x9D353918 .word 0x00000000 .word 0x00000000 + +glabel D_800E9650 .word 0x800D2A70 .word 0x800D2964 .word 0x800D29A4 @@ -13945,6 +14014,8 @@ glabel D_800E95FC .word 0x800D29E0 .word 0x800D2A28 .word 0x00000000 + +glabel D_800E9670 .word 0x00141818 .word 0x1C1C1C1C .word 0x20202020 @@ -13953,6 +14024,8 @@ glabel D_800E95FC .word 0x0C0C0C0C .word 0x10101010 .word 0x10101010 + +glabel D_800E9690 .word 0x800D3168 .word 0x800D3130 .word 0x800D3110 @@ -13972,12 +14045,16 @@ glabel D_800E96C0 glabel D_800E96C4 .word 0x202B2D23 .word 0x30000000 + +glabel D_800E96CC .word 0x00000001 .word 0x00000002 .word 0x00000004 .word 0x00000008 .word 0x00000010 .word 0x00000000 + +glabel D_800E96E4 .word 0x800D3C08 .word 0x800D3EE8 .word 0x800D3C08 diff --git a/lib/asm/exception/__osException.s b/lib/asm/exception/__osException.s index fab1c365..b49a8d69 100644 --- a/lib/asm/exception/__osException.s +++ b/lib/asm/exception/__osException.s @@ -134,12 +134,12 @@ glabel __osException /* 0D3AC0 800D2EC0 00095202 */ srl $t2, $t1, 8 /* 0D3AC4 800D2EC4 214A0010 */ addi $t2, $t2, 0x10 .L800D2EC8: -/* 0D3AC8 800D2EC8 3C01800F */ lui $at, 0x800f +/* 0D3AC8 800D2EC8 3C01800F */ lui $at, %hi(D_800E9670) # $at, 0x800f /* 0D3ACC 800D2ECC 002A0821 */ addu $at, $at, $t2 -/* 0D3AD0 800D2ED0 902A9670 */ lbu $t2, -0x6990($at) -/* 0D3AD4 800D2ED4 3C01800F */ lui $at, 0x800f +/* 0D3AD0 800D2ED0 902A9670 */ lbu $t2, %lo(D_800E9670)($at) +/* 0D3AD4 800D2ED4 3C01800F */ lui $at, %hi(D_800E9690) # $at, 0x800f /* 0D3AD8 800D2ED8 002A0821 */ addu $at, $at, $t2 -/* 0D3ADC 800D2EDC 8C2A9690 */ lw $t2, -0x6970($at) +/* 0D3ADC 800D2EDC 8C2A9690 */ lw $t2, %lo(D_800E9690)($at) /* 0D3AE0 800D2EE0 01400008 */ jr $t2 /* 0D3AE4 800D2EE4 00000000 */ nop /* 0D3AE8 800D2EE8 2401DFFF */ li $at, -8193 diff --git a/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s b/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s index 93922e31..5b4a7c16 100644 --- a/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s +++ b/lib/asm/non_matchings/osEepromRead_0CEE80/osEepromRead.s @@ -60,11 +60,11 @@ glabel osEepromRead .L800CE354: /* 0CEF54 800CE354 8FAD0030 */ lw $t5, 0x30($sp) /* 0CEF58 800CE358 8FAF0030 */ lw $t7, 0x30($sp) -/* 0CEF5C 800CE35C 3C018013 */ lui $at, 0x8013 +/* 0CEF5C 800CE35C 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CEF60 800CE360 000D7080 */ sll $t6, $t5, 2 /* 0CEF64 800CE364 002E0821 */ addu $at, $at, $t6 /* 0CEF68 800CE368 240C00FF */ li $t4, 255 -/* 0CEF6C 800CE36C AC2CCE40 */ sw $t4, -0x31c0($at) +/* 0CEF6C 800CE36C AC2CCE40 */ sw $t4, %lo(D_8012CE40)($at) /* 0CEF70 800CE370 25F80001 */ addiu $t8, $t7, 1 /* 0CEF74 800CE374 2B010010 */ slti $at, $t8, 0x10 /* 0CEF78 800CE378 1420FFF6 */ bnez $at, .L800CE354 diff --git a/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s b/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s index 81abd45b..05ef776b 100644 --- a/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s +++ b/lib/asm/non_matchings/osEepromWrite_0CF180/osEepromWrite.s @@ -60,11 +60,11 @@ glabel osEepromWrite .L800CE654: /* 0CF254 800CE654 8FAD0030 */ lw $t5, 0x30($sp) /* 0CF258 800CE658 8FAF0030 */ lw $t7, 0x30($sp) -/* 0CF25C 800CE65C 3C018013 */ lui $at, 0x8013 +/* 0CF25C 800CE65C 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CF260 800CE660 000D7080 */ sll $t6, $t5, 2 /* 0CF264 800CE664 002E0821 */ addu $at, $at, $t6 /* 0CF268 800CE668 240C00FF */ li $t4, 255 -/* 0CF26C 800CE66C AC2CCE40 */ sw $t4, -0x31c0($at) +/* 0CF26C 800CE66C AC2CCE40 */ sw $t4, %lo(D_8012CE40)($at) /* 0CF270 800CE670 25F80001 */ addiu $t8, $t7, 1 /* 0CF274 800CE674 2B010010 */ slti $at, $t8, 0x10 /* 0CF278 800CE678 1420FFF6 */ bnez $at, .L800CE654 diff --git a/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s b/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s index e4909cd2..a5216acb 100644 --- a/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s +++ b/lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s @@ -23,9 +23,9 @@ glabel osSetIntMask /* 0CA680 800C9A80 00814024 */ and $t0, $a0, $at /* 0CA684 800C9A84 010B4024 */ and $t0, $t0, $t3 /* 0CA688 800C9A88 000843C2 */ srl $t0, $t0, 0xf -/* 0CA68C 800C9A8C 3C0A800F */ lui $t2, 0x800f +/* 0CA68C 800C9A8C 3C0A800F */ lui $t2, %hi(D_800E94D0) # $t2, 0x800f /* 0CA690 800C9A90 01485021 */ addu $t2, $t2, $t0 -/* 0CA694 800C9A94 954A94D0 */ lhu $t2, -0x6b30($t2) +/* 0CA694 800C9A94 954A94D0 */ lhu $t2, %lo(D_800E94D0)($t2) /* 0CA698 800C9A98 3C01A430 */ lui $at, %hi(D_A430000C) # $at, 0xa430 /* 0CA69C 800C9A9C AC2A000C */ sw $t2, %lo(D_A430000C)($at) /* 0CA6A0 800C9AA0 3088FF01 */ andi $t0, $a0, 0xff01 diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s index 9d88bd8a..0223ecb5 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s @@ -86,9 +86,9 @@ glabel alEnvMixerPull /* 0CAE08 800CA208 102001AE */ beqz $at, .L800CA8C4 /* 0CAE0C 800CA20C 00000000 */ nop /* 0CAE10 800CA210 000C6080 */ sll $t4, $t4, 2 -/* 0CAE14 800CA214 3C01800F */ lui $at, 0x800f +/* 0CAE14 800CA214 3C01800F */ lui $at, %hi(D_800E95B0) # $at, 0x800f /* 0CAE18 800CA218 002C0821 */ addu $at, $at, $t4 -/* 0CAE1C 800CA21C 8C2C95B0 */ lw $t4, -0x6a50($at) +/* 0CAE1C 800CA21C 8C2C95B0 */ lw $t4, %lo(D_800E95B0)($at) /* 0CAE20 800CA220 00000000 */ nop /* 0CAE24 800CA224 01800008 */ jr $t4 /* 0CAE28 800CA228 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s b/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s index dd4bc702..a587bdec 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s @@ -6,9 +6,9 @@ glabel alResampleParam /* 0CCCA0 800CC0A0 1020002B */ beqz $at, .L800CC150 /* 0CCCA4 800CC0A4 00803825 */ move $a3, $a0 /* 0CCCA8 800CC0A8 000E7080 */ sll $t6, $t6, 2 -/* 0CCCAC 800CC0AC 3C01800F */ lui $at, 0x800f +/* 0CCCAC 800CC0AC 3C01800F */ lui $at, %hi(D_800E9600) # $at, 0x800f /* 0CCCB0 800CC0B0 002E0821 */ addu $at, $at, $t6 -/* 0CCCB4 800CC0B4 8C2E9600 */ lw $t6, -0x6a00($at) +/* 0CCCB4 800CC0B4 8C2E9600 */ lw $t6, %lo(D_800E9600)($at) /* 0CCCB8 800CC0B8 01C00008 */ jr $t6 /* 0CCCBC 800CC0BC 00000000 */ nop /* 0CCCC0 800CC0C0 10000029 */ b .L800CC168 diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s index 2fabf639..bb5da71e 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s +++ b/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s @@ -25,11 +25,11 @@ glabel func_800CCFE0 .L800CD038: /* 0CDC38 800CD038 8FB80018 */ lw $t8, 0x18($sp) /* 0CDC3C 800CD03C 8FA80018 */ lw $t0, 0x18($sp) -/* 0CDC40 800CD040 3C018013 */ lui $at, 0x8013 +/* 0CDC40 800CD040 3C018013 */ lui $at, %hi(D_8012CD50) # $at, 0x8013 /* 0CDC44 800CD044 0018C880 */ sll $t9, $t8, 2 /* 0CDC48 800CD048 00390821 */ addu $at, $at, $t9 /* 0CDC4C 800CD04C 240F00FF */ li $t7, 255 -/* 0CDC50 800CD050 AC2FCD50 */ sw $t7, -0x32b0($at) +/* 0CDC50 800CD050 AC2FCD50 */ sw $t7, %lo(D_8012CD50)($at) /* 0CDC54 800CD054 25090001 */ addiu $t1, $t0, 1 /* 0CDC58 800CD058 29210010 */ slti $at, $t1, 0x10 /* 0CDC5C 800CD05C 1420FFF6 */ bnez $at, .L800CD038 diff --git a/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s b/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s index ca36ff5e..70747e5f 100644 --- a/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s +++ b/lib/asm/non_matchings/unknown_0CE370/__osContRamWrite.s @@ -47,11 +47,11 @@ glabel __osContRamWrite .L800CD99C: /* 0CE59C 800CD99C 8FAA0058 */ lw $t2, 0x58($sp) /* 0CE5A0 800CD9A0 8FAC0058 */ lw $t4, 0x58($sp) -/* 0CE5A4 800CD9A4 3C018013 */ lui $at, 0x8013 +/* 0CE5A4 800CD9A4 3C018013 */ lui $at, %hi(__osPfsPifRam) # $at, 0x8013 /* 0CE5A8 800CD9A8 000A5880 */ sll $t3, $t2, 2 /* 0CE5AC 800CD9AC 002B0821 */ addu $at, $at, $t3 /* 0CE5B0 800CD9B0 240900FF */ li $t1, 255 -/* 0CE5B4 800CD9B4 AC29CDE0 */ sw $t1, -0x3220($at) +/* 0CE5B4 800CD9B4 AC29CDE0 */ sw $t1, %lo(__osPfsPifRam)($at) /* 0CE5B8 800CD9B8 258D0001 */ addiu $t5, $t4, 1 /* 0CE5BC 800CD9BC 29A10010 */ slti $at, $t5, 0x10 /* 0CE5C0 800CD9C0 1420FFF6 */ bnez $at, .L800CD99C diff --git a/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s b/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s index ec84f74e..334703a2 100644 --- a/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s +++ b/lib/asm/non_matchings/unknown_0CE8A0/__osContRamRead.s @@ -33,11 +33,11 @@ glabel __osContRamRead .L800CDD18: /* 0CE918 800CDD18 8FA80058 */ lw $t0, 0x58($sp) /* 0CE91C 800CDD1C 8FAA0058 */ lw $t2, 0x58($sp) -/* 0CE920 800CDD20 3C018013 */ lui $at, 0x8013 +/* 0CE920 800CDD20 3C018013 */ lui $at, %hi(__osPfsPifRam) # $at, 0x8013 /* 0CE924 800CDD24 00084880 */ sll $t1, $t0, 2 /* 0CE928 800CDD28 00290821 */ addu $at, $at, $t1 /* 0CE92C 800CDD2C 241900FF */ li $t9, 255 -/* 0CE930 800CDD30 AC39CDE0 */ sw $t9, -0x3220($at) +/* 0CE930 800CDD30 AC39CDE0 */ sw $t9, %lo(__osPfsPifRam)($at) /* 0CE934 800CDD34 254B0001 */ addiu $t3, $t2, 1 /* 0CE938 800CDD38 29610010 */ slti $at, $t3, 0x10 /* 0CE93C 800CDD3C 1420FFF6 */ bnez $at, .L800CDD18 diff --git a/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s b/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s index 1cc3132e..37b43d7f 100644 --- a/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s +++ b/lib/asm/non_matchings/unknown_0CF070/__osPackEepReadData.s @@ -8,11 +8,11 @@ glabel __osPackEepReadData .L800CE488: /* 0CF088 800CE488 8FB80004 */ lw $t8, 4($sp) /* 0CF08C 800CE48C 8FA80004 */ lw $t0, 4($sp) -/* 0CF090 800CE490 3C018013 */ lui $at, 0x8013 +/* 0CF090 800CE490 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CF094 800CE494 0018C880 */ sll $t9, $t8, 2 /* 0CF098 800CE498 00390821 */ addu $at, $at, $t9 /* 0CF09C 800CE49C 240F00FF */ li $t7, 255 -/* 0CF0A0 800CE4A0 AC2FCE40 */ sw $t7, -0x31c0($at) +/* 0CF0A0 800CE4A0 AC2FCE40 */ sw $t7, %lo(D_8012CE40)($at) /* 0CF0A4 800CE4A4 25090001 */ addiu $t1, $t0, 1 /* 0CF0A8 800CE4A8 29210010 */ slti $at, $t1, 0x10 /* 0CF0AC 800CE4AC 1420FFF6 */ bnez $at, .L800CE488 diff --git a/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s b/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s index e2a276a3..bca8a948 100644 --- a/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s +++ b/lib/asm/non_matchings/unknown_0CF330/__osPackEepWriteData.s @@ -8,11 +8,11 @@ glabel __osPackEepWriteData .L800CE748: /* 0CF348 800CE748 8FB80004 */ lw $t8, 4($sp) /* 0CF34C 800CE74C 8FA80004 */ lw $t0, 4($sp) -/* 0CF350 800CE750 3C018013 */ lui $at, 0x8013 +/* 0CF350 800CE750 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CF354 800CE754 0018C880 */ sll $t9, $t8, 2 /* 0CF358 800CE758 00390821 */ addu $at, $at, $t9 /* 0CF35C 800CE75C 240F00FF */ li $t7, 255 -/* 0CF360 800CE760 AC2FCE40 */ sw $t7, -0x31c0($at) +/* 0CF360 800CE760 AC2FCE40 */ sw $t7, %lo(D_8012CE40)($at) /* 0CF364 800CE764 25090001 */ addiu $t1, $t0, 1 /* 0CF368 800CE768 29210010 */ slti $at, $t1, 0x10 /* 0CF36C 800CE76C 1420FFF6 */ bnez $at, .L800CE748 diff --git a/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s b/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s index 8e6cc44f..90b4a7d3 100644 --- a/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s +++ b/lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s @@ -131,9 +131,9 @@ glabel __osDevMgrMain /* 0D3544 800D2944 10200052 */ beqz $at, .L800D2A90 /* 0D3548 800D2948 00000000 */ nop /* 0D354C 800D294C 00084080 */ sll $t0, $t0, 2 -/* 0D3550 800D2950 3C01800F */ lui $at, 0x800f +/* 0D3550 800D2950 3C01800F */ lui $at, %hi(D_800E9650) # $at, 0x800f /* 0D3554 800D2954 00280821 */ addu $at, $at, $t0 -/* 0D3558 800D2958 8C289650 */ lw $t0, -0x69b0($at) +/* 0D3558 800D2958 8C289650 */ lw $t0, %lo(D_800E9650)($at) /* 0D355C 800D295C 01000008 */ jr $t0 /* 0D3560 800D2960 00000000 */ nop /* 0D3564 800D2964 8FAC002C */ lw $t4, 0x2c($sp) diff --git a/lib/asm/non_matchings/unknown_0D43F0/_Printf.s b/lib/asm/non_matchings/unknown_0D43F0/_Printf.s index 3665ed34..54a3b70e 100644 --- a/lib/asm/non_matchings/unknown_0D43F0/_Printf.s +++ b/lib/asm/non_matchings/unknown_0D43F0/_Printf.s @@ -70,9 +70,9 @@ glabel _Printf .L800D4004: /* 0D4C04 800D4004 0216C823 */ subu $t9, $s0, $s6 /* 0D4C08 800D4008 00197080 */ sll $t6, $t9, 2 -/* 0D4C0C 800D400C 3C0F800F */ lui $t7, 0x800f +/* 0D4C0C 800D400C 3C0F800F */ lui $t7, %hi(D_800E96CC) # $t7, 0x800f /* 0D4C10 800D4010 01EE7821 */ addu $t7, $t7, $t6 -/* 0D4C14 800D4014 8DEF96CC */ lw $t7, -0x6934($t7) +/* 0D4C14 800D4014 8DEF96CC */ lw $t7, %lo(D_800E96CC)($t7) /* 0D4C18 800D4018 8FB800D8 */ lw $t8, 0xd8($sp) /* 0D4C1C 800D401C 26520001 */ addiu $s2, $s2, 1 /* 0D4C20 800D4020 02C02025 */ move $a0, $s6 diff --git a/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s b/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s index c2b6b07b..f2aa5b98 100644 --- a/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s +++ b/lib/asm/non_matchings/unknown_0D43F0/_Putfld.s @@ -17,9 +17,9 @@ glabel _Putfld /* 0D44DC 800D38DC 2DE10034 */ sltiu $at, $t7, 0x34 /* 0D44E0 800D38E0 10200181 */ beqz $at, .L800D3EE8 /* 0D44E4 800D38E4 000F7880 */ sll $t7, $t7, 2 -/* 0D44E8 800D38E8 3C01800F */ lui $at, 0x800f +/* 0D44E8 800D38E8 3C01800F */ lui $at, %hi(D_800E96E4) # $at, 0x800f /* 0D44EC 800D38EC 002F0821 */ addu $at, $at, $t7 -/* 0D44F0 800D38F0 8C2F96E4 */ lw $t7, -0x691c($at) +/* 0D44F0 800D38F0 8C2F96E4 */ lw $t7, %lo(D_800E96E4)($at) /* 0D44F4 800D38F4 01E00008 */ jr $t7 /* 0D44F8 800D38F8 00000000 */ nop .L800D38FC: diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 126abca9..b75e3837 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -57,9 +57,12 @@ f32 D_800DC76C[15] = { 0.0f, -0.70711f, 0.70711f }; -u16 D_800DC7A8[76] = { +u16 D_800DC7A8[8] = { 0x0001, 0x0002, 0x0003, 0x0004, - 0x0051, 0x0054, 0x0055, 0x0056, + 0x0051, 0x0054, 0x0055, 0x0056 +}; + +s16 D_800DC7B8[52] = { 0x00ED, 0x00FF, 0x0037, 0x0038, 0x0039, 0x003A, 0x0057, 0x0058, 0x0059, 0x005A, 0x00F3, 0x00FD, @@ -69,10 +72,16 @@ u16 D_800DC7A8[76] = { 0x0003, 0x0004, 0x0051, 0x0054, 0x0055, 0x0056, 0x00ED, 0x00FF, 0x0001, 0x0002, 0x0003, 0x0004, - 0x0051, 0x0054, 0x0055, 0x0056, - 0x00ED, 0x00FF, 0x00D9, 0x00DF, - 0x00E0, 0x0105, 0x008A, 0x00DA, - 0x00E8, 0x0115, 0x0118, 0x0000, + 0x0051, + +//s16 D_800DC802[15] = { 37 + 0x0054, 0x0055, 0x0056, 0x00ED, + 0x00FF, 0x00D9, 0x00DF, 0x00E0, + 0x0105, 0x008A, 0x00DA, 0x00E8, + 0x0115, 0x0118, 0x0000 +}; + +s16 D_800DC820[16] = { 0x0005, 0x0106, 0x0207, 0x0005, 0x0106, 0x010B, 0x010B, 0x0207, 0x000C, 0x020D, 0x0101, 0x0101, diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 89ef0279..1a5bbb45 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -68,9 +68,15 @@ s8 D_800DCA70[10] = { s32 D_800DCA7C[3] = { // Not sure about typing 0, 0, 0 }; -s32 D_800DCA88[8] = { // Definitly not s32, but I'm not sure what this is yet. - 0, 0, 0, 0x00000101, - 0x02000000, 0x00010102, 0x02000000, 0x00000000 +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_800DCA9C[4] = { + 0x00, 0x00, 0x00, 0x00 }; u16 D_800DCAA8[64] = { 0x0000, 0x0301, 0x0000, 0x0000, diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 0fa39fcc..54c512b4 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -36,30 +36,48 @@ f32 D_800DCB9C[38] = { }; // Unused? Not sure if this is actually an array or just some random data. -s32 D_800DCC34[38] = { +s32 D_800DCC34[19] = { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 26, 27, 0, + 0, 0, 0 +}; + +s32 D_800DCC80[19] = { + 0, 26, 27, 0, 0, 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[20] = { +s16 D_800DCCB4[6] = { 0x010C, 0x010B, 0x0009, 0x010C, + 0x010C, 0x010C +}; + +u16 D_800DCCCC[14] = { 0x010C, 0x010C, 0x010C, 0x010C, - 0x010C, 0x010C, 0x010C, 0x0005, + 0x010C, 0x0005, 0x010C, 0x010C, 0x010C, 0x010C, 0x010C, 0x010C, - 0x010C, 0x010C, 0x010C, 0x0000 + 0x010C, 0x0000 }; // Unused? Not sure if this is actually an array or just some random data. -s32 D_800DCCDC[39] = { - 1, 4, 16, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 0x100, 1, 1, - 1, 1, 1, 0, 4, 16, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0x100, 0, 0, 0, 0, 0, 0 +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 +}; + +// Used for some sort of bit mask +s32 D_800DCD40[18] = { + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0x100, 0, 0, 0, 0, + 0, 0 }; s8 D_800DCD90[15] = { @@ -68,8 +86,11 @@ s8 D_800DCD90[15] = { }; // Unused? -s8 D_800DCDA0[16] = { +s8 D_800DCDA0[8] = { 0, 0, 0, 1, 1, 2, 2, 2, +}; + +s8 D_800DCDA8[8] = { 1, 1, 1, 2, 3, 2, 3, 2 }; diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index d6a66ca9..94fe4ea1 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -5,11 +5,11 @@ from file_util import FileUtil LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{4})\(\4\))' GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*lui\s+)([^\n]*)' -LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)0x[0-9a-f]{4}([^\n]*)' +LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)' IGNORE_GLABELS = ['D_800E389E', 'D_801264A1'] @@ -23,6 +23,8 @@ def _find_glabels(asm): offsets = (match[2], match[11]) # ROM offsets of the lui and [sl][bhw] glabel_upper = int(match[5], 16) # upper immediate of glabel glabel_lower = int(match[14], 16) # lower immediate of the glabel + if glabel_lower < 0: + glabel_lower = (-glabel_lower ^ 0xFFFF) + 1 if glabel_lower & 0x8000: glabel_upper -= 1 glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) diff --git a/undefined_syms.txt b/undefined_syms.txt index c26f892d..28c6dac2 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -128,6 +128,10 @@ 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; @@ -156,13 +160,23 @@ 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_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; @@ -1587,6 +1601,9 @@ 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; @@ -1596,7 +1613,16 @@ D_800E83A4 = 0x800E83A4; D_800E83A8 = 0x800E83A8; D_800E83AC = 0x800E83AC; D_800E83B0 = 0x800E83B0; +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; @@ -1605,9 +1631,18 @@ 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; @@ -1629,6 +1664,7 @@ D_800E86E8 = 0x800E86E8; D_800E86EC = 0x800E86EC; D_800E86F0 = 0x800E86F0; D_800E86F4 = 0x800E86F4; +D_800E86F8 = 0x800E86F8; D_800E8718 = 0x800E8718; D_800E8720 = 0x800E8720; D_800E8724 = 0x800E8724; @@ -1639,10 +1675,12 @@ 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; @@ -1682,6 +1720,7 @@ D_800E8BCC = 0x800E8BCC; D_800E8BD0 = 0x800E8BD0; D_800E8BD4 = 0x800E8BD4; D_800E8BD8 = 0x800E8BD8; +D_800E8BDC = 0x800E8BDC; D_800E8BF0 = 0x800E8BF0; D_800E8BF4 = 0x800E8BF4; D_800E8C00 = 0x800E8C00; @@ -1689,6 +1728,10 @@ 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; @@ -1723,15 +1766,21 @@ 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_800E92B8 = 0x800E92B8; D_800E92BC = 0x800E92BC; +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; @@ -1749,10 +1798,17 @@ 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_800E9650 = 0x800E9650; +D_800E9670 = 0x800E9670; +D_800E9690 = 0x800E9690; D_800E96C0 = 0x800E96C0; D_800E96C4 = 0x800E96C4; +D_800E96CC = 0x800E96CC; +D_800E96E4 = 0x800E96E4; D_800E97C0 = 0x800E97C0; D_800E9810 = 0x800E9810; D_800E9860 = 0x800E9860; @@ -1917,6 +1973,7 @@ D_8011AE94 = 0x8011AE94; D_8011AE98 = 0x8011AE98; D_8011AEA0 = 0x8011AEA0; D_8011AEA4 = 0x8011AEA4; +D_8011AEA8 = 0x8011AEA8; D_8011AEB0 = 0x8011AEB0; D_8011AEB8 = 0x8011AEB8; D_8011AEBC = 0x8011AEBC; @@ -1958,9 +2015,11 @@ 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;