diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index a44839ef..9e814259 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -721,7 +721,7 @@ glabel L80039BB8 /* 03A940 80039D40 818D01D6 */ lb $t5, 0x1d6($t4) /* 03A944 80039D44 2408000F */ li $t0, 15 /* 03A948 80039D48 11A20011 */ beq $t5, $v0, .L80039D90 -/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(D_800E0235) # $a0, 0x800e +/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(D_800E0198+157) # $a0, 0x800e /* 03A950 80039D50 344E0080 */ ori $t6, $v0, 0x80 /* 03A954 80039D54 44804000 */ mtc1 $zero, $f8 /* 03A958 80039D58 A06E0000 */ sb $t6, ($v1) @@ -732,7 +732,7 @@ glabel L80039BB8 /* 03A96C 80039D6C 24050001 */ li $a1, 1 /* 03A970 80039D70 830401D6 */ lb $a0, 0x1d6($t8) /* 03A974 80039D74 00000000 */ nop -/* 03A978 80039D78 24840235 */ addiu $a0, %lo(D_800E0235) # addiu $a0, $a0, 0x235 +/* 03A978 80039D78 24840235 */ addiu $a0, %lo(D_800E0198+157) # addiu $a0, $a0, 0x235 /* 03A97C 80039D7C 3099FFFF */ andi $t9, $a0, 0xffff /* 03A980 80039D80 0C00EB0F */ jal func_8003AC3C /* 03A984 80039D84 03202025 */ move $a0, $t9 diff --git a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s index 4128349a..a71c4304 100644 --- a/asm/non_matchings/unknown_080500/MenuOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuOptionsLoop.s @@ -163,10 +163,10 @@ glabel MenuOptionsLoop /* 0851B4 800845B4 00002025 */ move $a0, $zero /* 0851B8 800845B8 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e /* 0851BC 800845BC 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) -/* 0851C0 800845C0 3C01800E */ lui $at, %hi(D_800DFA14) # $at, 0x800e +/* 0851C0 800845C0 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e /* 0851C4 800845C4 8D6A02DC */ lw $t2, 0x2dc($t3) /* 0851C8 800845C8 1000000E */ b .L80084604 -/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(D_800DFA14)($at) +/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(D_800DFA10+4)($at) .L800845D0: /* 0851D0 800845D0 0C000741 */ jal func_80001D04 /* 0851D4 800845D4 00002825 */ move $a1, $zero @@ -177,10 +177,10 @@ glabel MenuOptionsLoop /* 0851E8 800845E8 24040001 */ li $a0, 1 /* 0851EC 800845EC 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e /* 0851F0 800845F0 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) -/* 0851F4 800845F4 3C01800E */ lui $at, %hi(D_800DFA14) # $at, 0x800e +/* 0851F4 800845F4 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e /* 0851F8 800845F8 8D8D02D8 */ lw $t5, 0x2d8($t4) /* 0851FC 800845FC 00000000 */ nop -/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA14)($at) +/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA10+4)($at) .L80084604: /* 085204 80084604 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e /* 085208 80084608 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8007F900.s b/asm/non_matchings/unknown_080500/func_8007F900.s index 81e424e6..8d6f187b 100644 --- a/asm/non_matchings/unknown_080500/func_8007F900.s +++ b/asm/non_matchings/unknown_080500/func_8007F900.s @@ -395,25 +395,25 @@ glabel func_8007F900 /* 080AF0 8007FEF0 24A5FFD8 */ addiu $a1, %lo(D_800DFFD8) # addiu $a1, $a1, -0x28 /* 080AF4 8007FEF4 AC6C0004 */ sw $t4, 4($v1) /* 080AF8 8007FEF8 8C8E0288 */ lw $t6, 0x288($a0) -/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(D_800E002C) # $at, 0x800e +/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(D_800DFFD8+84) # $at, 0x800e /* 080B00 8007FF00 AC6E0008 */ sw $t6, 8($v1) /* 080B04 8007FF04 8C8D0260 */ lw $t5, 0x260($a0) /* 080B08 8007FF08 2482000C */ addiu $v0, $a0, 0xc /* 080B0C 8007FF0C ACAD0014 */ sw $t5, 0x14($a1) /* 080B10 8007FF10 8C8F0260 */ lw $t7, 0x260($a0) -/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(D_800E0038) # $v1, 0x800e +/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(D_800DFFD8+96) # $v1, 0x800e /* 080B18 8007FF18 ACAF0034 */ sw $t7, 0x34($a1) /* 080B1C 8007FF1C 8C980298 */ lw $t8, 0x298($a0) -/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(D_800E0038) # addiu $v1, $v1, 0x38 -/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(D_800E002C)($at) +/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(D_800DFFD8+96) # addiu $v1, $v1, 0x38 +/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(D_800DFFD8+84)($at) /* 080B28 8007FF28 8C99029C */ lw $t9, 0x29c($a0) -/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(D_800E004C) # $at, 0x800e -/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(D_800E004C)($at) +/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(D_800DFFD8+116) # $at, 0x800e +/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(D_800DFFD8+116)($at) /* 080B34 8007FF34 8C8A02A0 */ lw $t2, 0x2a0($a0) -/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(D_800E0138) # $a0, 0x800e -/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(D_800E006C) # $at, 0x800e -/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(D_800E0138) # addiu $a0, $a0, 0x138 -/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(D_800E006C)($at) +/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(D_800DFFD8+352) # $a0, 0x800e +/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(D_800DFFD8+148) # $at, 0x800e +/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(D_800DFFD8+352) # addiu $a0, $a0, 0x138 +/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(D_800DFFD8+148)($at) .L8007FF48: /* 080B48 8007FF48 8C4B0298 */ lw $t3, 0x298($v0) /* 080B4C 8007FF4C 24630080 */ addiu $v1, $v1, 0x80 diff --git a/asm/non_matchings/unknown_080500/func_80084854.s b/asm/non_matchings/unknown_080500/func_80084854.s index 89f6f5a9..6fa2ee02 100644 --- a/asm/non_matchings/unknown_080500/func_80084854.s +++ b/asm/non_matchings/unknown_080500/func_80084854.s @@ -75,12 +75,12 @@ glabel func_80084854 /* 085568 80084968 01CD9823 */ subu $s3, $t6, $t5 .L8008496C: /* 08556C 8008496C 8DEFFAC8 */ lw $t7, %lo(D_800DFAC8)($t7) -/* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA48) # $at, 0x800e +/* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA3C+12) # $at, 0x800e /* 085574 80084974 000FC080 */ sll $t8, $t7, 2 /* 085578 80084978 0338C821 */ addu $t9, $t9, $t8 /* 08557C 8008497C 8F3969D0 */ lw $t9, %lo(D_801269D0)($t9) /* 085580 80084980 0C019FCB */ jal func_80067F2C -/* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA48)($at) +/* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA3C+12)($at) /* 085588 80084988 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 /* 08558C 8008498C 8D080300 */ lw $t0, %lo(osTvType)($t0) /* 085590 80084990 3C11FFC0 */ lui $s1, (0xFFC040FF >> 16) # lui $s1, 0xffc0 @@ -204,7 +204,7 @@ glabel func_80084854 /* 085760 80084B60 00001825 */ move $v1, $zero /* 085764 80084B64 29810005 */ slti $at, $t4, 5 /* 085768 80084B68 10200005 */ beqz $at, .L80084B80 -/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA48) # $t5, 0x800e +/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA3C+12) # $t5, 0x800e /* 085770 80084B70 3C118012 */ lui $s1, %hi(D_80126C46) # $s1, 0x8012 /* 085774 80084B74 86316C46 */ lh $s1, %lo(D_80126C46)($s1) /* 085778 80084B78 1000000E */ b .L80084BB4 @@ -225,7 +225,7 @@ glabel func_80084854 /* 0857AC 80084BAC 10000001 */ b .L80084BB4 /* 0857B0 80084BB0 24110006 */ li $s1, 6 .L80084BB4: -/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(D_800DFA48)($t5) +/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(D_800DFA3C+12)($t5) /* 0857B8 80084BB8 00037100 */ sll $t6, $v1, 4 /* 0857BC 80084BBC 11A00026 */ beqz $t5, .L80084C58 /* 0857C0 80084BC0 3C0F800E */ lui $t7, %hi(D_800DFA3C) # $t7, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8008C168.s b/asm/non_matchings/unknown_080500/func_8008C168.s index 243201a2..ec55cfb5 100644 --- a/asm/non_matchings/unknown_080500/func_8008C168.s +++ b/asm/non_matchings/unknown_080500/func_8008C168.s @@ -22,10 +22,10 @@ glabel func_8008C168 /* 08CDB8 8008C1B8 0C000445 */ jal func_80001114 /* 08CDBC 8008C1BC 00000000 */ nop /* 08CDC0 8008C1C0 82080000 */ lb $t0, ($s0) -/* 08CDC4 8008C1C4 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CDC4 8008C1C4 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CDC8 8008C1C8 00084840 */ sll $t1, $t0, 1 /* 08CDCC 8008C1CC 00892021 */ addu $a0, $a0, $t1 -/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CDD4 8008C1D4 0C000445 */ jal func_80001114 /* 08CDD8 8008C1D8 00000000 */ nop /* 08CDDC 8008C1DC 3C058012 */ lui $a1, %hi(D_801263C0) # $a1, 0x8012 @@ -57,10 +57,10 @@ glabel func_8008C168 /* 08CE3C 8008C23C 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CE40 8008C240 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CE44 8008C244 806E0000 */ lb $t6, ($v1) -/* 08CE48 8008C248 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CE48 8008C248 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CE4C 8008C24C 000E7840 */ sll $t7, $t6, 1 /* 08CE50 8008C250 008F2021 */ addu $a0, $a0, $t7 -/* 08CE54 8008C254 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CE54 8008C254 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CE58 8008C258 0C00045C */ jal func_80001170 /* 08CE5C 8008C25C 00000000 */ nop .L8008C260: @@ -92,10 +92,10 @@ glabel func_8008C168 /* 08CEC0 8008C2C0 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CEC4 8008C2C4 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CEC8 8008C2C8 806C0000 */ lb $t4, ($v1) -/* 08CECC 8008C2CC 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CECC 8008C2CC 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CED0 8008C2D0 000C6840 */ sll $t5, $t4, 1 /* 08CED4 8008C2D4 008D2021 */ addu $a0, $a0, $t5 -/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CEDC 8008C2DC 90650003 */ lbu $a1, 3($v1) /* 08CEE0 8008C2E0 0C00049A */ jal func_80001268 /* 08CEE4 8008C2E4 00000000 */ nop @@ -122,10 +122,10 @@ glabel func_8008C168 /* 08CF34 8008C334 0C000445 */ jal func_80001114 /* 08CF38 8008C338 00000000 */ nop /* 08CF3C 8008C33C 820A0000 */ lb $t2, ($s0) -/* 08CF40 8008C340 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CF40 8008C340 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CF44 8008C344 000A5840 */ sll $t3, $t2, 1 /* 08CF48 8008C348 008B2021 */ addu $a0, $a0, $t3 -/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CF50 8008C350 0C000445 */ jal func_80001114 /* 08CF54 8008C354 00000000 */ nop /* 08CF58 8008C358 1000000E */ b .L8008C394 @@ -136,10 +136,10 @@ glabel func_8008C168 /* 08CF68 8008C368 0C00049A */ jal func_80001268 /* 08CF6C 8008C36C 306500FF */ andi $a1, $v1, 0xff /* 08CF70 8008C370 820D0000 */ lb $t5, ($s0) -/* 08CF74 8008C374 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e +/* 08CF74 8008C374 3C04800E */ lui $a0, %hi(D_800DFDB4+1) # $a0, 0x800e /* 08CF78 8008C378 000D7840 */ sll $t7, $t5, 1 /* 08CF7C 8008C37C 008F2021 */ addu $a0, $a0, $t7 -/* 08CF80 8008C380 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) +/* 08CF80 8008C380 9084FDB5 */ lbu $a0, %lo(D_800DFDB4+1)($a0) /* 08CF84 8008C384 92050003 */ lbu $a1, 3($s0) /* 08CF88 8008C388 0C00049A */ jal func_80001268 /* 08CF8C 8008C38C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80094A5C.s b/asm/non_matchings/unknown_080500/func_80094A5C.s index 2156883e..31f49e00 100644 --- a/asm/non_matchings/unknown_080500/func_80094A5C.s +++ b/asm/non_matchings/unknown_080500/func_80094A5C.s @@ -36,16 +36,16 @@ glabel func_80094A5C /* 0956E0 80094AE0 000B6080 */ sll $t4, $t3, 2 /* 0956E4 80094AE4 00AC6821 */ addu $t5, $a1, $t4 /* 0956E8 80094AE8 8DAE0000 */ lw $t6, ($t5) -/* 0956EC 80094AEC 3C01800E */ lui $at, %hi(D_800E0C00) # $at, 0x800e +/* 0956EC 80094AEC 3C01800E */ lui $at, %hi(D_800E0BEC+20) # $at, 0x800e /* 0956F0 80094AF0 AFA2001C */ sw $v0, 0x1c($sp) /* 0956F4 80094AF4 0C003932 */ jal func_8000E4C8 -/* 0956F8 80094AF8 AC2E0C00 */ sw $t6, %lo(D_800E0C00)($at) +/* 0956F8 80094AF8 AC2E0C00 */ sw $t6, %lo(D_800E0BEC+20)($at) /* 0956FC 80094AFC 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e /* 095700 80094B00 8FA9001C */ lw $t1, 0x1c($sp) /* 095704 80094B04 14400034 */ bnez $v0, .L80094BD8 /* 095708 80094B08 24A50AF0 */ addiu $a1, %lo(D_800E0AF0) # addiu $a1, $a1, 0xaf0 -/* 09570C 80094B0C 3C06800E */ lui $a2, %hi(D_800E0DCC) # $a2, 0x800e -/* 095710 80094B10 24C60DCC */ addiu $a2, %lo(D_800E0DCC) # addiu $a2, $a2, 0xdcc +/* 09570C 80094B0C 3C06800E */ lui $a2, %hi(D_800E0CEC+224) # $a2, 0x800e +/* 095710 80094B10 24C60DCC */ addiu $a2, %lo(D_800E0CEC+224) # addiu $a2, $a2, 0xdcc /* 095714 80094B14 00002025 */ move $a0, $zero /* 095718 80094B18 240700C0 */ li $a3, 192 /* 09571C 80094B1C 00001825 */ move $v1, $zero @@ -73,19 +73,19 @@ glabel func_80094A5C /* 095768 80094B68 0C027B20 */ jal is_in_two_player_adventure /* 09576C 80094B6C 00000000 */ nop /* 095770 80094B70 10400019 */ beqz $v0, .L80094BD8 -/* 095774 80094B74 3C0F800E */ lui $t7, %hi(D_800E0D40) # $t7, 0x800e -/* 095778 80094B78 8DEF0D40 */ lw $t7, %lo(D_800E0D40)($t7) -/* 09577C 80094B7C 3C01800E */ lui $at, %hi(D_800E0D20) # $at, 0x800e -/* 095780 80094B80 3C18800E */ lui $t8, %hi(D_800E0D60) # $t8, 0x800e -/* 095784 80094B84 AC2F0D20 */ sw $t7, %lo(D_800E0D20)($at) -/* 095788 80094B88 8F180D60 */ lw $t8, %lo(D_800E0D60)($t8) +/* 095774 80094B74 3C0F800E */ lui $t7, %hi(D_800E0CEC+84) # $t7, 0x800e +/* 095778 80094B78 8DEF0D40 */ lw $t7, %lo(D_800E0CEC+84)($t7) +/* 09577C 80094B7C 3C01800E */ lui $at, %hi(D_800E0CEC+52) # $at, 0x800e +/* 095780 80094B80 3C18800E */ lui $t8, %hi(D_800E0CEC+116) # $t8, 0x800e +/* 095784 80094B84 AC2F0D20 */ sw $t7, %lo(D_800E0CEC+52)($at) +/* 095788 80094B88 8F180D60 */ lw $t8, %lo(D_800E0CEC+116)($t8) /* 09578C 80094B8C 24040002 */ li $a0, 2 /* 095790 80094B90 3C03800E */ lui $v1, %hi(D_800E0CEC) # $v1, 0x800e /* 095794 80094B94 24630CEC */ addiu $v1, %lo(D_800E0CEC) # addiu $v1, $v1, 0xcec -/* 095798 80094B98 3C01800E */ lui $at, %hi(D_800E0D40) # $at, 0x800e +/* 095798 80094B98 3C01800E */ lui $at, %hi(D_800E0CEC+84) # $at, 0x800e /* 09579C 80094B9C 0004C940 */ sll $t9, $a0, 5 /* 0957A0 80094BA0 00791021 */ addu $v0, $v1, $t9 -/* 0957A4 80094BA4 AC380D40 */ sw $t8, %lo(D_800E0D40)($at) +/* 0957A4 80094BA4 AC380D40 */ sw $t8, %lo(D_800E0CEC+84)($at) /* 0957A8 80094BA8 8C4D0094 */ lw $t5, 0x94($v0) /* 0957AC 80094BAC 8C4B00B4 */ lw $t3, 0xb4($v0) /* 0957B0 80094BB0 8C4C0074 */ lw $t4, 0x74($v0) diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 6c4aa5c1..59a489f6 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -241,8 +241,8 @@ glabel L80094FB0 /* 095C7C 8009507C 10000142 */ b .L80095588 /* 095C80 80095080 A04700CE */ sb $a3, 0xce($v0) glabel L80095084 -/* 095C84 80095084 3C06800E */ lui $a2, %hi(D_800E0DCC) # $a2, 0x800e -/* 095C88 80095088 24C60DCC */ addiu $a2, %lo(D_800E0DCC) # addiu $a2, $a2, 0xdcc +/* 095C84 80095084 3C06800E */ lui $a2, %hi(D_800E0CEC+224) # $a2, 0x800e +/* 095C88 80095088 24C60DCC */ addiu $a2, %lo(D_800E0CEC+224) # addiu $a2, $a2, 0xdcc /* 095C8C 8009508C 00002825 */ move $a1, $zero /* 095C90 80095090 24110008 */ li $s1, 8 .L80095094: diff --git a/asm/non_matchings/unknown_080500/func_80098EBC.s b/asm/non_matchings/unknown_080500/func_80098EBC.s index 868619e5..7b2f7b44 100644 --- a/asm/non_matchings/unknown_080500/func_80098EBC.s +++ b/asm/non_matchings/unknown_080500/func_80098EBC.s @@ -19,7 +19,7 @@ glabel func_80098EBC /* 099AFC 80098EFC 00002025 */ move $a0, $zero /* 099B00 80098F00 19200024 */ blez $t1, .L80098F94 /* 099B04 80098F04 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e -/* 099B08 80098F08 3C05800E */ lui $a1, %hi(D_800E1088) # $a1, 0x800e +/* 099B08 80098F08 3C05800E */ lui $a1, %hi(D_800E1048+64) # $a1, 0x800e /* 099B0C 80098F0C 3C0B8012 */ lui $t3, %hi(D_801263E0) # $t3, 0x8012 /* 099B10 80098F10 3C088012 */ lui $t0, %hi(D_80126420) # $t0, 0x8012 /* 099B14 80098F14 3C078012 */ lui $a3, %hi(D_80126418) # $a3, 0x8012 @@ -27,7 +27,7 @@ glabel func_80098EBC /* 099B1C 80098F1C 24E76418 */ addiu $a3, %lo(D_80126418) # addiu $a3, $a3, 0x6418 /* 099B20 80098F20 25086420 */ addiu $t0, %lo(D_80126420) # addiu $t0, $t0, 0x6420 /* 099B24 80098F24 256B63E0 */ addiu $t3, %lo(D_801263E0) # addiu $t3, $t3, 0x63e0 -/* 099B28 80098F28 24A51088 */ addiu $a1, %lo(D_800E1088) # addiu $a1, $a1, 0x1088 +/* 099B28 80098F28 24A51088 */ addiu $a1, %lo(D_800E1048+64) # addiu $a1, $a1, 0x1088 .L80098F2C: /* 099B2C 80098F2C 29410003 */ slti $at, $t2, 3 /* 099B30 80098F30 10200011 */ beqz $at, .L80098F78 diff --git a/src/unknown_080500.c b/src/unknown_080500.c index a2ac0984..36ea430a 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -558,15 +558,16 @@ s16 D_800E0710[16] = { 0x16, 0x17, 0x20, 0x00 }; -s16 D_800E0730[18] = { +s16 D_800E0730[19] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000 + 0x0000, 0x0000, 0x0000 }; -s16 D_800E0758[56] = { - 0x0000, 0x0000, 0xFFFF, 0xFFFF, + +s16 D_800E0758[54] = { + 0xFFFF, 0xFFFF, 0x0129, 0x011A, 0x0120, 0x0115, 0x0126, 0x011D, 0x0130, 0x0121, 0x0117, 0x0154, 0x0128, 0x0119, @@ -697,8 +698,8 @@ s16 D_800E0A40[8] = { unk800DFC10 D_800E0A50 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A60 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A70 = { NULL, 0, 0, NULL, 0 }; -unk800DFC10 D_800E0A90 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0A80 = { NULL, 0, 0, NULL, 0 }; +unk800DFC10 D_800E0A90 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AA0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AB0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AC0 = { NULL, 0, 0, NULL, 0 }; @@ -1653,7 +1654,6 @@ void func_800841B8(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_080500/MenuOptionsLoop.s") #else -extern s32 D_800DFA14; extern s32 D_8012644C; void func_80084734(void); @@ -1716,12 +1716,12 @@ s32 MenuOptionsLoop(s32 arg0) { func_80001D04(0xEB, 0); func_8009EABC(0, 0x2000000); func_800C2AF4(0); - D_800DFA14 = D_800DF4A0->unk2DC; + D_800DFA10[1] = D_800DF4A0->unk2DC; } else { func_80001D04(0xEB, 0); func_8009EA78(0, 0x2000000); func_800C2AF4(1); - D_800DFA14 = D_800DF4A0->unk2D8; + D_800DFA10[1] = D_800DF4A0->unk2D8; } } else { // Move up & down the list @@ -3575,9 +3575,9 @@ void func_80098EBC(s32 arg0) { fade = (test >> 1) + 0x80; } - D_800E1088[i][0].filterRed = fade; - D_800E1088[i][0].filterGreen = fade; - D_800E1088[i][0].filterBlue = fade; + D_800E1048+64[i][0].filterRed = fade; + D_800E1048+64[i][0].filterGreen = fade; + D_800E1048+64[i][0].filterBlue = fade; } if (D_801263E0 == 2 || D_801263E0 == 3) { diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py new file mode 100644 index 00000000..1bac3917 --- /dev/null +++ b/tools/python/undefined_sym_fix.py @@ -0,0 +1,18 @@ +import subprocess +import sys +import argparse + +parser = argparse.ArgumentParser(description="") +parser.add_argument("baseLabel", help="Base label") +parser.add_argument("badLabel", help="Bad label") +args = parser.parse_args() + +baseAddress = int(args.baseLabel[-8:], 16) +badAddress = int(args.badLabel[-8:], 16) + +if baseAddress >= badAddress: + raise Exception('baseLabel should be smaller! base = ' + hex(baseAddress) + ', bad = ' + hex(badAddress)) + +newLabel = args.baseLabel + '+' + str(badAddress-baseAddress) + +subprocess.run(['./rename_sym.sh', args.badLabel, newLabel]) diff --git a/undefined_syms.txt b/undefined_syms.txt index ada2c3ae..c5d6acd5 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -22,25 +22,8 @@ osResetType = 0x8000030C; osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; -D_800DFA14 = 0x800DFA14; -D_800DFA48 = 0x800DFA48; -D_800DFDB5 = 0x800DFDB5; D_800E0001 = 0x800E0001; -D_800E002C = 0x800E002C; -D_800E0038 = 0x800E0038; -D_800E004C = 0x800E004C; -D_800E006C = 0x800E006C; -D_800E0138 = 0x800E0138; -D_800E0235 = 0x800E0235; -D_800E0758 = 0x800E0758; -D_800E0A80 = 0x800E0A80; -D_800E0A90 = 0x800E0A90; -D_800E0C00 = 0x800E0C00; -D_800E0D20 = 0x800E0D20; -D_800E0D40 = 0x800E0D40; -D_800E0D60 = 0x800E0D60; -D_800E0DCC = 0x800E0DCC; -D_800E1088 = 0x800E1088; + D_800E1B58 = 0x800E1B58; D_800E1DA8 = 0x800E1DA8; D_800E1DB0 = 0x800E1DB0;