diff --git a/asm/non_matchings/unknown_066AA0/func_80065EA0.s b/asm/non_matchings/unknown_066AA0/func_80065EA0.s index 93fb3ad9..7d5d58ec 100644 --- a/asm/non_matchings/unknown_066AA0/func_80065EA0.s +++ b/asm/non_matchings/unknown_066AA0/func_80065EA0.s @@ -1,117 +1,117 @@ -glabel func_80065EA0 -/* 066AA0 80065EA0 3C048012 */ lui $a0, %hi(D_80120DA0) # $a0, 0x8012 -/* 066AA4 80065EA4 24030001 */ li $v1, 1 -/* 066AA8 80065EA8 3C0F8012 */ lui $t7, %hi(D_80120D70) # $t7, 0x8012 -/* 066AAC 80065EAC 25EF0D70 */ addiu $t7, %lo(D_80120D70) # addiu $t7, $t7, 0xd70 -/* 066AB0 80065EB0 00037080 */ sll $t6, $v1, 2 -/* 066AB4 80065EB4 24840DA0 */ addiu $a0, %lo(D_80120DA0) # addiu $a0, $a0, 0xda0 -/* 066AB8 80065EB8 01CF1021 */ addu $v0, $t6, $t7 -/* 066ABC 80065EBC 0003C980 */ sll $t9, $v1, 6 -/* 066AC0 80065EC0 3C018012 */ lui $at, %hi(D_80120D70) # $at, 0x8012 -/* 066AC4 80065EC4 AC240D70 */ sw $a0, %lo(D_80120D70)($at) -/* 066AC8 80065EC8 00994021 */ addu $t0, $a0, $t9 -/* 066ACC 80065ECC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 066AD0 80065ED0 AC480000 */ sw $t0, ($v0) -/* 066AD4 80065ED4 246A0001 */ addiu $t2, $v1, 1 -/* 066AD8 80065ED8 000A5980 */ sll $t3, $t2, 6 -/* 066ADC 80065EDC 24680003 */ addiu $t0, $v1, 3 -/* 066AE0 80065EE0 246E0002 */ addiu $t6, $v1, 2 -/* 066AE4 80065EE4 AFB1002C */ sw $s1, 0x2c($sp) -/* 066AE8 80065EE8 000E7980 */ sll $t7, $t6, 6 -/* 066AEC 80065EEC 00084980 */ sll $t1, $t0, 6 -/* 066AF0 80065EF0 AFB20030 */ sw $s2, 0x30($sp) -/* 066AF4 80065EF4 AFB00028 */ sw $s0, 0x28($sp) -/* 066AF8 80065EF8 00895021 */ addu $t2, $a0, $t1 -/* 066AFC 80065EFC 008FC021 */ addu $t8, $a0, $t7 -/* 066B00 80065F00 008B6021 */ addu $t4, $a0, $t3 -/* 066B04 80065F04 3C118012 */ lui $s1, %hi(D_80120CE4) # $s1, 0x8012 -/* 066B08 80065F08 AFBF0034 */ sw $ra, 0x34($sp) -/* 066B0C 80065F0C AC4C0004 */ sw $t4, 4($v0) -/* 066B10 80065F10 AC580008 */ sw $t8, 8($v0) -/* 066B14 80065F14 AC4A000C */ sw $t2, 0xc($v0) -/* 066B18 80065F18 26310CE4 */ addiu $s1, %lo(D_80120CE4) # addiu $s1, $s1, 0xce4 -/* 066B1C 80065F1C 00008025 */ move $s0, $zero -/* 066B20 80065F20 24120008 */ li $s2, 8 -/* 066B24 80065F24 240B00B4 */ li $t3, 180 -.L80065F28: -/* 066B28 80065F28 AE300000 */ sw $s0, ($s1) -/* 066B2C 80065F2C AFAB0014 */ sw $t3, 0x14($sp) -/* 066B30 80065F30 240400C8 */ li $a0, 200 -/* 066B34 80065F34 240500C8 */ li $a1, 200 -/* 066B38 80065F38 240600C8 */ li $a2, 200 -/* 066B3C 80065F3C 00003825 */ move $a3, $zero -/* 066B40 80065F40 0C0198F7 */ jal func_800663DC -/* 066B44 80065F44 AFA00010 */ sw $zero, 0x10($sp) -/* 066B48 80065F48 26100001 */ addiu $s0, $s0, 1 -/* 066B4C 80065F4C 1612FFF6 */ bne $s0, $s2, .L80065F28 -/* 066B50 80065F50 240B00B4 */ li $t3, 180 -/* 066B54 80065F54 3C018012 */ lui $at, %hi(D_80120D14) # $at, 0x8012 -/* 066B58 80065F58 A0200D14 */ sb $zero, %lo(D_80120D14)($at) -/* 066B5C 80065F5C AE200000 */ sw $zero, ($s1) -/* 066B60 80065F60 3C018012 */ lui $at, %hi(D_80120D1C) # $at, 0x8012 -/* 066B64 80065F64 AC200D1C */ sw $zero, %lo(D_80120D1C)($at) -/* 066B68 80065F68 3C018012 */ lui $at, %hi(D_80120D20) # $at, 0x8012 -/* 066B6C 80065F6C AC200D20 */ sw $zero, %lo(D_80120D20)($at) -/* 066B70 80065F70 3C018012 */ lui $at, %hi(D_80120CE0) # $at, 0x8012 -/* 066B74 80065F74 AC200CE0 */ sw $zero, %lo(D_80120CE0)($at) -/* 066B78 80065F78 3C018012 */ lui $at, %hi(D_80120D0C) # $at, 0x8012 -/* 066B7C 80065F7C AC200D0C */ sw $zero, %lo(D_80120D0C)($at) -/* 066B80 80065F80 3C018012 */ lui $at, %hi(D_80120D18) # $at, 0x8012 -/* 066B84 80065F84 AC200D18 */ sw $zero, %lo(D_80120D18)($at) -/* 066B88 80065F88 3C04800E */ lui $a0, %hi(D_800DD060) # $a0, 0x800e -/* 066B8C 80065F8C 3C018012 */ lui $at, %hi(D_80120D15) # $at, 0x8012 -/* 066B90 80065F90 2484D060 */ addiu $a0, %lo(D_800DD060) # addiu $a0, $a0, -0x2fa0 -/* 066B94 80065F94 3C03A460 */ lui $v1, (0xA4600010 >> 16) # lui $v1, 0xa460 -/* 066B98 80065F98 A0200D15 */ sb $zero, %lo(D_80120D15)($at) -/* 066B9C 80065F9C 34630010 */ ori $v1, (0xA4600010 & 0xFFFF) # ori $v1, $v1, 0x10 -/* 066BA0 80065FA0 A0800000 */ sb $zero, ($a0) -/* 066BA4 80065FA4 8C620000 */ lw $v0, ($v1) -/* 066BA8 80065FA8 3C0EB000 */ lui $t6, %hi(D_B0000578) # $t6, 0xb000 -/* 066BAC 80065FAC 304C0003 */ andi $t4, $v0, 3 -/* 066BB0 80065FB0 11800006 */ beqz $t4, .L80065FCC -/* 066BB4 80065FB4 3C108012 */ lui $s0, %hi(D_80120EE0) # $s0, 0x8012 -.L80065FB8: -/* 066BB8 80065FB8 8C620000 */ lw $v0, ($v1) -/* 066BBC 80065FBC 00000000 */ nop -/* 066BC0 80065FC0 304D0003 */ andi $t5, $v0, 3 -/* 066BC4 80065FC4 15A0FFFC */ bnez $t5, .L80065FB8 -/* 066BC8 80065FC8 00000000 */ nop -.L80065FCC: -/* 066BCC 80065FCC 8DCF0578 */ lw $t7, %lo(D_B0000578)($t6) -/* 066BD0 80065FD0 34018965 */ li $at, 35173 -/* 066BD4 80065FD4 31F8FFFF */ andi $t8, $t7, 0xffff -/* 066BD8 80065FD8 13010003 */ beq $t8, $at, .L80065FE8 -/* 066BDC 80065FDC 26100EE0 */ addiu $s0, %lo(D_80120EE0) # addiu $s0, $s0, 0xee0 -/* 066BE0 80065FE0 24190001 */ li $t9, 1 -/* 066BE4 80065FE4 A0990000 */ sb $t9, ($a0) -.L80065FE8: -/* 066BE8 80065FE8 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 066BEC 80065FEC 44812000 */ mtc1 $at, $f4 -/* 066BF0 80065FF0 3C01800E */ lui $at, %hi(D_800E709C) # $at, 0x800e -/* 066BF4 80065FF4 C426709C */ lwc1 $f6, %lo(D_800E709C)($at) -/* 066BF8 80065FF8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 066BFC 80065FFC 44814000 */ mtc1 $at, $f8 -/* 066C00 80066000 3C058012 */ lui $a1, %hi(D_80120D6C) # $a1, 0x8012 -/* 066C04 80066004 3C073FAA */ lui $a3, (0x3FAAAAAB >> 16) # lui $a3, 0x3faa -/* 066C08 80066008 34E7AAAB */ ori $a3, (0x3FAAAAAB & 0xFFFF) # ori $a3, $a3, 0xaaab -/* 066C0C 8006600C 24A50D6C */ addiu $a1, %lo(D_80120D6C) # addiu $a1, $a1, 0xd6c -/* 066C10 80066010 02002025 */ move $a0, $s0 -/* 066C14 80066014 3C064270 */ lui $a2, 0x4270 -/* 066C18 80066018 E7A40010 */ swc1 $f4, 0x10($sp) -/* 066C1C 8006601C E7A60014 */ swc1 $f6, 0x14($sp) -/* 066C20 80066020 0C033248 */ jal guPerspectiveF -/* 066C24 80066024 E7A80018 */ swc1 $f8, 0x18($sp) -/* 066C28 80066028 3C058012 */ lui $a1, %hi(D_80120FE0) # $a1, 0x8012 -/* 066C2C 8006602C 24A50FE0 */ addiu $a1, %lo(D_80120FE0) # addiu $a1, $a1, 0xfe0 -/* 066C30 80066030 0C01BE1C */ jal func_8006F870 -/* 066C34 80066034 02002025 */ move $a0, $s0 -/* 066C38 80066038 3C014270 */ li $at, 0x42700000 # 60.000000 -/* 066C3C 8006603C 44815000 */ mtc1 $at, $f10 -/* 066C40 80066040 8FBF0034 */ lw $ra, 0x34($sp) -/* 066C44 80066044 3C018012 */ lui $at, 0x8012 -/* 066C48 80066048 8FB00028 */ lw $s0, 0x28($sp) -/* 066C4C 8006604C 8FB1002C */ lw $s1, 0x2c($sp) -/* 066C50 80066050 8FB20030 */ lw $s2, 0x30($sp) -/* 066C54 80066054 27BD0038 */ addiu $sp, $sp, 0x38 -/* 066C58 80066058 03E00008 */ jr $ra -/* 066C5C 8006605C E42A0D10 */ swc1 $f10, 0xd10($at) +glabel func_80065EA0 +/* 066AA0 80065EA0 3C048012 */ lui $a0, %hi(D_80120DA0) # $a0, 0x8012 +/* 066AA4 80065EA4 24030001 */ li $v1, 1 +/* 066AA8 80065EA8 3C0F8012 */ lui $t7, %hi(D_80120D70) # $t7, 0x8012 +/* 066AAC 80065EAC 25EF0D70 */ addiu $t7, %lo(D_80120D70) # addiu $t7, $t7, 0xd70 +/* 066AB0 80065EB0 00037080 */ sll $t6, $v1, 2 +/* 066AB4 80065EB4 24840DA0 */ addiu $a0, %lo(D_80120DA0) # addiu $a0, $a0, 0xda0 +/* 066AB8 80065EB8 01CF1021 */ addu $v0, $t6, $t7 +/* 066ABC 80065EBC 0003C980 */ sll $t9, $v1, 6 +/* 066AC0 80065EC0 3C018012 */ lui $at, %hi(D_80120D70) # $at, 0x8012 +/* 066AC4 80065EC4 AC240D70 */ sw $a0, %lo(D_80120D70)($at) +/* 066AC8 80065EC8 00994021 */ addu $t0, $a0, $t9 +/* 066ACC 80065ECC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 066AD0 80065ED0 AC480000 */ sw $t0, ($v0) +/* 066AD4 80065ED4 246A0001 */ addiu $t2, $v1, 1 +/* 066AD8 80065ED8 000A5980 */ sll $t3, $t2, 6 +/* 066ADC 80065EDC 24680003 */ addiu $t0, $v1, 3 +/* 066AE0 80065EE0 246E0002 */ addiu $t6, $v1, 2 +/* 066AE4 80065EE4 AFB1002C */ sw $s1, 0x2c($sp) +/* 066AE8 80065EE8 000E7980 */ sll $t7, $t6, 6 +/* 066AEC 80065EEC 00084980 */ sll $t1, $t0, 6 +/* 066AF0 80065EF0 AFB20030 */ sw $s2, 0x30($sp) +/* 066AF4 80065EF4 AFB00028 */ sw $s0, 0x28($sp) +/* 066AF8 80065EF8 00895021 */ addu $t2, $a0, $t1 +/* 066AFC 80065EFC 008FC021 */ addu $t8, $a0, $t7 +/* 066B00 80065F00 008B6021 */ addu $t4, $a0, $t3 +/* 066B04 80065F04 3C118012 */ lui $s1, %hi(D_80120CE4) # $s1, 0x8012 +/* 066B08 80065F08 AFBF0034 */ sw $ra, 0x34($sp) +/* 066B0C 80065F0C AC4C0004 */ sw $t4, 4($v0) +/* 066B10 80065F10 AC580008 */ sw $t8, 8($v0) +/* 066B14 80065F14 AC4A000C */ sw $t2, 0xc($v0) +/* 066B18 80065F18 26310CE4 */ addiu $s1, %lo(D_80120CE4) # addiu $s1, $s1, 0xce4 +/* 066B1C 80065F1C 00008025 */ move $s0, $zero +/* 066B20 80065F20 24120008 */ li $s2, 8 +/* 066B24 80065F24 240B00B4 */ li $t3, 180 +.L80065F28: +/* 066B28 80065F28 AE300000 */ sw $s0, ($s1) +/* 066B2C 80065F2C AFAB0014 */ sw $t3, 0x14($sp) +/* 066B30 80065F30 240400C8 */ li $a0, 200 +/* 066B34 80065F34 240500C8 */ li $a1, 200 +/* 066B38 80065F38 240600C8 */ li $a2, 200 +/* 066B3C 80065F3C 00003825 */ move $a3, $zero +/* 066B40 80065F40 0C0198F7 */ jal func_800663DC +/* 066B44 80065F44 AFA00010 */ sw $zero, 0x10($sp) +/* 066B48 80065F48 26100001 */ addiu $s0, $s0, 1 +/* 066B4C 80065F4C 1612FFF6 */ bne $s0, $s2, .L80065F28 +/* 066B50 80065F50 240B00B4 */ li $t3, 180 +/* 066B54 80065F54 3C018012 */ lui $at, %hi(D_80120D14) # $at, 0x8012 +/* 066B58 80065F58 A0200D14 */ sb $zero, %lo(D_80120D14)($at) +/* 066B5C 80065F5C AE200000 */ sw $zero, ($s1) +/* 066B60 80065F60 3C018012 */ lui $at, %hi(D_80120D1C) # $at, 0x8012 +/* 066B64 80065F64 AC200D1C */ sw $zero, %lo(D_80120D1C)($at) +/* 066B68 80065F68 3C018012 */ lui $at, %hi(D_80120D20) # $at, 0x8012 +/* 066B6C 80065F6C AC200D20 */ sw $zero, %lo(D_80120D20)($at) +/* 066B70 80065F70 3C018012 */ lui $at, %hi(D_80120CE0) # $at, 0x8012 +/* 066B74 80065F74 AC200CE0 */ sw $zero, %lo(D_80120CE0)($at) +/* 066B78 80065F78 3C018012 */ lui $at, %hi(D_80120D0C) # $at, 0x8012 +/* 066B7C 80065F7C AC200D0C */ sw $zero, %lo(D_80120D0C)($at) +/* 066B80 80065F80 3C018012 */ lui $at, %hi(D_80120D18) # $at, 0x8012 +/* 066B84 80065F84 AC200D18 */ sw $zero, %lo(D_80120D18)($at) +/* 066B88 80065F88 3C04800E */ lui $a0, %hi(D_800DD060) # $a0, 0x800e +/* 066B8C 80065F8C 3C018012 */ lui $at, %hi(D_80120D15) # $at, 0x8012 +/* 066B90 80065F90 2484D060 */ addiu $a0, %lo(D_800DD060) # addiu $a0, $a0, -0x2fa0 +/* 066B94 80065F94 3C03A460 */ lui $v1, (0xA4600010 >> 16) # lui $v1, 0xa460 +/* 066B98 80065F98 A0200D15 */ sb $zero, %lo(D_80120D15)($at) +/* 066B9C 80065F9C 34630010 */ ori $v1, (0xA4600010 & 0xFFFF) # ori $v1, $v1, 0x10 +/* 066BA0 80065FA0 A0800000 */ sb $zero, ($a0) +/* 066BA4 80065FA4 8C620000 */ lw $v0, ($v1) +/* 066BA8 80065FA8 3C0EB000 */ lui $t6, %hi(D_B0000578) # $t6, 0xb000 +/* 066BAC 80065FAC 304C0003 */ andi $t4, $v0, 3 +/* 066BB0 80065FB0 11800006 */ beqz $t4, .L80065FCC +/* 066BB4 80065FB4 3C108012 */ lui $s0, %hi(D_80120EE0) # $s0, 0x8012 +.L80065FB8: +/* 066BB8 80065FB8 8C620000 */ lw $v0, ($v1) +/* 066BBC 80065FBC 00000000 */ nop +/* 066BC0 80065FC0 304D0003 */ andi $t5, $v0, 3 +/* 066BC4 80065FC4 15A0FFFC */ bnez $t5, .L80065FB8 +/* 066BC8 80065FC8 00000000 */ nop +.L80065FCC: +/* 066BCC 80065FCC 8DCF0578 */ lw $t7, %lo(D_B0000578)($t6) +/* 066BD0 80065FD0 34018965 */ li $at, 35173 +/* 066BD4 80065FD4 31F8FFFF */ andi $t8, $t7, 0xffff +/* 066BD8 80065FD8 13010003 */ beq $t8, $at, .L80065FE8 +/* 066BDC 80065FDC 26100EE0 */ addiu $s0, %lo(D_80120EE0) # addiu $s0, $s0, 0xee0 +/* 066BE0 80065FE0 24190001 */ li $t9, 1 +/* 066BE4 80065FE4 A0990000 */ sb $t9, ($a0) +.L80065FE8: +/* 066BE8 80065FE8 3C014120 */ li $at, 0x41200000 # 10.000000 +/* 066BEC 80065FEC 44812000 */ mtc1 $at, $f4 +/* 066BF0 80065FF0 3C01800E */ lui $at, %hi(D_800E709C) # $at, 0x800e +/* 066BF4 80065FF4 C426709C */ lwc1 $f6, %lo(D_800E709C)($at) +/* 066BF8 80065FF8 3C013F80 */ li $at, 0x3F800000 # 1.000000 +/* 066BFC 80065FFC 44814000 */ mtc1 $at, $f8 +/* 066C00 80066000 3C058012 */ lui $a1, %hi(D_80120D6C) # $a1, 0x8012 +/* 066C04 80066004 3C073FAA */ lui $a3, (0x3FAAAAAB >> 16) # lui $a3, 0x3faa +/* 066C08 80066008 34E7AAAB */ ori $a3, (0x3FAAAAAB & 0xFFFF) # ori $a3, $a3, 0xaaab +/* 066C0C 8006600C 24A50D6C */ addiu $a1, %lo(D_80120D6C) # addiu $a1, $a1, 0xd6c +/* 066C10 80066010 02002025 */ move $a0, $s0 +/* 066C14 80066014 3C064270 */ lui $a2, 0x4270 +/* 066C18 80066018 E7A40010 */ swc1 $f4, 0x10($sp) +/* 066C1C 8006601C E7A60014 */ swc1 $f6, 0x14($sp) +/* 066C20 80066020 0C033248 */ jal guPerspectiveF +/* 066C24 80066024 E7A80018 */ swc1 $f8, 0x18($sp) +/* 066C28 80066028 3C058012 */ lui $a1, %hi(D_80120FE0) # $a1, 0x8012 +/* 066C2C 8006602C 24A50FE0 */ addiu $a1, %lo(D_80120FE0) # addiu $a1, $a1, 0xfe0 +/* 066C30 80066030 0C01BE1C */ jal func_8006F870 +/* 066C34 80066034 02002025 */ move $a0, $s0 +/* 066C38 80066038 3C014270 */ li $at, 0x42700000 # 60.000000 +/* 066C3C 8006603C 44815000 */ mtc1 $at, $f10 +/* 066C40 80066040 8FBF0034 */ lw $ra, 0x34($sp) +/* 066C44 80066044 3C018012 */ lui $at, %hi(D_80120D10) # $at, 0x8012 +/* 066C48 80066048 8FB00028 */ lw $s0, 0x28($sp) +/* 066C4C 8006604C 8FB1002C */ lw $s1, 0x2c($sp) +/* 066C50 80066050 8FB20030 */ lw $s2, 0x30($sp) +/* 066C54 80066054 27BD0038 */ addiu $sp, $sp, 0x38 +/* 066C58 80066058 03E00008 */ jr $ra +/* 066C5C 8006605C E42A0D10 */ swc1 $f10, %lo(D_80120D10)($at) diff --git a/asm/non_matchings/unknown_066AA0/func_80067D3C.s b/asm/non_matchings/unknown_066AA0/func_80067D3C.s index db1f9098..07431a5c 100644 --- a/asm/non_matchings/unknown_066AA0/func_80067D3C.s +++ b/asm/non_matchings/unknown_066AA0/func_80067D3C.s @@ -119,8 +119,8 @@ glabel func_80067D3C /* 068B04 80067F04 24840FA0 */ addiu $a0, %lo(D_80120FA0) # addiu $a0, $a0, 0xfa0 /* 068B08 80067F08 8FAC001C */ lw $t4, 0x1c($sp) /* 068B0C 80067F0C 8FBF0014 */ lw $ra, 0x14($sp) -/* 068B10 80067F10 3C018012 */ lui $at, 0x8012 +/* 068B10 80067F10 3C018012 */ lui $at, %hi(D_80120CE4) # $at, 0x8012 /* 068B14 80067F14 27BD0020 */ addiu $sp, $sp, 0x20 /* 068B18 80067F18 03E00008 */ jr $ra -/* 068B1C 80067F1C AC2C0CE4 */ sw $t4, 0xce4($at) +/* 068B1C 80067F1C AC2C0CE4 */ sw $t4, %lo(D_80120CE4)($at) diff --git a/asm/non_matchings/unknown_066AA0/func_80068514.s b/asm/non_matchings/unknown_066AA0/func_80068514.s index 61c02a15..d35cf94e 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068514.s +++ b/asm/non_matchings/unknown_066AA0/func_80068514.s @@ -16,23 +16,23 @@ glabel func_80068514 /* 06914C 8006854C AFAE0030 */ sw $t6, 0x30($sp) /* 069150 80068550 3C028012 */ lui $v0, %hi(D_80120D20) # $v0, 0x8012 /* 069154 80068554 8C420D20 */ lw $v0, %lo(D_80120D20)($v0) -/* 069158 80068558 3C018012 */ lui $at, 0x8012 +/* 069158 80068558 3C018012 */ lui $at, %hi(D_80120D28) # $at, 0x8012 /* 06915C 8006855C 0002C880 */ sll $t9, $v0, 2 /* 069160 80068560 00390821 */ addu $at, $at, $t9 -/* 069164 80068564 C4240D28 */ lwc1 $f4, 0xd28($at) +/* 069164 80068564 C4240D28 */ lwc1 $f4, %lo(D_80120D28)($at) /* 069168 80068568 C4E6000C */ lwc1 $f6, 0xc($a3) -/* 06916C 8006856C 3C018012 */ lui $at, 0x8012 +/* 06916C 8006856C 3C018012 */ lui $at, %hi(D_80120D40) # $at, 0x8012 /* 069170 80068570 46062201 */ sub.s $f8, $f4, $f6 /* 069174 80068574 00390821 */ addu $at, $at, $t9 /* 069178 80068578 E7A8005C */ swc1 $f8, 0x5c($sp) /* 06917C 8006857C C4F20010 */ lwc1 $f18, 0x10($a3) -/* 069180 80068580 C42A0D40 */ lwc1 $f10, 0xd40($at) -/* 069184 80068584 3C018012 */ lui $at, 0x8012 +/* 069180 80068580 C42A0D40 */ lwc1 $f10, %lo(D_80120D40)($at) +/* 069184 80068584 3C018012 */ lui $at, %hi(D_80120D58) # $at, 0x8012 /* 069188 80068588 46125101 */ sub.s $f4, $f10, $f18 /* 06918C 8006858C 00390821 */ addu $at, $at, $t9 /* 069190 80068590 E7A40058 */ swc1 $f4, 0x58($sp) /* 069194 80068594 C4E80014 */ lwc1 $f8, 0x14($a3) -/* 069198 80068598 C4260D58 */ lwc1 $f6, 0xd58($at) +/* 069198 80068598 C4260D58 */ lwc1 $f6, %lo(D_80120D58)($at) /* 06919C 8006859C 84E40000 */ lh $a0, ($a3) /* 0691A0 800685A0 0C01C1F1 */ jal func_800707C4 /* 0691A4 800685A4 46083501 */ sub.s $f20, $f6, $f8 @@ -109,22 +109,22 @@ glabel func_80068514 /* 0692B8 800686B8 AFA00030 */ sw $zero, 0x30($sp) .L800686BC: /* 0692BC 800686BC 8C420D20 */ lw $v0, %lo(D_80120D20)($v0) -/* 0692C0 800686C0 3C018012 */ lui $at, 0x8012 +/* 0692C0 800686C0 3C018012 */ lui $at, %hi(D_80120D28) # $at, 0x8012 /* 0692C4 800686C4 00026080 */ sll $t4, $v0, 2 /* 0692C8 800686C8 002C0821 */ addu $at, $at, $t4 -/* 0692CC 800686CC C4260D28 */ lwc1 $f6, 0xd28($at) -/* 0692D0 800686D0 3C018012 */ lui $at, 0x8012 +/* 0692CC 800686CC C4260D28 */ lwc1 $f6, %lo(D_80120D28)($at) +/* 0692D0 800686D0 3C018012 */ lui $at, %hi(D_80120D40) # $at, 0x8012 /* 0692D4 800686D4 002C0821 */ addu $at, $at, $t4 /* 0692D8 800686D8 C608000C */ lwc1 $f8, 0xc($s0) -/* 0692DC 800686DC C42A0D40 */ lwc1 $f10, 0xd40($at) +/* 0692DC 800686DC C42A0D40 */ lwc1 $f10, %lo(D_80120D40)($at) /* 0692E0 800686E0 C6120010 */ lwc1 $f18, 0x10($s0) /* 0692E4 800686E4 46083001 */ sub.s $f0, $f6, $f8 -/* 0692E8 800686E8 3C018012 */ lui $at, 0x8012 +/* 0692E8 800686E8 3C018012 */ lui $at, %hi(D_80120D58) # $at, 0x8012 /* 0692EC 800686EC 46125101 */ sub.s $f4, $f10, $f18 /* 0692F0 800686F0 002C0821 */ addu $at, $at, $t4 /* 0692F4 800686F4 E7A40058 */ swc1 $f4, 0x58($sp) /* 0692F8 800686F8 C6080014 */ lwc1 $f8, 0x14($s0) -/* 0692FC 800686FC C4260D58 */ lwc1 $f6, 0xd58($at) +/* 0692FC 800686FC C4260D58 */ lwc1 $f6, %lo(D_80120D58)($at) /* 069300 80068700 46000282 */ mul.s $f10, $f0, $f0 /* 069304 80068704 46083501 */ sub.s $f20, $f6, $f8 /* 069308 80068708 00125840 */ sll $t3, $s2, 1 @@ -180,10 +180,10 @@ glabel func_80068514 /* 0693D0 800687D0 3C088012 */ lui $t0, %hi(D_80120D1C) # $t0, 0x8012 /* 0693D4 800687D4 25080D1C */ addiu $t0, %lo(D_80120D1C) # addiu $t0, $t0, 0xd1c /* 0693D8 800687D8 8D0C0000 */ lw $t4, ($t0) -/* 0693DC 800687DC 3C048012 */ lui $a0, 0x8012 +/* 0693DC 800687DC 3C048012 */ lui $a0, %hi(D_80120D70) # $a0, 0x8012 /* 0693E0 800687E0 000C6880 */ sll $t5, $t4, 2 /* 0693E4 800687E4 008D2021 */ addu $a0, $a0, $t5 -/* 0693E8 800687E8 8C840D70 */ lw $a0, 0xd70($a0) +/* 0693E8 800687E8 8C840D70 */ lw $a0, %lo(D_80120D70)($a0) /* 0693EC 800687EC 3C058012 */ lui $a1, %hi(D_80120F20) # $a1, 0x8012 /* 0693F0 800687F0 24A50F20 */ addiu $a1, %lo(D_80120F20) # addiu $a1, $a1, 0xf20 /* 0693F4 800687F4 0C01BDDA */ jal func_8006F768 @@ -198,10 +198,10 @@ glabel func_80068514 /* 069418 80068818 8FA60064 */ lw $a2, 0x64($sp) /* 06941C 8006881C 8D180000 */ lw $t8, ($t0) /* 069420 80068820 8CCF0000 */ lw $t7, ($a2) -/* 069424 80068824 3C018012 */ lui $at, 0x8012 +/* 069424 80068824 3C018012 */ lui $at, %hi(D_80120D88) # $at, 0x8012 /* 069428 80068828 0018C880 */ sll $t9, $t8, 2 /* 06942C 8006882C 00390821 */ addu $at, $at, $t9 -/* 069430 80068830 AC2F0D88 */ sw $t7, 0xd88($at) +/* 069430 80068830 AC2F0D88 */ sw $t7, %lo(D_80120D88)($at) /* 069434 80068834 8E230000 */ lw $v1, ($s1) /* 069438 80068838 3C0B0180 */ lui $t3, (0x01800040 >> 16) # lui $t3, 0x180 /* 06943C 8006883C 246A0008 */ addiu $t2, $v1, 8 @@ -290,12 +290,12 @@ glabel func_80068514 /* 069584 80068984 15E0000D */ bnez $t7, .L800689BC /* 069588 80068988 3C198012 */ lui $t9, %hi(D_80120CE4) # $t9, 0x8012 /* 06958C 8006898C 8F390CE4 */ lw $t9, %lo(D_80120CE4)($t9) -/* 069590 80068990 3C0B8012 */ lui $t3, 0x8012 +/* 069590 80068990 3C0B8012 */ lui $t3, %hi(D_80120AC4) # $t3, 0x8012 /* 069594 80068994 00195100 */ sll $t2, $t9, 4 /* 069598 80068998 01595021 */ addu $t2, $t2, $t9 /* 06959C 8006899C 000A5080 */ sll $t2, $t2, 2 /* 0695A0 800689A0 016A5821 */ addu $t3, $t3, $t2 -/* 0695A4 800689A4 856B0AC4 */ lh $t3, 0xac4($t3) +/* 0695A4 800689A4 856B0AC4 */ lh $t3, %lo(D_80120AC4)($t3) /* 0695A8 800689A8 860C0004 */ lh $t4, 4($s0) /* 0695AC 800689AC 00000000 */ nop /* 0695B0 800689B0 016C6821 */ addu $t5, $t3, $t4 @@ -304,12 +304,12 @@ glabel func_80068514 .L800689BC: /* 0695BC 800689BC 3C0E8012 */ lui $t6, %hi(D_80120CE4) # $t6, 0x8012 /* 0695C0 800689C0 8DCE0CE4 */ lw $t6, %lo(D_80120CE4)($t6) -/* 0695C4 800689C4 3C0F8012 */ lui $t7, 0x8012 +/* 0695C4 800689C4 3C0F8012 */ lui $t7, %hi(D_80120BD4) # $t7, 0x8012 /* 0695C8 800689C8 000EC100 */ sll $t8, $t6, 4 /* 0695CC 800689CC 030EC021 */ addu $t8, $t8, $t6 /* 0695D0 800689D0 0018C080 */ sll $t8, $t8, 2 /* 0695D4 800689D4 01F87821 */ addu $t7, $t7, $t8 -/* 0695D8 800689D8 85EF0BD4 */ lh $t7, 0xbd4($t7) +/* 0695D8 800689D8 85EF0BD4 */ lh $t7, %lo(D_80120BD4)($t7) /* 0695DC 800689DC 86190004 */ lh $t9, 4($s0) /* 0695E0 800689E0 00000000 */ nop /* 0695E4 800689E4 01F95021 */ addu $t2, $t7, $t9 @@ -331,10 +331,10 @@ glabel func_80068514 /* 069620 80068A20 25080D1C */ addiu $t0, %lo(D_80120D1C) # addiu $t0, $t0, 0xd1c /* 069624 80068A24 8D180000 */ lw $t8, ($t0) /* 069628 80068A28 8FB90064 */ lw $t9, 0x64($sp) -/* 06962C 80068A2C 3C048012 */ lui $a0, 0x8012 +/* 06962C 80068A2C 3C048012 */ lui $a0, %hi(D_80120D70) # $a0, 0x8012 /* 069630 80068A30 00187880 */ sll $t7, $t8, 2 /* 069634 80068A34 008F2021 */ addu $a0, $a0, $t7 -/* 069638 80068A38 8C840D70 */ lw $a0, 0xd70($a0) +/* 069638 80068A38 8C840D70 */ lw $a0, %lo(D_80120D70)($a0) /* 06963C 80068A3C 8F250000 */ lw $a1, ($t9) /* 069640 80068A40 0C01BE1C */ jal func_8006F870 /* 069644 80068A44 00000000 */ nop @@ -343,10 +343,10 @@ glabel func_80068514 /* 069650 80068A50 8FA50064 */ lw $a1, 0x64($sp) /* 069654 80068A54 8D0B0000 */ lw $t3, ($t0) /* 069658 80068A58 8CAA0000 */ lw $t2, ($a1) -/* 06965C 80068A5C 3C018012 */ lui $at, 0x8012 +/* 06965C 80068A5C 3C018012 */ lui $at, %hi(D_80120D88) # $at, 0x8012 /* 069660 80068A60 000B6080 */ sll $t4, $t3, 2 /* 069664 80068A64 002C0821 */ addu $at, $at, $t4 -/* 069668 80068A68 AC2A0D88 */ sw $t2, 0xd88($at) +/* 069668 80068A68 AC2A0D88 */ sw $t2, %lo(D_80120D88)($at) /* 06966C 80068A6C 8E230000 */ lw $v1, ($s1) /* 069670 80068A70 3C0E0180 */ lui $t6, (0x01800040 >> 16) # lui $t6, 0x180 /* 069674 80068A74 246D0008 */ addiu $t5, $v1, 8 diff --git a/asm/non_matchings/unknown_066AA0/func_80068BF4.s b/asm/non_matchings/unknown_066AA0/func_80068BF4.s index 14147a80..e9d162ea 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068BF4.s +++ b/asm/non_matchings/unknown_066AA0/func_80068BF4.s @@ -149,10 +149,10 @@ glabel func_80068BF4 /* 069A38 80068E38 8FA500E4 */ lw $a1, 0xe4($sp) /* 069A3C 80068E3C 8E990000 */ lw $t9, ($s4) /* 069A40 80068E40 8CB80000 */ lw $t8, ($a1) -/* 069A44 80068E44 3C018012 */ lui $at, 0x8012 +/* 069A44 80068E44 3C018012 */ lui $at, %hi(D_80120D88) # $at, 0x8012 /* 069A48 80068E48 00194880 */ sll $t1, $t9, 2 /* 069A4C 80068E4C 00290821 */ addu $at, $at, $t1 -/* 069A50 80068E50 AC380D88 */ sw $t8, 0xd88($at) +/* 069A50 80068E50 AC380D88 */ sw $t8, %lo(D_80120D88)($at) /* 069A54 80068E54 8E220000 */ lw $v0, ($s1) /* 069A58 80068E58 3C0B0180 */ lui $t3, (0x01800040 >> 16) # lui $t3, 0x180 /* 069A5C 80068E5C 244A0008 */ addiu $t2, $v0, 8 diff --git a/asm/non_matchings/unknown_066AA0/func_80069484.s b/asm/non_matchings/unknown_066AA0/func_80069484.s index c1a56263..c0147216 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069484.s +++ b/asm/non_matchings/unknown_066AA0/func_80069484.s @@ -48,10 +48,10 @@ glabel func_80069484 /* 06A134 80069534 3C088012 */ lui $t0, %hi(D_80120D1C) # $t0, 0x8012 /* 06A138 80069538 25080D1C */ addiu $t0, %lo(D_80120D1C) # addiu $t0, $t0, 0xd1c /* 06A13C 8006953C 8D190000 */ lw $t9, ($t0) -/* 06A140 80069540 3C048012 */ lui $a0, 0x8012 +/* 06A140 80069540 3C048012 */ lui $a0, %hi(D_80120D74) # $a0, 0x8012 /* 06A144 80069544 00195880 */ sll $t3, $t9, 2 /* 06A148 80069548 008B2021 */ addu $a0, $a0, $t3 -/* 06A14C 8006954C 8C840D74 */ lw $a0, 0xd74($a0) +/* 06A14C 8006954C 8C840D74 */ lw $a0, %lo(D_80120D74)($a0) /* 06A150 80069550 3C058012 */ lui $a1, %hi(D_80120F20) # $a1, 0x8012 /* 06A154 80069554 3C068012 */ lui $a2, %hi(D_801210A0) # $a2, 0x8012 /* 06A158 80069558 24C610A0 */ addiu $a2, %lo(D_801210A0) # addiu $a2, $a2, 0x10a0 @@ -70,10 +70,10 @@ glabel func_80069484 /* 06A18C 8006958C AD0E0000 */ sw $t6, ($t0) /* 06A190 80069590 8D2F0000 */ lw $t7, ($t1) /* 06A194 80069594 000EC080 */ sll $t8, $t6, 2 -/* 06A198 80069598 3C018012 */ lui $at, 0x8012 +/* 06A198 80069598 3C018012 */ lui $at, %hi(D_80120D88) # $at, 0x8012 /* 06A19C 8006959C 8FAA0050 */ lw $t2, 0x50($sp) /* 06A1A0 800695A0 00380821 */ addu $at, $at, $t8 -/* 06A1A4 800695A4 AC2F0D88 */ sw $t7, 0xd88($at) +/* 06A1A4 800695A4 AC2F0D88 */ sw $t7, %lo(D_80120D88)($at) /* 06A1A8 800695A8 8D430000 */ lw $v1, ($t2) /* 06A1AC 800695AC 3C0B0140 */ lui $t3, (0x01400040 >> 16) # lui $t3, 0x140 /* 06A1B0 800695B0 24790008 */ addiu $t9, $v1, 8 @@ -85,14 +85,14 @@ glabel func_80069484 /* 06A1C8 800695C8 01816821 */ addu $t5, $t4, $at /* 06A1CC 800695CC AC6D0004 */ sw $t5, 4($v1) /* 06A1D0 800695D0 8D2E0000 */ lw $t6, ($t1) -/* 06A1D4 800695D4 3C048012 */ lui $a0, 0x8012 +/* 06A1D4 800695D4 3C048012 */ lui $a0, %hi(D_80120D70) # $a0, 0x8012 /* 06A1D8 800695D8 25CF0040 */ addiu $t7, $t6, 0x40 /* 06A1DC 800695DC AD2F0000 */ sw $t7, ($t1) /* 06A1E0 800695E0 8D180000 */ lw $t8, ($t0) /* 06A1E4 800695E4 27AD0044 */ addiu $t5, $sp, 0x44 /* 06A1E8 800695E8 0018C880 */ sll $t9, $t8, 2 /* 06A1EC 800695EC 00992021 */ addu $a0, $a0, $t9 -/* 06A1F0 800695F0 8C840D70 */ lw $a0, 0xd70($a0) +/* 06A1F0 800695F0 8C840D70 */ lw $a0, %lo(D_80120D70)($a0) /* 06A1F4 800695F4 27AC0048 */ addiu $t4, $sp, 0x48 /* 06A1F8 800695F8 27AB004C */ addiu $t3, $sp, 0x4c /* 06A1FC 800695FC 4405A000 */ mfc1 $a1, $f20 @@ -187,14 +187,14 @@ glabel func_80069484 /* 06A35C 8006975C E7B00048 */ swc1 $f16, 0x48($sp) /* 06A360 80069760 E4260D28 */ swc1 $f6, 0xd28($at) /* 06A364 80069764 C7A80048 */ lwc1 $f8, 0x48($sp) -/* 06A368 80069768 3C018012 */ lui $at, 0x8012 +/* 06A368 80069768 3C018012 */ lui $at, %hi(D_80120D40) # $at, 0x8012 /* 06A36C 8006976C 00220821 */ addu $at, $at, $v0 /* 06A370 80069770 E7A40044 */ swc1 $f4, 0x44($sp) -/* 06A374 80069774 E4280D40 */ swc1 $f8, 0xd40($at) +/* 06A374 80069774 E4280D40 */ swc1 $f8, %lo(D_80120D40)($at) /* 06A378 80069778 C7AA0044 */ lwc1 $f10, 0x44($sp) -/* 06A37C 8006977C 3C018012 */ lui $at, 0x8012 +/* 06A37C 8006977C 3C018012 */ lui $at, %hi(D_80120D58) # $at, 0x8012 /* 06A380 80069780 00220821 */ addu $at, $at, $v0 /* 06A384 80069784 27BD0050 */ addiu $sp, $sp, 0x50 /* 06A388 80069788 03E00008 */ jr $ra -/* 06A38C 8006978C E42A0D58 */ swc1 $f10, 0xd58($at) +/* 06A38C 8006978C E42A0D58 */ swc1 $f10, %lo(D_80120D58)($at) diff --git a/asm/non_matchings/unknown_066AA0/func_80069790.s b/asm/non_matchings/unknown_066AA0/func_80069790.s index a0b11fee..31d9a00f 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069790.s +++ b/asm/non_matchings/unknown_066AA0/func_80069790.s @@ -152,24 +152,24 @@ glabel func_80069790 /* 06A5E4 800699E4 3C028012 */ lui $v0, %hi(D_80120D20) # $v0, 0x8012 /* 06A5E8 800699E8 24420D20 */ addiu $v0, %lo(D_80120D20) # addiu $v0, $v0, 0xd20 /* 06A5EC 800699EC 8C4E0000 */ lw $t6, ($v0) -/* 06A5F0 800699F0 3C018012 */ lui $at, 0x8012 +/* 06A5F0 800699F0 3C018012 */ lui $at, %hi(D_80120D28) # $at, 0x8012 /* 06A5F4 800699F4 000E7880 */ sll $t7, $t6, 2 /* 06A5F8 800699F8 002F0821 */ addu $at, $at, $t7 -/* 06A5FC 800699FC C4240D28 */ lwc1 $f4, 0xd28($at) -/* 06A600 80069A00 3C018012 */ lui $at, 0x8012 +/* 06A5FC 800699FC C4240D28 */ lwc1 $f4, %lo(D_80120D28)($at) +/* 06A600 80069A00 3C018012 */ lui $at, %hi(D_80120D40) # $at, 0x8012 /* 06A604 80069A04 E4840000 */ swc1 $f4, ($a0) /* 06A608 80069A08 8C580000 */ lw $t8, ($v0) /* 06A60C 80069A0C 00000000 */ nop /* 06A610 80069A10 0018C880 */ sll $t9, $t8, 2 /* 06A614 80069A14 00390821 */ addu $at, $at, $t9 -/* 06A618 80069A18 C4260D40 */ lwc1 $f6, 0xd40($at) -/* 06A61C 80069A1C 3C018012 */ lui $at, 0x8012 +/* 06A618 80069A18 C4260D40 */ lwc1 $f6, %lo(D_80120D40)($at) +/* 06A61C 80069A1C 3C018012 */ lui $at, %hi(D_80120D58) # $at, 0x8012 /* 06A620 80069A20 E4A60000 */ swc1 $f6, ($a1) /* 06A624 80069A24 8C480000 */ lw $t0, ($v0) /* 06A628 80069A28 00000000 */ nop /* 06A62C 80069A2C 00084880 */ sll $t1, $t0, 2 /* 06A630 80069A30 00290821 */ addu $at, $at, $t1 -/* 06A634 80069A34 C4280D58 */ lwc1 $f8, 0xd58($at) +/* 06A634 80069A34 C4280D58 */ lwc1 $f8, %lo(D_80120D58)($at) /* 06A638 80069A38 03E00008 */ jr $ra /* 06A63C 80069A3C E4C80000 */ swc1 $f8, ($a2) diff --git a/asm/non_matchings/unknown_066AA0/func_80069A40.s b/asm/non_matchings/unknown_066AA0/func_80069A40.s index d20bd55e..ca04bd71 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069A40.s +++ b/asm/non_matchings/unknown_066AA0/func_80069A40.s @@ -17,10 +17,10 @@ glabel func_80069A40 /* 06A67C 80069A7C 354A0040 */ ori $t2, (0x01400040 & 0xFFFF) # ori $t2, $t2, 0x40 /* 06A680 80069A80 AC6A0000 */ sw $t2, ($v1) /* 06A684 80069A84 8CCB0000 */ lw $t3, ($a2) -/* 06A688 80069A88 3C0D8012 */ lui $t5, 0x8012 +/* 06A688 80069A88 3C0D8012 */ lui $t5, %hi(D_80120D88) # $t5, 0x8012 /* 06A68C 80069A8C 000B6080 */ sll $t4, $t3, 2 /* 06A690 80069A90 01AC6821 */ addu $t5, $t5, $t4 -/* 06A694 80069A94 8DAD0D88 */ lw $t5, 0xd88($t5) +/* 06A694 80069A94 8DAD0D88 */ lw $t5, %lo(D_80120D88)($t5) /* 06A698 80069A98 3C018000 */ lui $at, 0x8000 /* 06A69C 80069A9C 01A17021 */ addu $t6, $t5, $at /* 06A6A0 80069AA0 03E00008 */ jr $ra @@ -73,9 +73,9 @@ glabel func_80069A40 /* 06A750 80069B50 00194100 */ sll $t0, $t9, 4 /* 06A754 80069B54 01194021 */ addu $t0, $t0, $t9 /* 06A758 80069B58 00084080 */ sll $t0, $t0, 2 -/* 06A75C 80069B5C 3C018012 */ lui $at, 0x8012 +/* 06A75C 80069B5C 3C018012 */ lui $at, %hi(D_80120AF4) # $at, 0x8012 /* 06A760 80069B60 00280821 */ addu $at, $at, $t0 -/* 06A764 80069B64 A4220AF4 */ sh $v0, 0xaf4($at) +/* 06A764 80069B64 A4220AF4 */ sh $v0, %lo(D_80120AF4)($at) /* 06A768 80069B68 03E00008 */ jr $ra /* 06A76C 80069B6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/unknown_080500/D_8008F618.s b/asm/non_matchings/unknown_080500/D_8008F618.s index 0ec206cf..e4c4bd40 100644 --- a/asm/non_matchings/unknown_080500/D_8008F618.s +++ b/asm/non_matchings/unknown_080500/D_8008F618.s @@ -135,10 +135,10 @@ glabel D_8008F618 /* 090418 8008F818 00000000 */ nop .L8008F81C: /* 09041C 8008F81C 92180001 */ lbu $t8, 1($s0) -/* 090420 8008F820 3C05800E */ lui $a1, 0x800e +/* 090420 8008F820 3C05800E */ lui $a1, %hi(D_800E0730) # $a1, 0x800e /* 090424 8008F824 0018C880 */ sll $t9, $t8, 2 /* 090428 8008F828 00B92821 */ addu $a1, $a1, $t9 -/* 09042C 8008F82C 8CA50730 */ lw $a1, 0x730($a1) +/* 09042C 8008F82C 8CA50730 */ lw $a1, %lo(D_800E0730)($a1) /* 090430 8008F830 A6340002 */ sh $s4, 2($s1) /* 090434 8008F834 920E0002 */ lbu $t6, 2($s0) /* 090438 8008F838 A634000C */ sh $s4, 0xc($s1) diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s index b40837cd..1a029385 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaInit.s @@ -37,9 +37,9 @@ glabel MenuLoadNewAreaInit /* 093910 80092D10 314B0002 */ andi $t3, $t2, 2 /* 093914 80092D14 1560000D */ bnez $t3, .L80092D4C .L80092D18: -/* 093918 80092D18 3C02800E */ lui $v0, 0x800e +/* 093918 80092D18 3C02800E */ lui $v0, %hi(D_800E0758) # $v0, 0x800e /* 09391C 80092D1C 004C1021 */ addu $v0, $v0, $t4 -/* 093920 80092D20 84420758 */ lh $v0, 0x758($v0) +/* 093920 80092D20 84420758 */ lh $v0, %lo(D_800E0758)($v0) /* 093924 80092D24 2401FFFF */ li $at, -1 /* 093928 80092D28 10410004 */ beq $v0, $at, .L80092D3C /* 09392C 80092D2C 3044FFFF */ andi $a0, $v0, 0xffff @@ -52,9 +52,9 @@ glabel MenuLoadNewAreaInit /* 093944 80092D44 10000044 */ b .L80092E58 /* 093948 80092D48 AC2D63E0 */ sw $t5, %lo(D_801263E0)($at) .L80092D4C: -/* 09394C 80092D4C 3C02800E */ lui $v0, 0x800e +/* 09394C 80092D4C 3C02800E */ lui $v0, %hi(D_800E0758) # $v0, 0x800e /* 093950 80092D50 004E1021 */ addu $v0, $v0, $t6 -/* 093954 80092D54 84420758 */ lh $v0, 0x758($v0) +/* 093954 80092D54 84420758 */ lh $v0, %lo(D_800E0758)($v0) /* 093958 80092D58 2401FFFF */ li $at, -1 /* 09395C 80092D5C 10410004 */ beq $v0, $at, .L80092D70 /* 093960 80092D60 3044FFFF */ andi $a0, $v0, 0xffff diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s index 9bc72153..0f484de3 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRoundLoop.s @@ -23,10 +23,10 @@ glabel MenuTrophyRaceRoundLoop /* 0991F0 800985F0 01095021 */ addu $t2, $t0, $t1 /* 0991F4 800985F4 01425821 */ addu $t3, $t2, $v0 /* 0991F8 800985F8 8163FFFA */ lb $v1, -6($t3) -/* 0991FC 800985FC 3C06800E */ lui $a2, 0x800e +/* 0991FC 800985FC 3C06800E */ lui $a2, %hi(D_800E0758) # $a2, 0x800e /* 099200 80098600 00036040 */ sll $t4, $v1, 1 /* 099204 80098604 00CC3021 */ addu $a2, $a2, $t4 -/* 099208 80098608 84C60758 */ lh $a2, 0x758($a2) +/* 099208 80098608 84C60758 */ lh $a2, %lo(D_800E0758)($a2) /* 09920C 8009860C 2401FFFF */ li $at, -1 /* 099210 80098610 10C10005 */ beq $a2, $at, .L80098628 /* 099214 80098614 30C4FFFF */ andi $a0, $a2, 0xffff diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index e898dae4..37a5f84d 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -113,13 +113,13 @@ glabel func_800853D0 /* 08617C 8008557C AFAD0068 */ sw $t5, 0x68($sp) /* 086180 80085580 920E0006 */ lbu $t6, 6($s0) /* 086184 80085584 27A50050 */ addiu $a1, $sp, 0x50 -/* 086188 80085588 3C09800E */ lui $t1, 0x800e +/* 086188 80085588 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e /* 08618C 8008558C 000E7880 */ sll $t7, $t6, 2 /* 086190 80085590 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012 /* 086194 80085594 012F4821 */ addu $t1, $t1, $t7 /* 086198 80085598 AFA50064 */ sw $a1, 0x64($sp) /* 08619C 8008559C 8D086660 */ lw $t0, %lo(D_80126660)($t0) -/* 0861A0 800855A0 8D29FACC */ lw $t1, -0x534($t1) +/* 0861A0 800855A0 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1) /* 0861A4 800855A4 86040004 */ lh $a0, 4($s0) /* 0861A8 800855A8 24060003 */ li $a2, 3 /* 0861AC 800855AC AFA8004C */ sw $t0, 0x4c($sp) @@ -191,7 +191,7 @@ glabel func_800853D0 /* 0862A4 800856A4 8E180008 */ lw $t8, 8($s0) /* 0862A8 800856A8 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) /* 0862AC 800856AC 00025080 */ sll $t2, $v0, 2 -/* 0862B0 800856B0 3C09800E */ lui $t1, 0x800e +/* 0862B0 800856B0 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e /* 0862B4 800856B4 00027880 */ sll $t7, $v0, 2 /* 0862B8 800856B8 AFB80064 */ sw $t8, 0x64($sp) /* 0862BC 800856BC 032A5821 */ addu $t3, $t9, $t2 @@ -199,7 +199,7 @@ glabel func_800853D0 /* 0862C4 800856C4 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012 /* 0862C8 800856C8 012F4821 */ addu $t1, $t1, $t7 /* 0862CC 800856CC 8D086660 */ lw $t0, %lo(D_80126660)($t0) -/* 0862D0 800856D0 8D29FACC */ lw $t1, -0x534($t1) +/* 0862D0 800856D0 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1) /* 0862D4 800856D4 10000060 */ b .L80085858 /* 0862D8 800856D8 AFAC0060 */ sw $t4, 0x60($sp) /* 0862DC 800856DC 3C0E800E */ lui $t6, %hi(D_800DFC30) # $t6, 0x800e @@ -210,7 +210,7 @@ glabel func_800853D0 /* 0862F0 800856F0 92020006 */ lbu $v0, 6($s0) /* 0862F4 800856F4 8C6F01E4 */ lw $t7, 0x1e4($v1) /* 0862F8 800856F8 0002C080 */ sll $t8, $v0, 2 -/* 0862FC 800856FC 3C09800E */ lui $t1, 0x800e +/* 0862FC 800856FC 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e /* 086300 80085700 0078C821 */ addu $t9, $v1, $t8 /* 086304 80085704 00026880 */ sll $t5, $v0, 2 /* 086308 80085708 AFAF0064 */ sw $t7, 0x64($sp) @@ -218,7 +218,7 @@ glabel func_800853D0 /* 086310 80085710 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012 /* 086314 80085714 012D4821 */ addu $t1, $t1, $t5 /* 086318 80085718 8D086660 */ lw $t0, %lo(D_80126660)($t0) -/* 08631C 8008571C 8D29FACC */ lw $t1, -0x534($t1) +/* 08631C 8008571C 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1) /* 086320 80085720 1000004D */ b .L80085858 /* 086324 80085724 AFAA0060 */ sw $t2, 0x60($sp) /* 086328 80085728 3C0B800E */ lui $t3, %hi(D_800DFC40) # $t3, 0x800e @@ -229,7 +229,7 @@ glabel func_800853D0 /* 08633C 8008573C 8E0E0008 */ lw $t6, 8($s0) /* 086340 80085740 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) /* 086344 80085744 00027880 */ sll $t7, $v0, 2 -/* 086348 80085748 3C09800E */ lui $t1, 0x800e +/* 086348 80085748 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e /* 08634C 8008574C 00026080 */ sll $t4, $v0, 2 /* 086350 80085750 AFAE0064 */ sw $t6, 0x64($sp) /* 086354 80085754 01AFC021 */ addu $t8, $t5, $t7 @@ -237,7 +237,7 @@ glabel func_800853D0 /* 08635C 8008575C 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012 /* 086360 80085760 012C4821 */ addu $t1, $t1, $t4 /* 086364 80085764 8D086660 */ lw $t0, %lo(D_80126660)($t0) -/* 086368 80085768 8D29FACC */ lw $t1, -0x534($t1) +/* 086368 80085768 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1) /* 08636C 8008576C 1000003A */ b .L80085858 /* 086370 80085770 AFB90060 */ sw $t9, 0x60($sp) /* 086374 80085774 3C0A800E */ lui $t2, %hi(D_800DFC50) # $t2, 0x800e @@ -248,7 +248,7 @@ glabel func_800853D0 /* 086388 80085788 92020006 */ lbu $v0, 6($s0) /* 08638C 8008578C 8C6C01E8 */ lw $t4, 0x1e8($v1) /* 086390 80085790 00027080 */ sll $t6, $v0, 2 -/* 086394 80085794 3C09800E */ lui $t1, 0x800e +/* 086394 80085794 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e /* 086398 80085798 006E6821 */ addu $t5, $v1, $t6 /* 08639C 8008579C 00025880 */ sll $t3, $v0, 2 /* 0863A0 800857A0 AFAC0064 */ sw $t4, 0x64($sp) @@ -256,7 +256,7 @@ glabel func_800853D0 /* 0863A8 800857A8 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012 /* 0863AC 800857AC 012B4821 */ addu $t1, $t1, $t3 /* 0863B0 800857B0 8D086660 */ lw $t0, %lo(D_80126660)($t0) -/* 0863B4 800857B4 8D29FACC */ lw $t1, -0x534($t1) +/* 0863B4 800857B4 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1) /* 0863B8 800857B8 10000027 */ b .L80085858 /* 0863BC 800857BC AFAF0060 */ sw $t7, 0x60($sp) /* 0863C0 800857C0 3C18800E */ lui $t8, %hi(D_800DFC30) # $t8, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_800871D8.s b/asm/non_matchings/unknown_080500/func_800871D8.s index d17e4b09..feee927c 100644 --- a/asm/non_matchings/unknown_080500/func_800871D8.s +++ b/asm/non_matchings/unknown_080500/func_800871D8.s @@ -9,11 +9,11 @@ glabel func_800871D8 /* 087DF4 800871F4 26B5FAE0 */ addiu $s5, %lo(D_800DFAE0) # addiu $s5, $s5, -0x520 /* 087DF8 800871F8 31CF0003 */ andi $t7, $t6, 3 /* 087DFC 800871FC 0018C880 */ sll $t9, $t8, 2 -/* 087E00 80087200 3C08800E */ lui $t0, 0x800e +/* 087E00 80087200 3C08800E */ lui $t0, %hi(D_800DFBDC) # $t0, 0x800e /* 087E04 80087204 AFB4002C */ sw $s4, 0x2c($sp) /* 087E08 80087208 AEAF0000 */ sw $t7, ($s5) /* 087E0C 8008720C 01194021 */ addu $t0, $t0, $t9 -/* 087E10 80087210 8D08FBDC */ lw $t0, -0x424($t0) +/* 087E10 80087210 8D08FBDC */ lw $t0, %lo(D_800DFBDC)($t0) /* 087E14 80087214 3C148012 */ lui $s4, %hi(D_80126A70) # $s4, 0x8012 /* 087E18 80087218 26946A70 */ addiu $s4, %lo(D_80126A70) # addiu $s4, $s4, 0x6a70 /* 087E1C 8008721C 3C01800E */ lui $at, %hi(D_800DFADC) # $at, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_8008C168.s b/asm/non_matchings/unknown_080500/func_8008C168.s index d6cfb2fa..243201a2 100644 --- a/asm/non_matchings/unknown_080500/func_8008C168.s +++ b/asm/non_matchings/unknown_080500/func_8008C168.s @@ -14,18 +14,18 @@ glabel func_8008C168 /* 08CD98 8008C198 1F000031 */ bgtz $t8, .L8008C260 /* 08CD9C 8008C19C 261063B8 */ addiu $s0, %lo(D_801263B8) # addiu $s0, $s0, 0x63b8 /* 08CDA0 8008C1A0 82020000 */ lb $v0, ($s0) -/* 08CDA4 8008C1A4 3C04800E */ lui $a0, 0x800e +/* 08CDA4 8008C1A4 3C04800E */ lui $a0, %hi(D_800DFDB4) # $a0, 0x800e /* 08CDA8 8008C1A8 0440000E */ bltz $v0, .L8008C1E4 /* 08CDAC 8008C1AC 0002C840 */ sll $t9, $v0, 1 /* 08CDB0 8008C1B0 00992021 */ addu $a0, $a0, $t9 -/* 08CDB4 8008C1B4 9084FDB4 */ lbu $a0, -0x24c($a0) +/* 08CDB4 8008C1B4 9084FDB4 */ lbu $a0, %lo(D_800DFDB4)($a0) /* 08CDB8 8008C1B8 0C000445 */ jal func_80001114 /* 08CDBC 8008C1BC 00000000 */ nop /* 08CDC0 8008C1C0 82080000 */ lb $t0, ($s0) -/* 08CDC4 8008C1C4 3C04800E */ lui $a0, 0x800e +/* 08CDC4 8008C1C4 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e /* 08CDC8 8008C1C8 00084840 */ sll $t1, $t0, 1 /* 08CDCC 8008C1CC 00892021 */ addu $a0, $a0, $t1 -/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, -0x24b($a0) +/* 08CDD0 8008C1D0 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($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, 0x800e +/* 08CE48 8008C248 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e /* 08CE4C 8008C24C 000E7840 */ sll $t7, $t6, 1 /* 08CE50 8008C250 008F2021 */ addu $a0, $a0, $t7 -/* 08CE54 8008C254 9084FDB5 */ lbu $a0, -0x24b($a0) +/* 08CE54 8008C254 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) /* 08CE58 8008C258 0C00045C */ jal func_80001170 /* 08CE5C 8008C25C 00000000 */ nop .L8008C260: @@ -79,23 +79,23 @@ glabel func_8008C168 /* 08CE90 8008C290 00025840 */ sll $t3, $v0, 1 /* 08CE94 8008C294 28C10080 */ slti $at, $a2, 0x80 /* 08CE98 8008C298 14200005 */ bnez $at, .L8008C2B0 -/* 08CE9C 8008C29C 3C04800E */ lui $a0, 0x800e +/* 08CE9C 8008C29C 3C04800E */ lui $a0, %hi(D_800DFDB4) # $a0, 0x800e /* 08CEA0 8008C2A0 240A007F */ li $t2, 127 /* 08CEA4 8008C2A4 A46A0002 */ sh $t2, 2($v1) /* 08CEA8 8008C2A8 84660002 */ lh $a2, 2($v1) /* 08CEAC 8008C2AC 00000000 */ nop .L8008C2B0: /* 08CEB0 8008C2B0 008B2021 */ addu $a0, $a0, $t3 -/* 08CEB4 8008C2B4 9084FDB4 */ lbu $a0, -0x24c($a0) +/* 08CEB4 8008C2B4 9084FDB4 */ lbu $a0, %lo(D_800DFDB4)($a0) /* 08CEB8 8008C2B8 0C00049A */ jal func_80001268 /* 08CEBC 8008C2BC 30C500FF */ andi $a1, $a2, 0xff /* 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, 0x800e +/* 08CECC 8008C2CC 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e /* 08CED0 8008C2D0 000C6840 */ sll $t5, $t4, 1 /* 08CED4 8008C2D4 008D2021 */ addu $a0, $a0, $t5 -/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, -0x24b($a0) +/* 08CED8 8008C2D8 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($a0) /* 08CEDC 8008C2DC 90650003 */ lbu $a1, 3($v1) /* 08CEE0 8008C2E0 0C00049A */ jal func_80001268 /* 08CEE4 8008C2E4 00000000 */ nop @@ -116,16 +116,16 @@ glabel func_8008C168 /* 08CF1C 8008C31C 04610010 */ bgez $v1, .L8008C360 /* 08CF20 8008C320 3C04800E */ lui $a0, %hi(D_800DFDB4) # $a0, 0x800e /* 08CF24 8008C324 00024840 */ sll $t1, $v0, 1 -/* 08CF28 8008C328 3C04800E */ lui $a0, 0x800e +/* 08CF28 8008C328 3C04800E */ lui $a0, %hi(D_800DFDB4) # $a0, 0x800e /* 08CF2C 8008C32C 00892021 */ addu $a0, $a0, $t1 -/* 08CF30 8008C330 9084FDB4 */ lbu $a0, -0x24c($a0) +/* 08CF30 8008C330 9084FDB4 */ lbu $a0, %lo(D_800DFDB4)($a0) /* 08CF34 8008C334 0C000445 */ jal func_80001114 /* 08CF38 8008C338 00000000 */ nop /* 08CF3C 8008C33C 820A0000 */ lb $t2, ($s0) -/* 08CF40 8008C340 3C04800E */ lui $a0, 0x800e +/* 08CF40 8008C340 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e /* 08CF44 8008C344 000A5840 */ sll $t3, $t2, 1 /* 08CF48 8008C348 008B2021 */ addu $a0, $a0, $t3 -/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, -0x24b($a0) +/* 08CF4C 8008C34C 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($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, 0x800e +/* 08CF74 8008C374 3C04800E */ lui $a0, %hi(D_800DFDB5) # $a0, 0x800e /* 08CF78 8008C378 000D7840 */ sll $t7, $t5, 1 /* 08CF7C 8008C37C 008F2021 */ addu $a0, $a0, $t7 -/* 08CF80 8008C380 9084FDB5 */ lbu $a0, -0x24b($a0) +/* 08CF80 8008C380 9084FDB5 */ lbu $a0, %lo(D_800DFDB5)($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_8008CD74.s b/asm/non_matchings/unknown_080500/func_8008CD74.s index fc1a5283..28fa2c83 100644 --- a/asm/non_matchings/unknown_080500/func_8008CD74.s +++ b/asm/non_matchings/unknown_080500/func_8008CD74.s @@ -360,9 +360,9 @@ glabel func_8008CD74 /* 08DEB4 8008D2B4 922D0001 */ lbu $t5, 1($s1) /* 08DEB8 8008D2B8 00137080 */ sll $t6, $s3, 2 /* 08DEBC 8008D2BC 15A00005 */ bnez $t5, .L8008D2D4 -/* 08DEC0 8008D2C0 3C04800E */ lui $a0, 0x800e +/* 08DEC0 8008D2C0 3C04800E */ lui $a0, %hi(D_800E03B0) # $a0, 0x800e /* 08DEC4 8008D2C4 008E2021 */ addu $a0, $a0, $t6 -/* 08DEC8 8008D2C8 8C8403B0 */ lw $a0, 0x3b0($a0) +/* 08DEC8 8008D2C8 8C8403B0 */ lw $a0, %lo(D_800E03B0)($a0) /* 08DECC 8008D2CC 0C025DF4 */ jal func_800977D0 /* 08DED0 8008D2D0 02A02825 */ move $a1, $s5 .L8008D2D4: diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 7d309e49..d327f9ac 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -52,10 +52,10 @@ glabel func_80092188 .L80092248: /* 092E48 80092248 3C18800E */ lui $t8, %hi(D_800DF4C4) # $t8, 0x800e /* 092E4C 8009224C 8F18F4C4 */ lw $t8, %lo(D_800DF4C4)($t8) -/* 092E50 80092250 3C02800E */ lui $v0, 0x800e +/* 092E50 80092250 3C02800E */ lui $v0, %hi(D_800E0758) # $v0, 0x800e /* 092E54 80092254 0018C840 */ sll $t9, $t8, 1 /* 092E58 80092258 00591021 */ addu $v0, $v0, $t9 -/* 092E5C 8009225C 84420758 */ lh $v0, 0x758($v0) +/* 092E5C 8009225C 84420758 */ lh $v0, %lo(D_800E0758)($v0) /* 092E60 80092260 240DFFFF */ li $t5, -1 /* 092E64 80092264 11A2000B */ beq $t5, $v0, .L80092294 /* 092E68 80092268 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80092E94.s b/asm/non_matchings/unknown_080500/func_80092E94.s index 5562da95..791b120b 100644 --- a/asm/non_matchings/unknown_080500/func_80092E94.s +++ b/asm/non_matchings/unknown_080500/func_80092E94.s @@ -366,9 +366,9 @@ glabel func_80092E94 /* 094020 80093420 00026880 */ sll $t5, $v0, 2 /* 094024 80093424 01A26823 */ subu $t5, $t5, $v0 /* 094028 80093428 000DC080 */ sll $t8, $t5, 2 -/* 09402C 8009342C 3C05800E */ lui $a1, 0x800e +/* 09402C 8009342C 3C05800E */ lui $a1, %hi(D_800E0624) # $a1, 0x800e /* 094030 80093430 00B82821 */ addu $a1, $a1, $t8 -/* 094034 80093434 8CA50624 */ lw $a1, 0x624($a1) +/* 094034 80093434 8CA50624 */ lw $a1, %lo(D_800E0624)($a1) /* 094038 80093438 241900FF */ li $t9, 255 /* 09403C 8009343C 240900FF */ li $t1, 255 /* 094040 80093440 240E00FF */ li $t6, 255 diff --git a/asm/non_matchings/unknown_080500/func_80094170.s b/asm/non_matchings/unknown_080500/func_80094170.s index d0964226..a3e7bc18 100644 --- a/asm/non_matchings/unknown_080500/func_80094170.s +++ b/asm/non_matchings/unknown_080500/func_80094170.s @@ -236,18 +236,18 @@ glabel func_80094170 /* 0950C8 800944C8 0C01BAC5 */ jal func_8006EB14 /* 0950CC 800944CC 00000000 */ nop /* 0950D0 800944D0 00027840 */ sll $t7, $v0, 1 -/* 0950D4 800944D4 3C18800E */ lui $t8, 0x800e +/* 0950D4 800944D4 3C18800E */ lui $t8, %hi(D_800E0758) # $t8, 0x800e /* 0950D8 800944D8 030FC021 */ addu $t8, $t8, $t7 -/* 0950DC 800944DC 87180758 */ lh $t8, 0x758($t8) +/* 0950DC 800944DC 87180758 */ lh $t8, %lo(D_800E0758)($t8) /* 0950E0 800944E0 2401FFFF */ li $at, -1 /* 0950E4 800944E4 1301000A */ beq $t8, $at, .L80094510 /* 0950E8 800944E8 00000000 */ nop /* 0950EC 800944EC 0C01BAC5 */ jal func_8006EB14 /* 0950F0 800944F0 00000000 */ nop /* 0950F4 800944F4 0002C840 */ sll $t9, $v0, 1 -/* 0950F8 800944F8 3C04800E */ lui $a0, 0x800e +/* 0950F8 800944F8 3C04800E */ lui $a0, %hi(D_800E0758) # $a0, 0x800e /* 0950FC 800944FC 00992021 */ addu $a0, $a0, $t9 -/* 095100 80094500 94840758 */ lhu $a0, 0x758($a0) +/* 095100 80094500 94840758 */ lhu $a0, %lo(D_800E0758)($a0) /* 095104 80094504 00002825 */ move $a1, $zero /* 095108 80094508 0C0003F7 */ jal func_80000FDC /* 09510C 8009450C 3C063F80 */ lui $a2, 0x3f80 diff --git a/asm/non_matchings/unknown_080500/func_80094A5C.s b/asm/non_matchings/unknown_080500/func_80094A5C.s index c9779595..2156883e 100644 --- a/asm/non_matchings/unknown_080500/func_80094A5C.s +++ b/asm/non_matchings/unknown_080500/func_80094A5C.s @@ -12,9 +12,9 @@ glabel func_80094A5C /* 095684 80094A84 1000005F */ b .L80094C04 /* 095688 80094A88 AC6E0000 */ sw $t6, ($v1) .L80094A8C: -/* 09568C 80094A8C 3C04800E */ lui $a0, 0x800e +/* 09568C 80094A8C 3C04800E */ lui $a0, %hi(D_800E0A10) # $a0, 0x800e /* 095690 80094A90 008F2021 */ addu $a0, $a0, $t7 -/* 095694 80094A94 84840A10 */ lh $a0, 0xa10($a0) +/* 095694 80094A94 84840A10 */ lh $a0, %lo(D_800E0A10)($a0) /* 095698 80094A98 2401FFFF */ li $at, -1 /* 09569C 80094A9C 14810052 */ bne $a0, $at, .L80094BE8 /* 0956A0 80094AA0 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 55d9eb52..f4094a8b 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -1058,18 +1058,18 @@ glabel func_80095728 /* 097274 80096674 0C01BAC5 */ jal func_8006EB14 /* 097278 80096678 00000000 */ nop /* 09727C 8009667C 00027840 */ sll $t7, $v0, 1 -/* 097280 80096680 3C18800E */ lui $t8, 0x800e +/* 097280 80096680 3C18800E */ lui $t8, %hi(D_800E0758) # $t8, 0x800e /* 097284 80096684 030FC021 */ addu $t8, $t8, $t7 -/* 097288 80096688 87180758 */ lh $t8, 0x758($t8) +/* 097288 80096688 87180758 */ lh $t8, %lo(D_800E0758)($t8) /* 09728C 8009668C 2401FFFF */ li $at, -1 /* 097290 80096690 1301000B */ beq $t8, $at, .L800966C0 /* 097294 80096694 24190002 */ li $t9, 2 /* 097298 80096698 0C01BAC5 */ jal func_8006EB14 /* 09729C 8009669C 00000000 */ nop /* 0972A0 800966A0 00026840 */ sll $t5, $v0, 1 -/* 0972A4 800966A4 3C04800E */ lui $a0, 0x800e +/* 0972A4 800966A4 3C04800E */ lui $a0, %hi(D_800E0758) # $a0, 0x800e /* 0972A8 800966A8 008D2021 */ addu $a0, $a0, $t5 -/* 0972AC 800966AC 94840758 */ lhu $a0, 0x758($a0) +/* 0972AC 800966AC 94840758 */ lhu $a0, %lo(D_800E0758)($a0) /* 0972B0 800966B0 00002825 */ move $a1, $zero /* 0972B4 800966B4 0C0003F7 */ jal func_80000FDC /* 0972B8 800966B8 3C063F80 */ lui $a2, 0x3f80 diff --git a/asm/non_matchings/unknown_080500/func_80097D10.s b/asm/non_matchings/unknown_080500/func_80097D10.s index c1fd113e..449c1f72 100644 --- a/asm/non_matchings/unknown_080500/func_80097D10.s +++ b/asm/non_matchings/unknown_080500/func_80097D10.s @@ -181,10 +181,10 @@ glabel func_80097D10 /* 098B94 80097F94 2921001D */ slti $at, $t1, 0x1d /* 098B98 80097F98 1020001D */ beqz $at, .L80098010 /* 098B9C 80097F9C 25086C74 */ addiu $t0, %lo(D_80126C74) # addiu $t0, $t0, 0x6c74 -/* 098BA0 80097FA0 3C18800E */ lui $t8, 0x800e +/* 098BA0 80097FA0 3C18800E */ lui $t8, %hi(D_800E0F6C) # $t8, 0x800e /* 098BA4 80097FA4 8D190000 */ lw $t9, ($t0) /* 098BA8 80097FA8 0309C021 */ addu $t8, $t8, $t1 -/* 098BAC 80097FAC 93180F6C */ lbu $t8, 0xf6c($t8) +/* 098BAC 80097FAC 93180F6C */ lbu $t8, %lo(D_800E0F6C)($t8) /* 098BB0 80097FB0 03225021 */ addu $t2, $t9, $v0 /* 098BB4 80097FB4 A1580000 */ sb $t8, ($t2) /* 098BB8 80097FB8 8C6B0000 */ lw $t3, ($v1) diff --git a/asm/non_matchings/unknown_080500/func_80099E8C.s b/asm/non_matchings/unknown_080500/func_80099E8C.s index 9e7c907d..eb22225b 100644 --- a/asm/non_matchings/unknown_080500/func_80099E8C.s +++ b/asm/non_matchings/unknown_080500/func_80099E8C.s @@ -282,13 +282,13 @@ glabel func_80099E8C /* 09AEBC 8009A2BC 0C031110 */ jal func_800C4440 /* 09AEC0 8009A2C0 01323021 */ addu $a2, $t1, $s2 /* 09AEC4 8009A2C4 8FAB0074 */ lw $t3, 0x74($sp) -/* 09AEC8 8009A2C8 3C05800E */ lui $a1, 0x800e +/* 09AEC8 8009A2C8 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e /* 09AECC 8009A2CC 916C0000 */ lbu $t4, ($t3) /* 09AED0 8009A2D0 86260004 */ lh $a2, 4($s1) /* 09AED4 8009A2D4 000C6880 */ sll $t5, $t4, 2 /* 09AED8 8009A2D8 862E0006 */ lh $t6, 6($s1) /* 09AEDC 8009A2DC 00AD2821 */ addu $a1, $a1, $t5 -/* 09AEE0 8009A2E0 8CA50AF0 */ lw $a1, 0xaf0($a1) +/* 09AEE0 8009A2E0 8CA50AF0 */ lw $a1, %lo(D_800E0AF0)($a1) /* 09AEE4 8009A2E4 240F00FF */ li $t7, 255 /* 09AEE8 8009A2E8 241800FF */ li $t8, 255 /* 09AEEC 8009A2EC 241900FF */ li $t9, 255 diff --git a/asm/non_matchings/unknown_080500/func_8009CFEC.s b/asm/non_matchings/unknown_080500/func_8009CFEC.s index 988bd1e0..d5a67b9b 100644 --- a/asm/non_matchings/unknown_080500/func_8009CFEC.s +++ b/asm/non_matchings/unknown_080500/func_8009CFEC.s @@ -1,11 +1,11 @@ glabel func_8009CFEC /* 09DBEC 8009CFEC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 09DBF0 8009CFF0 3C01800E */ lui $at, 0x800e +/* 09DBF0 8009CFF0 3C01800E */ lui $at, %hi(D_800DF4E4) # $at, 0x800e /* 09DBF4 8009CFF4 AFBF001C */ sw $ra, 0x1c($sp) /* 09DBF8 8009CFF8 00240821 */ addu $at, $at, $a0 /* 09DBFC 8009CFFC AFA40028 */ sw $a0, 0x28($sp) /* 09DC00 8009D000 0C030D00 */ jal func_800C3400 -/* 09DC04 8009D004 A020F4E4 */ sb $zero, -0xb1c($at) +/* 09DC04 8009D004 A020F4E4 */ sb $zero, %lo(D_800DF4E4)($at) /* 09DC08 8009D008 10400007 */ beqz $v0, .L8009D028 /* 09DC0C 8009D00C 3C18800E */ lui $t8, %hi(D_800DF4E0) # $t8, 0x800e /* 09DC10 8009D010 8FAF0028 */ lw $t7, 0x28($sp) diff --git a/src/unknown_080500.c b/src/unknown_080500.c index f20bed30..777ff80c 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -316,7 +316,8 @@ s32 D_800DFB5C[6] = { 0, 0, 0, 0, 0, 0 }; s32 D_800DFB74[6] = { 0, 0, 0, 0, 0, 0 }; s32 D_800DFB8C[6] = { 0, 0, 0, 0, 0, 0 }; s32 D_800DFBA4[6] = { 0, 0, 0, 0, 0, 0 }; -s32 D_800DFBBC[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +s32 D_800DFBBC[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; +s32 D_800DFBDC = 0; // Unused? s32* D_800DFBE0[10] = { @@ -641,26 +642,28 @@ s16 D_800E0710[16] = { 0x16, 0x17, 0x20, 0x00 }; -s16 D_800E0730[74] = { +s16 D_800E0730[18] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0xFFFF, 0xFFFF, 0x0129, 0x011A, - 0x0120, 0x0115, 0x0126, 0x011D, - 0x0130, 0x0121, 0x0117, 0x0154, - 0x0128, 0x0119, 0x012C, 0x0123, - 0xFFFF, 0x0122, 0x011C, 0x0116, - 0x0127, 0xFFFF, 0xFFFF, 0xFFFF, - 0x012D, 0x012E, 0x0153, 0x012B, - 0x011B, 0x011F, 0x0124, 0x011E, - 0x0118, 0x0125, 0x012F, 0x012A, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, - 0xFFFF, 0x0000 + 0x0000, 0x0000 +}; +s16 D_800E0758[56] = { + 0x0000, 0x0000, 0xFFFF, 0xFFFF, + 0x0129, 0x011A, 0x0120, 0x0115, + 0x0126, 0x011D, 0x0130, 0x0121, + 0x0117, 0x0154, 0x0128, 0x0119, + 0x012C, 0x0123, 0xFFFF, 0x0122, + 0x011C, 0x0116, 0x0127, 0xFFFF, + 0xFFFF, 0xFFFF, 0x012D, 0x012E, + 0x0153, 0x012B, 0x011B, 0x011F, + 0x0124, 0x011E, 0x0118, 0x0125, + 0x012F, 0x012A, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0x0000 }; s16 D_800E07C4[14] = { @@ -758,7 +761,8 @@ s32 D_800E09C4[5] = { 0, 0, 0, 0, 0 }; s32 D_800E09D8[5] = { 0, 0, 0, 0, 0 }; s32 D_800E09EC[3] = { 0, 0, 0 }; s32 D_800E09F8[3] = { 0, 0, 0 }; -s32 D_800E0A04[4] = { 0, 0, 0, 0 }; +s32 D_800E0A04[3] = { 0, 0, 0 }; +s32 D_800E0A10 = 0; s32 D_800E0A14[4] = { 0, 0, 0, 0 }; s16 D_800E0A24[14] = { diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index 9f4459ec..10119cac 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -5,18 +5,18 @@ 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}:|\n)' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|f[0-9]{1,2}|k[0-1]|gp|sp|fp|ra|zero))' 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][bhwd](u|c1)?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{4})\(\4\))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhwd](u|c1)?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{3,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][bhwd](u|c1)?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)' +LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhwd](u|c1)?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{3,4}([^\n]*)' IGNORE_GLABELS = ['D_800E389E', 'D_801264A1', 'D_800E1B84'] def _find_glabels(asm): glabels = [] for file in FileUtil.get_filenames_from_directory_recursive('.', '.s'): - ''' + #''' contents = FileUtil.get_text_from_file(file) matches = re.findall(GLABEL_REGEX, contents) for match in matches: @@ -24,7 +24,7 @@ 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[15], 16) # lower immediate of the glabel - glabel_lower &= 0xFFFF) + glabel_lower &= 0xFFFF 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 f18c5e90..007fb4cc 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -385,6 +385,7 @@ D_800DFB74 = 0x800DFB74; D_800DFB8C = 0x800DFB8C; D_800DFBA4 = 0x800DFBA4; D_800DFBBC = 0x800DFBBC; +D_800DFBDC = 0x800DFBDC; D_800DFC10 = 0x800DFC10; D_800DFC20 = 0x800DFC20; D_800DFC30 = 0x800DFC30; @@ -399,6 +400,7 @@ gActiveMagicCodes = 0x800DFD98; gUnlockedMagicCodes = 0x800DFD9C; D_800DFDA0 = 0x800DFDA0; D_800DFDB4 = 0x800DFDB4; +D_800DFDB5 = 0x800DFDB5; D_800DFDC8 = 0x800DFDC8; D_800DFDCC = 0x800DFDCC; D_800DFDD0 = 0x800DFDD0; @@ -466,6 +468,7 @@ D_800E0700 = 0x800E0700; D_800E0710 = 0x800E0710; D_800E072E = 0x800E072E; D_800E0730 = 0x800E0730; +D_800E0758 = 0x800E0758; D_800E07C4 = 0x800E07C4; D_800E07E0 = 0x800E07E0; D_800E07E8 = 0x800E07E8; @@ -489,6 +492,7 @@ D_800E09D8 = 0x800E09D8; D_800E09EC = 0x800E09EC; D_800E09F8 = 0x800E09F8; D_800E0A04 = 0x800E0A04; +D_800E0A10 = 0x800E0A10; D_800E0A14 = 0x800E0A14; D_800E0A24 = 0x800E0A24; D_800E0A40 = 0x800E0A40; @@ -2243,7 +2247,10 @@ D_80120004 = 0x80120004; D_80120010 = 0x80120010; D_8012004B = 0x8012004B; D_80120AC0 = 0x80120AC0; +D_80120AC4 = 0x80120AC4; +D_80120AF4 = 0x80120AF4; D_80120BD0 = 0x80120BD0; +D_80120BD4 = 0x80120BD4; D_80120CE0 = 0x80120CE0; D_80120CE4 = 0x80120CE4; D_80120CE8 = 0x80120CE8; @@ -2256,8 +2263,12 @@ D_80120D15 = 0x80120D15; D_80120D18 = 0x80120D18; D_80120D1C = 0x80120D1C; D_80120D20 = 0x80120D20; +D_80120D28 = 0x80120D28; +D_80120D40 = 0x80120D40; +D_80120D58 = 0x80120D58; D_80120D6C = 0x80120D6C; D_80120D70 = 0x80120D70; +D_80120D74 = 0x80120D74; D_80120D88 = 0x80120D88; D_80120DA0 = 0x80120DA0; D_80120EE0 = 0x80120EE0;