diff --git a/asm/non_matchings/unknown_005740/func_80005D08.s b/asm/non_matchings/unknown_005740/func_80005D08.s index 65338fc4..05f957f2 100644 --- a/asm/non_matchings/unknown_005740/func_80005D08.s +++ b/asm/non_matchings/unknown_005740/func_80005D08.s @@ -180,7 +180,8 @@ glabel func_80005D08 /* 006B98 80005F98 44805000 */ mtc1 $zero, $f10 /* 006B9C 80005F9C 46008221 */ cvt.d.s $f8, $f16 /* 006BA0 80005FA0 46285032 */ c.eq.d $f10, $f8 -/* 006BA4 80005FA4 3C01800E */ lui $at, 0x800e +# Used to access D_800E4C58 and D_800E4C5C. +/* 006BA4 80005FA4 3C01800E */ lui $at, %hi(D_800E4C58) # $at, 0x800e /* 006BA8 80005FA8 45010034 */ bc1t .L8000607C /* 006BAC 80005FAC 00000000 */ nop /* 006BB0 80005FB0 8C849C3C */ lw $a0, %lo(D_80119C3C)($a0) diff --git a/asm/non_matchings/unknown_005740/func_800063EC.s b/asm/non_matchings/unknown_005740/func_800063EC.s index bb854574..218a95b5 100644 --- a/asm/non_matchings/unknown_005740/func_800063EC.s +++ b/asm/non_matchings/unknown_005740/func_800063EC.s @@ -330,7 +330,8 @@ glabel func_800063EC /* 0074A4 800068A4 46049182 */ mul.s $f6, $f18, $f4 /* 0074A8 800068A8 46009221 */ cvt.d.s $f8, $f18 /* 0074AC 800068AC 46285032 */ c.eq.d $f10, $f8 -/* 0074B0 800068B0 3C01800E */ lui $at, 0x800e +# Used to access D_800E4C88 and D_800E4C8C. +/* 0074B0 800068B0 3C01800E */ lui $at, %hi(D_800E4C88) # $at, 0x800e /* 0074B4 800068B4 45010032 */ bc1t .L80006980 /* 0074B8 800068B8 46067380 */ add.s $f14, $f14, $f6 /* 0074BC 800068BC 8DAD9C3C */ lw $t5, %lo(D_80119C3C)($t5) diff --git a/asm/non_matchings/unknown_005740/func_80006BFC.s b/asm/non_matchings/unknown_005740/func_80006BFC.s index 955e0cfe..f2584eaa 100644 --- a/asm/non_matchings/unknown_005740/func_80006BFC.s +++ b/asm/non_matchings/unknown_005740/func_80006BFC.s @@ -219,7 +219,8 @@ glabel func_80006BFC /* 007B38 80006F38 C42B4CA8 */ lwc1 $f11, %lo(D_800E4CA8)($at) /* 007B3C 80006F3C 46004321 */ cvt.d.s $f12, $f8 /* 007B40 80006F40 462C503C */ c.lt.d $f10, $f12 -/* 007B44 80006F44 3C01800E */ lui $at, 0x800e +# Used to access D_800E4CB8 and D_800E4CBC. +/* 007B44 80006F44 3C01800E */ lui $at, %hi(D_800E4CB8) # $at, 0x800e /* 007B48 80006F48 45000009 */ bc1f .L80006F70 /* 007B4C 80006F4C 00000000 */ nop /* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CBC) # $at, 0x800e diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index 4d87566f..3b5bfacb 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -1089,7 +1089,7 @@ glabel func_80006FC8 /* 008B80 80007F80 03E00008 */ jr $ra /* 008B84 80007F84 A02EC6D0 */ sb $t6, %lo(D_800DC6D0)($at) -/* 008B88 80007F88 3C01800E */ lui $at, %hi(D_800DC6D0) #$at, 0x800e +/* 008B88 80007F88 3C01800E */ lui $at, %hi(D_800DC6D0) # $at, 0x800e /* 008B8C 80007F8C 03E00008 */ jr $ra /* 008B90 80007F90 A020C6D0 */ sb $zero, %lo(D_800DC6D0)($at) diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s index 7a418d32..4a52d8d4 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B750.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s @@ -142,7 +142,7 @@ glabel func_8000B750 /* 00C560 8000B960 000D6840 */ sll $t5, $t5, 1 /* 00C564 8000B964 A7A00052 */ sh $zero, 0x52($sp) /* 00C568 8000B968 A7A00054 */ sh $zero, 0x54($sp) -/* 00C56C 8000B96C 3C0E800E */ lui $t6, 0x800e +/* 00C56C 8000B96C 3C0E800E */ lui $t6, %hi(D_800DC754) # $t6, 0x800e /* 00C570 8000B970 E7AE0010 */ swc1 $f14, 0x10($sp) /* 00C574 8000B974 E7B20064 */ swc1 $f18, 0x64($sp) /* 00C578 8000B978 E7B00058 */ swc1 $f16, 0x58($sp) @@ -155,7 +155,7 @@ glabel func_8000B750 /* 00C594 8000B994 AFAD0014 */ sw $t5, 0x14($sp) /* 00C598 8000B998 000FC900 */ sll $t9, $t7, 4 /* 00C59C 8000B99C 8D8F007C */ lw $t7, 0x7c($t4) -/* 00C5A0 8000B9A0 8DCEC754 */ lw $t6, -0x38ac($t6) +/* 00C5A0 8000B9A0 8DCEC754 */ lw $t6, %lo(D_800DC754)($t6) /* 00C5A4 8000B9A4 44071000 */ mfc1 $a3, $f2 /* 00C5A8 8000B9A8 AFAA0038 */ sw $t2, 0x38($sp) /* 00C5AC 8000B9AC AFA20044 */ sw $v0, 0x44($sp) @@ -228,7 +228,7 @@ glabel func_8000B750 /* 00C6B4 8000BAB4 00000000 */ nop .L8000BAB8: /* 00C6B8 8000BAB8 8FAF0090 */ lw $t7, 0x90($sp) -/* 00C6BC 8000BABC 3C018012 */ lui $at, %hi(D_8011B068) #$at, 0x8012 +/* 00C6BC 8000BABC 3C018012 */ lui $at, %hi(D_8011B068) # $at, 0x8012 /* 00C6C0 8000BAC0 11E00002 */ beqz $t7, .L8000BACC /* 00C6C4 8000BAC4 00300821 */ addu $at, $at, $s0 /* 00C6C8 8000BAC8 A020B068 */ sb $zero, %lo(D_8011B068)($at) diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 8ddce0fe..7d3023f0 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -616,7 +616,7 @@ glabel func_8000CC7C /* 00E124 8000D524 3C0E8012 */ lui $t6, %hi(D_8011AD25) # $t6, 0x8012 /* 00E128 8000D528 81CEAD25 */ lb $t6, %lo(D_8011AD25)($t6) # Indexing into D_800DC820 only reading the MSB? -/* 00E12C 8000D52C 3C1E800E */ lui $fp, %hi(D_800DC820) #$fp, 0x800e +/* 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, %lo(D_800DC820)($fp) @@ -832,7 +832,7 @@ glabel func_8000CC7C .L8000D834: /* 00E434 8000D834 A27E01CB */ sb $fp, 0x1cb($s3) /* 00E438 8000D838 826201CB */ lb $v0, 0x1cb($s3) -/* 00E43C 8000D83C 3C19800E */ lui $t9, 0x800e +/* 00E43C 8000D83C 3C19800E */ lui $t9, %hi(D_800DC840) # $t9, 0x800e /* 00E440 8000D840 04400003 */ bltz $v0, .L8000D850 /* 00E444 8000D844 28410003 */ slti $at, $v0, 3 /* 00E448 8000D848 14200002 */ bnez $at, .L8000D854 @@ -848,7 +848,7 @@ glabel func_8000CC7C /* 00E468 8000D868 24010002 */ li $at, 2 /* 00E46C 8000D86C 15C10004 */ bne $t6, $at, .L8000D880 /* 00E470 8000D870 0330C821 */ addu $t9, $t9, $s0 -/* 00E474 8000D874 8339C840 */ lb $t9, -0x37c0($t9) +/* 00E474 8000D874 8339C840 */ lb $t9, %lo(D_800DC840)($t9) /* 00E478 8000D878 10000004 */ b .L8000D88C /* 00E47C 8000D87C A2790003 */ sb $t9, 3($s3) .L8000D880: @@ -1264,7 +1264,7 @@ glabel func_8000CC7C /* 00EA64 8000DE64 17200005 */ bnez $t9, .L8000DE7C /* 00EA68 8000DE68 00000000 */ nop /* 00EA6C 8000DE6C 81EFAD3C */ lb $t7, %lo(D_8011AD3C)($t7) -/* 00EA70 8000DE70 3C018012 */ lui $at, 0x8012 +/* 00EA70 8000DE70 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 00EA74 8000DE74 11E00004 */ beqz $t7, .L8000DE88 /* 00EA78 8000DE78 00000000 */ nop .L8000DE7C: diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index 7a4a780f..f8db715a 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -27,7 +27,7 @@ glabel func_8000E2B4 /* 00EF18 8000E318 00095080 */ sll $t2, $t1, 2 /* 00EF1C 8000E31C 00194040 */ sll $t0, $t9, 1 /* 00EF20 8000E320 010A5821 */ addu $t3, $t0, $t2 -/* 00EF24 8000E324 3C03800E */ lui $v1, %hi(D_800DC7A8) #$v1, 0x800e +/* 00EF24 8000E324 3C03800E */ lui $v1, %hi(D_800DC7A8) # $v1, 0x800e /* 00EF28 8000E328 006B1821 */ addu $v1, $v1, $t3 /* 00EF2C 8000E32C 8463C7A8 */ lh $v1, %lo(D_800DC7A8)($v1) /* 00EF30 8000E330 10000006 */ b .L8000E34C diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index e80d1e36..e78f8db6 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -52,7 +52,7 @@ glabel func_80010994 /* 011650 80010A50 01285023 */ subu $t2, $t1, $t0 /* 011654 80010A54 A04A0000 */ sb $t2, ($v0) /* 011658 80010A58 804B0000 */ lb $t3, ($v0) -/* 01165C 80010A5C 3C018012 */ lui $at, %hi(D_8011AD22) #$at, 0x8012 +/* 01165C 80010A5C 3C018012 */ lui $at, %hi(D_8011AD22) # $at, 0x8012 /* 011660 80010A60 002B0821 */ addu $at, $at, $t3 /* 011664 80010A64 2484AEF0 */ addiu $a0, %lo(playerCount) # addiu $a0, $a0, -0x5110 /* 011668 80010A68 A020AD22 */ sb $zero, %lo(D_8011AD22)($at) diff --git a/asm/non_matchings/unknown_00BC20/func_80011C94.s b/asm/non_matchings/unknown_00BC20/func_80011C94.s index 041db092..66a332a0 100644 --- a/asm/non_matchings/unknown_00BC20/func_80011C94.s +++ b/asm/non_matchings/unknown_00BC20/func_80011C94.s @@ -115,7 +115,7 @@ glabel func_80011C94 /* 012A38 80011E38 15000003 */ bnez $t0, .L80011E48 /* 012A3C 80011E3C 28A100FF */ slti $at, $a1, 0xff /* 012A40 80011E40 10200012 */ beqz $at, .L80011E8C -/* 012A44 80011E44 3C108012 */ lui $s0, 0x8012 +/* 012A44 80011E44 3C108012 */ lui $s0, %hi(D_8011AE8C) # $s0, 0x8012 .L80011E48: /* 012A48 80011E48 3C108012 */ lui $s0, %hi(D_8011AE8C) # $s0, 0x8012 /* 012A4C 80011E4C 2610AE8C */ addiu $s0, %lo(D_8011AE8C) # addiu $s0, $s0, -0x5174 @@ -135,7 +135,7 @@ glabel func_80011C94 /* 012A84 80011E84 10000009 */ b .L80011EAC /* 012A88 80011E88 AC590004 */ sw $t9, 4($v0) .L80011E8C: -/* 012A8C 80011E8C 2610AE8C */ addiu $s0, $s0, -0x5174 +/* 012A8C 80011E8C 2610AE8C */ addiu $s0, %lo(D_8011AE8C) # addiu $s0, $s0, -0x5174 /* 012A90 80011E90 8E020000 */ lw $v0, ($s0) /* 012A94 80011E94 3C0DFA00 */ lui $t5, 0xfa00 /* 012A98 80011E98 244F0008 */ addiu $t7, $v0, 8 @@ -208,7 +208,7 @@ glabel func_80011C94 /* 012B90 80011F90 14800009 */ bnez $a0, .L80011FB8 /* 012B94 80011F94 00000000 */ nop /* 012B98 80011F98 15620028 */ bne $t3, $v0, .L8001203C -/* 012B9C 80011F9C 3C058012 */ lui $a1, 0x8012 +/* 012B9C 80011F9C 3C058012 */ lui $a1, %hi(D_8011AE90) # $a1, 0x8012 /* 012BA0 80011FA0 8CF80064 */ lw $t8, 0x64($a3) /* 012BA4 80011FA4 2401000A */ li $at, 10 /* 012BA8 80011FA8 930E0018 */ lbu $t6, 0x18($t8) @@ -257,7 +257,7 @@ glabel func_80011C94 /* 012C40 80012040 3C068012 */ lui $a2, %hi(D_8011AE94) # $a2, 0x8012 /* 012C44 80012044 24C6AE94 */ addiu $a2, %lo(D_8011AE94) # addiu $a2, $a2, -0x516c /* 012C48 80012048 02002025 */ move $a0, $s0 -/* 012C4C 8001204C 24A5AE90 */ addiu $a1, $a1, -0x5170 +/* 012C4C 8001204C 24A5AE90 */ addiu $a1, %lo(D_8011AE90) # addiu $a1, $a1, -0x5170 /* 012C50 80012050 AFAA0014 */ sw $t2, 0x14($sp) /* 012C54 80012054 AFA80080 */ sw $t0, 0x80($sp) /* 012C58 80012058 AFA9007C */ sw $t1, 0x7c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80013DCC.s b/asm/non_matchings/unknown_00BC20/func_80013DCC.s index 5831bdd9..1becf18d 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013DCC.s +++ b/asm/non_matchings/unknown_00BC20/func_80013DCC.s @@ -85,7 +85,7 @@ glabel func_80013DCC /* 014B0C 80013F0C 46022182 */ mul.s $f6, $f4, $f2 /* 014B10 80013F10 8FA90028 */ lw $t1, 0x28($sp) /* 014B14 80013F14 8FAB0054 */ lw $t3, 0x54($sp) -/* 014B18 80013F18 3C07800E */ lui $a3, 0x800e +/* 014B18 80013F18 3C07800E */ lui $a3, %hi(D_800DC84C) # $a3, 0x800e /* 014B1C 80013F1C E7060008 */ swc1 $f6, 8($t8) /* 014B20 80013F20 C4680004 */ lwc1 $f8, 4($v1) /* 014B24 80013F24 91390002 */ lbu $t9, 2($t1) @@ -124,7 +124,7 @@ glabel func_80013DCC /* 014BA8 80013FA8 3319007F */ andi $t9, $t8, 0x7f /* 014BAC 80013FAC 00ED3821 */ addu $a3, $a3, $t5 /* 014BB0 80013FB0 272A0080 */ addiu $t2, $t9, 0x80 -/* 014BB4 80013FB4 8CE7C84C */ lw $a3, -0x37b4($a3) +/* 014BB4 80013FB4 8CE7C84C */ lw $a3, %lo(D_800DC84C)($a3) /* 014BB8 80013FB8 0C01FD65 */ jal func_8007F594 /* 014BBC 80013FBC 01413025 */ or $a2, $t2, $at /* 014BC0 80013FC0 C7B00038 */ lwc1 $f16, 0x38($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_800143A8.s b/asm/non_matchings/unknown_00BC20/func_800143A8.s index b31fa321..78a5e316 100644 --- a/asm/non_matchings/unknown_00BC20/func_800143A8.s +++ b/asm/non_matchings/unknown_00BC20/func_800143A8.s @@ -287,7 +287,7 @@ glabel func_800143A8 /* 0153D4 800147D4 8FAE0074 */ lw $t6, 0x74($sp) .L800147D8: /* 0153D8 800147D8 8FBF003C */ lw $ra, 0x3c($sp) -/* 0153DC 800147DC 3C018012 */ lui $at, 0x8012 +/* 0153DC 800147DC 3C018012 */ lui $at, %hi(D_8011AE8C) # $at, 0x8012 /* 0153E0 800147E0 8FB00018 */ lw $s0, 0x18($sp) /* 0153E4 800147E4 8FB1001C */ lw $s1, 0x1c($sp) /* 0153E8 800147E8 8FB20020 */ lw $s2, 0x20($sp) @@ -300,5 +300,5 @@ glabel func_800143A8 /* 015404 80014804 27BD00B0 */ addiu $sp, $sp, 0xb0 /* 015408 80014808 01401025 */ move $v0, $t2 /* 01540C 8001480C 03E00008 */ jr $ra -/* 015410 80014810 AC2EAE8C */ sw $t6, -0x5174($at) +/* 015410 80014810 AC2EAE8C */ sw $t6, %lo(D_8011AE8C)($at) diff --git a/asm/non_matchings/unknown_00BC20/func_800159C8.s b/asm/non_matchings/unknown_00BC20/func_800159C8.s index 1e067148..c98d89e1 100644 --- a/asm/non_matchings/unknown_00BC20/func_800159C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800159C8.s @@ -391,7 +391,8 @@ glabel func_800159C8 /* 016BA4 80015FA4 8C850064 */ lw $a1, 0x64($a0) /* 016BA8 80015FA8 00001025 */ move $v0, $zero /* 016BAC 80015FAC 80AF01D6 */ lb $t7, 0x1d6($a1) -/* 016BB0 80015FB0 3C01800E */ lui $at, 0x800e +# Used to access D_800E55E0 and D_800E55E4 +/* 016BB0 80015FB0 3C01800E */ lui $at, %hi(D_800E55E0) # $at, 0x800e /* 016BB4 80015FB4 152F0059 */ bne $t1, $t7, .L8001611C /* 016BB8 80015FB8 00000000 */ nop /* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C4) # $at, 0x800e @@ -439,7 +440,8 @@ glabel func_800159C8 /* 016C5C 8001605C 460C2202 */ mul.s $f8, $f4, $f12 /* 016C60 80016060 C480001C */ lwc1 $f0, 0x1c($a0) /* 016C64 80016064 C4E4000C */ lwc1 $f4, 0xc($a3) -/* 016C68 80016068 3C01800E */ lui $at, 0x800e +# Used to access D_800E55D8 and D_800E55DC. +/* 016C68 80016068 3C01800E */ lui $at, %hi(D_800E55D8) # $at, 0x800e /* 016C6C 8001606C 46003282 */ mul.s $f10, $f6, $f0 /* 016C70 80016070 460A4081 */ sub.s $f2, $f8, $f10 /* 016C74 80016074 C4E80014 */ lwc1 $f8, 0x14($a3) @@ -453,7 +455,8 @@ glabel func_800159C8 /* 016C94 80016094 00000000 */ nop /* 016C98 80016098 45000011 */ bc1f .L800160E0 /* 016C9C 8001609C 00000000 */ nop -/* 016CA0 800160A0 3C01800E */ li $at, 0x800E0000 # -0.000000 +# Used to access D_800E55D0 and D_800E55D4. +/* 016CA0 800160A0 3C01800E */ lui $at, %hi(D_800E55D0) # $at, 0x800e /* 016CA4 800160A4 C486001C */ lwc1 $f6, 0x1c($a0) /* 016CA8 800160A8 C42155D0 */ lwc1 $f1, %lo(D_800E55D0)($at) /* 016CAC 800160AC C42055D4 */ lwc1 $f0, %lo(D_800E55D4)($at) diff --git a/asm/non_matchings/unknown_00BC20/func_8001BB18.s b/asm/non_matchings/unknown_00BC20/func_8001BB18.s index 07f0ff0c..d30367f6 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BB18.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BB18.s @@ -11,13 +11,13 @@ glabel func_8001BB18 /* 01C734 8001BB34 04800003 */ bltz $a0, .L8001BB44 /* 01C738 8001BB38 0082082A */ slt $at, $a0, $v0 /* 01C73C 8001BB3C 14200003 */ bnez $at, .L8001BB4C -/* 01C740 8001BB40 3C0E8012 */ lui $t6, 0x8012 +/* 01C740 8001BB40 3C0E8012 */ lui $t6, %hi(D_8011AEEC) # $t6, 0x8012 .L8001BB44: /* 01C744 8001BB44 03E00008 */ jr $ra /* 01C748 8001BB48 00001025 */ move $v0, $zero .L8001BB4C: -/* 01C74C 8001BB4C 8DCEAEEC */ lw $t6, -0x5114($t6) +/* 01C74C 8001BB4C 8DCEAEEC */ lw $t6, %lo(D_8011AEEC)($t6) /* 01C750 8001BB50 00047880 */ sll $t7, $a0, 2 /* 01C754 8001BB54 01CFC021 */ addu $t8, $t6, $t7 /* 01C758 8001BB58 8F020000 */ lw $v0, ($t8) diff --git a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s index 35e70019..3f474f97 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s @@ -151,7 +151,7 @@ glabel func_8001E4C4 .L8001E6D8: /* 01F2D8 8001E6D8 3C018012 */ lui $at, %hi(D_8011AE60) # $at, 0x8012 /* 01F2DC 8001E6DC AC22AE60 */ sw $v0, %lo(D_8011AE60)($at) -/* 01F2E0 8001E6E0 3C018012 */ lui $at, %hi(D_8011AE7C) #$at, 0x8012 +/* 01F2E0 8001E6E0 3C018012 */ lui $at, %hi(D_8011AE7C) # $at, 0x8012 /* 01F2E4 8001E6E4 03E00008 */ jr $ra /* 01F2E8 8001E6E8 A420AE7C */ sh $zero, %lo(D_8011AE7C)($at) diff --git a/asm/non_matchings/unknown_0255E0/func_800249F0.s b/asm/non_matchings/unknown_0255E0/func_800249F0.s index c43b4390..52aa24b8 100644 --- a/asm/non_matchings/unknown_0255E0/func_800249F0.s +++ b/asm/non_matchings/unknown_0255E0/func_800249F0.s @@ -136,7 +136,7 @@ glabel func_800249F0 /* 0257E0 80024BE0 0C002C08 */ jal func_8000B020 /* 0257E4 80024BE4 24050040 */ li $a1, 64 /* 0257E8 80024BE8 16200008 */ bnez $s1, .L80024C0C -/* 0257EC 80024BEC 3C04800E */ lui $a0, 0x800e +/* 0257EC 80024BEC 3C04800E */ lui $a0, %hi(D_800DC874) # $a0, 0x800e /* 0257F0 80024BF0 16000006 */ bnez $s0, .L80024C0C /* 0257F4 80024BF4 00000000 */ nop /* 0257F8 80024BF8 3C04800E */ lui $a0, %hi(D_800DC87C) # $a0, 0x800e @@ -146,7 +146,7 @@ glabel func_800249F0 /* 025808 80024C08 8E640000 */ lw $a0, ($s3) .L80024C0C: /* 02580C 80024C0C 0C030076 */ jal func_800C01D8 -/* 025810 80024C10 2484C874 */ addiu $a0, $a0, -0x378c +/* 025810 80024C10 2484C874 */ addiu $a0, %lo(D_800DC874) # addiu $a0, $a0, -0x378c /* 025814 80024C14 8E640000 */ lw $a0, ($s3) .L80024C18: /* 025818 80024C18 0C01994B */ jal func_8006652C diff --git a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s index fb94c005..da903827 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s @@ -182,7 +182,7 @@ glabel func_8002A5F8 /* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EAC)($at) /* 02B49C 8002A89C 46003221 */ cvt.d.s $f8, $f6 /* 02B4A0 8002A8A0 462A403C */ c.lt.d $f8, $f10 -/* 02B4A4 8002A8A4 3C018012 */ lui $at, 0x8012 +/* 02B4A4 8002A8A4 3C018012 */ lui $at, %hi(D_8011B0BC) # $at, 0x8012 /* 02B4A8 8002A8A8 45000005 */ bc1f .L8002A8C0 /* 02B4AC 8002A8AC 24020001 */ li $v0, 1 /* 02B4B0 8002A8B0 24080001 */ li $t0, 1 diff --git a/asm/non_matchings/unknown_0255E0/func_8002DE30.s b/asm/non_matchings/unknown_0255E0/func_8002DE30.s index 22c0e340..9dabff30 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002DE30.s +++ b/asm/non_matchings/unknown_0255E0/func_8002DE30.s @@ -210,7 +210,7 @@ glabel func_8002DE30 /* 02ED5C 8002E15C 8FAB0088 */ lw $t3, 0x88($sp) /* 02ED60 8002E160 1040000F */ beqz $v0, .L8002E1A0 /* 02ED64 8002E164 001EC880 */ sll $t9, $fp, 2 -/* 02ED68 8002E168 3C01800E */ lui $at, %hi(D_800DC884) #$at, 0x800e +/* 02ED68 8002E168 3C01800E */ lui $at, %hi(D_800DC884) # $at, 0x800e /* 02ED6C 8002E16C 00390821 */ addu $at, $at, $t9 /* 02ED70 8002E170 C42AC884 */ lwc1 $f10, %lo(D_800DC884)($at) /* 02ED74 8002E174 8EC20054 */ lw $v0, 0x54($s6) diff --git a/asm/non_matchings/unknown_0255E0/func_8002F2AC.s b/asm/non_matchings/unknown_0255E0/func_8002F2AC.s index 38e818b7..3b298371 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002F2AC.s +++ b/asm/non_matchings/unknown_0255E0/func_8002F2AC.s @@ -1,9 +1,9 @@ glabel func_8002F2AC /* 02FEAC 8002F2AC 3C038012 */ lui $v1, %hi(D_8011B118) # $v1, 0x8012 /* 02FEB0 8002F2B0 8C63B118 */ lw $v1, %lo(D_8011B118)($v1) -/* 02FEB4 8002F2B4 3C0E8012 */ lui $t6, 0x8012 +/* 02FEB4 8002F2B4 3C0E8012 */ lui $t6, %hi(D_8011B120) # $t6, 0x8012 /* 02FEB8 8002F2B8 18600028 */ blez $v1, .L8002F35C -/* 02FEBC 8002F2BC 25C4B120 */ addiu $a0, $t6, -0x4ee0 +/* 02FEBC 8002F2BC 25C4B120 */ addiu $a0, $t6, %lo(D_8011B120) /* 02FEC0 8002F2C0 00037900 */ sll $t7, $v1, 4 /* 02FEC4 8002F2C4 01E42821 */ addu $a1, $t7, $a0 /* 02FEC8 8002F2C8 24840010 */ addiu $a0, $a0, 0x10 diff --git a/asm/non_matchings/unknown_032760/func_8003833C.s b/asm/non_matchings/unknown_032760/func_8003833C.s index 9cf77047..fcbb2397 100644 --- a/asm/non_matchings/unknown_032760/func_8003833C.s +++ b/asm/non_matchings/unknown_032760/func_8003833C.s @@ -30,26 +30,26 @@ glabel func_8003833C /* 038FAC 800383AC 0C027B2E */ jal is_tt_unlocked /* 038FB0 800383B0 00000000 */ nop /* 038FB4 800383B4 10400005 */ beqz $v0, .L800383CC -/* 038FB8 800383B8 3C06800E */ lui $a2, 0x800e +/* 038FB8 800383B8 3C06800E */ lui $a2, %hi(D_800DCA58) # $a2, 0x800e /* 038FBC 800383BC 3C06800E */ lui $a2, %hi(D_800DCA70) # $a2, 0x800e /* 038FC0 800383C0 24C6CA70 */ addiu $a2, %lo(D_800DCA70) # addiu $a2, $a2, -0x3590 /* 038FC4 800383C4 1000000E */ b .L80038400 /* 038FC8 800383C8 2404000A */ li $a0, 10 .L800383CC: -/* 038FCC 800383CC 24C6CA58 */ addiu $a2, $a2, -0x35a8 +/* 038FCC 800383CC 24C6CA58 */ addiu $a2, %lo(D_800DCA58) # addiu $a2, $a2, -0x35a8 /* 038FD0 800383D0 1000000B */ b .L80038400 /* 038FD4 800383D4 24040009 */ li $a0, 9 .L800383D8: /* 038FD8 800383D8 0C027B2E */ jal is_tt_unlocked /* 038FDC 800383DC 00000000 */ nop /* 038FE0 800383E0 10400005 */ beqz $v0, .L800383F8 -/* 038FE4 800383E4 3C06800E */ lui $a2, 0x800e +/* 038FE4 800383E4 3C06800E */ lui $a2, %hi(D_800DCA50) # $a2, 0x800e /* 038FE8 800383E8 3C06800E */ lui $a2, %hi(D_800DCA64) # $a2, 0x800e /* 038FEC 800383EC 24C6CA64 */ addiu $a2, %lo(D_800DCA64) # addiu $a2, $a2, -0x359c /* 038FF0 800383F0 10000003 */ b .L80038400 /* 038FF4 800383F4 24040009 */ li $a0, 9 .L800383F8: -/* 038FF8 800383F8 24C6CA50 */ addiu $a2, $a2, -0x35b0 +/* 038FF8 800383F8 24C6CA50 */ addiu $a2, %lo(D_800DCA50) # addiu $a2, $a2, -0x35b0 /* 038FFC 800383FC 24040008 */ li $a0, 8 .L80038400: /* 039000 80038400 1880000E */ blez $a0, .L8003843C diff --git a/asm/non_matchings/unknown_043920/func_80043ECC.s b/asm/non_matchings/unknown_043920/func_80043ECC.s index 2d1c4ba7..bc15728a 100644 --- a/asm/non_matchings/unknown_043920/func_80043ECC.s +++ b/asm/non_matchings/unknown_043920/func_80043ECC.s @@ -16,7 +16,7 @@ glabel func_80043ECC /* 044B00 80043F00 8FA50024 */ lw $a1, 0x24($sp) /* 044B04 80043F04 00403025 */ move $a2, $v0 /* 044B08 80043F08 80AE01D3 */ lb $t6, 0x1d3($a1) -/* 044B0C 80043F0C 3C018012 */ lui $at, 0x8012 +/* 044B0C 80043F0C 3C018012 */ lui $at, %hi(D_8011D5BB) # $at, 0x8012 /* 044B10 80043F10 11C0001A */ beqz $t6, .L80043F7C /* 044B14 80043F14 2404000C */ li $a0, 12 /* 044B18 80043F18 3C0F8012 */ lui $t7, %hi(D_8011D5BB) # $t7, 0x8012 @@ -41,7 +41,7 @@ glabel func_80043ECC /* 044B60 80043F60 15C00016 */ bnez $t6, .L80043FBC /* 044B64 80043F64 3C0F8012 */ lui $t7, %hi(D_8011D5BA) # $t7, 0x8012 /* 044B68 80043F68 81EFD5BA */ lb $t7, %lo(D_8011D5BA)($t7) -/* 044B6C 80043F6C 3C018012 */ lui $at, %hi(D_8011D5BB) # $at, 0x8012 +/* 044B6C 80043F6C 3C018012 */ lui $at, %hi(D_8011D5BA) # $at, 0x8012 /* 044B70 80043F70 01F8C821 */ addu $t9, $t7, $t8 /* 044B74 80043F74 10000011 */ b .L80043FBC /* 044B78 80043F78 A039D5BA */ sb $t9, %lo(D_8011D5BA)($at) @@ -67,7 +67,7 @@ glabel func_80043ECC /* 044BBC 80043FBC 80AF0173 */ lb $t7, 0x173($a1) /* 044BC0 80043FC0 3C188012 */ lui $t8, %hi(D_8011D5BC) # $t8, 0x8012 /* 044BC4 80043FC4 11E00014 */ beqz $t7, .L80044018 -/* 044BC8 80043FC8 3C018012 */ lui $at, 0x8012 +/* 044BC8 80043FC8 3C018012 */ lui $at, %hi(D_8011D5BC) # $at, 0x8012 /* 044BCC 80043FCC 80A30174 */ lb $v1, 0x174($a1) /* 044BD0 80043FD0 8318D5BC */ lb $t8, %lo(D_8011D5BC)($t8) /* 044BD4 80043FD4 00000000 */ nop @@ -102,7 +102,7 @@ glabel func_80043ECC /* 044C3C 8004403C 11C00022 */ beqz $t6, .L800440C8 /* 044C40 80044040 00000000 */ nop /* 044C44 80044044 80AF0173 */ lb $t7, 0x173($a1) -/* 044C48 80044048 3C0A800E */ lui $t2, 0x800e +/* 044C48 80044048 3C0A800E */ lui $t2, %hi(D_800DCD90) # $t2, 0x800e /* 044C4C 8004404C 11E0001E */ beqz $t7, .L800440C8 /* 044C50 80044050 00000000 */ nop /* 044C54 80044054 80A30174 */ lb $v1, 0x174($a1) @@ -124,7 +124,7 @@ glabel func_80043ECC /* 044C90 80044090 00000000 */ nop /* 044C94 80044094 01445021 */ addu $t2, $t2, $a0 .L80044098: -/* 044C98 80044098 814ACD90 */ lb $t2, -0x3270($t2) +/* 044C98 80044098 814ACD90 */ lb $t2, %lo(D_800DCD90)($t2) /* 044C9C 8004409C 24010001 */ li $at, 1 /* 044CA0 800440A0 1541000A */ bne $t2, $at, .L800440CC /* 044CA4 800440A4 00C01025 */ move $v0, $a2 diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 7b9ebcee..5c5112fe 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -260,7 +260,7 @@ glabel func_8004447C /* 045440 80044840 00002825 */ move $a1, $zero .L80044844: /* 045444 80044844 11400006 */ beqz $t2, .L80044860 -/* 045448 80044848 3C0D8012 */ lui $t5, 0x8012 +/* 045448 80044848 3C0D8012 */ lui $t5, %hi(D_8011D58C) # $t5, 0x8012 /* 04544C 8004484C 240F0003 */ li $t7, 3 /* 045450 80044850 01E53023 */ subu $a2, $t7, $a1 /* 045454 80044854 0006CC00 */ sll $t9, $a2, 0x10 @@ -272,7 +272,7 @@ glabel func_8004447C /* 045468 80044868 01803025 */ move $a2, $t4 .L8004486C: /* 04546C 8004486C 01A66821 */ addu $t5, $t5, $a2 -/* 045470 80044870 81ADD58C */ lb $t5, -0x2a74($t5) +/* 045470 80044870 81ADD58C */ lb $t5, %lo(D_8011D58C)($t5) /* 045474 80044874 00000000 */ nop /* 045478 80044878 15A0002D */ bnez $t5, .L80044930 /* 04547C 8004487C 00000000 */ nop @@ -402,7 +402,7 @@ glabel func_8004447C /* 045658 80044A58 10000020 */ b .L80044ADC /* 04565C 80044A5C A61801C6 */ sh $t8, 0x1c6($s0) /* 045660 80044A60 820C0173 */ lb $t4, 0x173($s0) -/* 045664 80044A64 3C018012 */ lui $at, 0x8012 +/* 045664 80044A64 3C018012 */ lui $at, %hi(D_8011D58C) # $at, 0x8012 /* 045668 80044A68 11800005 */ beqz $t4, .L80044A80 /* 04566C 80044A6C 00000000 */ nop /* 045670 80044A70 860D01C6 */ lh $t5, 0x1c6($s0) @@ -414,7 +414,7 @@ glabel func_8004447C /* 045684 80044A84 A20501CD */ sb $a1, 0x1cd($s0) /* 045688 80044A88 002E0821 */ addu $at, $at, $t6 /* 04568C 80044A8C 10000013 */ b .L80044ADC -/* 045690 80044A90 A020D58C */ sb $zero, -0x2a74($at) +/* 045690 80044A90 A020D58C */ sb $zero, %lo(D_8011D58C)($at) /* 045694 80044A94 820F0002 */ lb $t7, 2($s0) /* 045698 80044A98 3C198012 */ lui $t9, %hi(D_8011D58C) # $t9, 0x8012 /* 04569C 80044A9C 032FC821 */ addu $t9, $t9, $t7 @@ -476,7 +476,7 @@ glabel func_8004447C /* 045764 80044B64 15A10005 */ bne $t5, $at, .L80044B7C /* 045768 80044B68 00000000 */ nop /* 04576C 80044B6C 820E01CF */ lb $t6, 0x1cf($s0) -/* 045770 80044B70 3C018012 */ lui $at, %hi(D_8011D58C) #$at, 0x8012 +/* 045770 80044B70 3C018012 */ lui $at, %hi(D_8011D58C) # $at, 0x8012 /* 045774 80044B74 002E0821 */ addu $at, $at, $t6 /* 045778 80044B78 A020D58C */ sb $zero, %lo(D_8011D58C)($at) .L80044B7C: @@ -586,7 +586,7 @@ glabel func_8004447C /* 0458F8 80044CF8 44803000 */ mtc1 $zero, $f6 /* 0458FC 80044CFC 460042A1 */ cvt.d.s $f10, $f8 /* 045900 80044D00 462A303C */ c.lt.d $f6, $f10 -/* 045904 80044D04 3C018012 */ lui $at, 0x8012 +/* 045904 80044D04 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 /* 045908 80044D08 45000005 */ bc1f .L80044D20 /* 04590C 80044D0C 240D4000 */ li $t5, 16384 /* 045910 80044D10 340CC000 */ li $t4, 49152 diff --git a/asm/non_matchings/unknown_043920/func_80045C48.s b/asm/non_matchings/unknown_043920/func_80045C48.s index 6e5b31dc..c34edc4f 100644 --- a/asm/non_matchings/unknown_043920/func_80045C48.s +++ b/asm/non_matchings/unknown_043920/func_80045C48.s @@ -538,7 +538,7 @@ glabel func_80045C48 /* 047028 80046428 10C10013 */ beq $a2, $at, .L80046478 /* 04702C 8004642C 24010005 */ li $at, 5 /* 047030 80046430 10C1001B */ beq $a2, $at, .L800464A0 -/* 047034 80046434 3C0D8012 */ lui $t5, 0x8012 +/* 047034 80046434 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 /* 047038 80046438 24010007 */ li $at, 7 /* 04703C 8004643C 10C10021 */ beq $a2, $at, .L800464C4 /* 047040 80046440 3C0F8012 */ lui $t7, %hi(D_8011D534) # $t7, 0x8012 @@ -568,7 +568,7 @@ glabel func_80045C48 /* 047098 80046498 10000016 */ b .L800464F4 /* 04709C 8004649C AC2CD534 */ sw $t4, %lo(D_8011D534)($at) .L800464A0: -/* 0470A0 800464A0 8DADD534 */ lw $t5, -0x2acc($t5) +/* 0470A0 800464A0 8DADD534 */ lw $t5, %lo(D_8011D534)($t5) /* 0470A4 800464A4 244E001F */ addiu $t6, $v0, 0x1f /* 0470A8 800464A8 01C4C007 */ srav $t8, $a0, $t6 /* 0470AC 800464AC 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_043920/func_8004C2B0.s b/asm/non_matchings/unknown_043920/func_8004C2B0.s index f6ff5a5c..d926beaa 100644 --- a/asm/non_matchings/unknown_043920/func_8004C2B0.s +++ b/asm/non_matchings/unknown_043920/func_8004C2B0.s @@ -94,10 +94,11 @@ glabel func_8004C2B0 /* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E655C)($at) /* 04D008 8004C408 46004021 */ cvt.d.s $f0, $f8 /* 04D00C 8004C40C 462A003C */ c.lt.d $f0, $f10 -/* 04D010 8004C410 3C01800E */ lui $at, 0x800e +/* 04D010 8004C410 3C01800E */ lui $at, %hi(D_800E6568) # $at, 0x800e /* 04D014 8004C414 45000009 */ bc1f .L8004C43C /* 04D018 8004C418 00000000 */ nop -/* 04D01C 8004C41C 3C01800E */ lui $at, %hi(D_800E6568) # $at, 0x800e +# Used to access D_800E6560 and D_800E6564. +/* 04D01C 8004C41C 3C01800E */ lui $at, %hi(D_800E6560) # $at, 0x800e /* 04D020 8004C420 C4256560 */ lwc1 $f5, %lo(D_800E6560)($at) /* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6564)($at) /* 04D028 8004C428 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 62008818..22c9006d 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -366,10 +366,12 @@ glabel func_8004F7F4 /* 05092C 8004FD2C 0C016420 */ jal func_80059080 /* 050930 8004FD30 27A700B0 */ addiu $a3, $sp, 0xb0 /* 050934 8004FD34 920C01F0 */ lbu $t4, 0x1f0($s0) -/* 050938 8004FD38 3C01800E */ lui $at, 0x800e +# Used to access D_800E6620 and D_800E6624. +/* 050938 8004FD38 3C01800E */ lui $at, %hi(D_800E6620) # $at, 0x800e /* 05093C 8004FD3C 1180000A */ beqz $t4, .L8004FD68 /* 050940 8004FD40 00000000 */ nop -/* 050944 8004FD44 3C01800E */ lui $at, %hi(D_800E6624) # $at, 0x800e +# Used to access D_800E6618 and D_800E661C. +/* 050944 8004FD44 3C01800E */ lui $at, %hi(D_800E6618) # $at, 0x800e /* 050948 8004FD48 C60600A8 */ lwc1 $f6, 0xa8($s0) /* 05094C 8004FD4C C4296618 */ lwc1 $f9, %lo(D_800E6618)($at) /* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E661C)($at) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index f7ef4218..df7030a4 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -747,7 +747,7 @@ glabel func_80050A28 /* 0520D4 800514D4 00000000 */ nop /* 0520D8 800514D8 46087380 */ add.s $f14, $f14, $f8 .L800514DC: -/* 0520DC 800514DC 3C01800E */ lui $at, %hi(D_800DCBE8) #$at, 0x800e +/* 0520DC 800514DC 3C01800E */ lui $at, %hi(D_800DCBE8) # $at, 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 diff --git a/asm/non_matchings/unknown_043920/func_80054110.s b/asm/non_matchings/unknown_043920/func_80054110.s index 9baab364..c96a31ce 100644 --- a/asm/non_matchings/unknown_043920/func_80054110.s +++ b/asm/non_matchings/unknown_043920/func_80054110.s @@ -117,10 +117,12 @@ glabel func_80054110 /* 054EC0 800542C0 0C016420 */ jal func_80059080 /* 054EC4 800542C4 27A700A0 */ addiu $a3, $sp, 0xa0 /* 054EC8 800542C8 920A01F0 */ lbu $t2, 0x1f0($s0) -/* 054ECC 800542CC 3C01800E */ lui $at, 0x800e +# Used to access D_800E67E0 and D_800E67E4. +/* 054ECC 800542CC 3C01800E */ lui $at, %hi(D_800E67E0) # $at, 0x800e /* 054ED0 800542D0 1140000A */ beqz $t2, .L800542FC /* 054ED4 800542D4 00000000 */ nop -/* 054ED8 800542D8 3C01800E */ lui $at, %hi(D_800E67E4) # $at, 0x800e +# Used to access D_800E67D8 and D_800E67DC. +/* 054ED8 800542D8 3C01800E */ lui $at, %hi(D_800E67D8) # $at, 0x800e /* 054EDC 800542DC C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 054EE0 800542E0 C42567D8 */ lwc1 $f5, %lo(D_800E67D8)($at) /* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67DC)($at) diff --git a/asm/non_matchings/unknown_043920/func_8005492C.s b/asm/non_matchings/unknown_043920/func_8005492C.s index 2ef2f02a..f2be331d 100644 --- a/asm/non_matchings/unknown_043920/func_8005492C.s +++ b/asm/non_matchings/unknown_043920/func_8005492C.s @@ -120,7 +120,7 @@ glabel func_8005492C /* 0556E8 80054AE8 10810008 */ beq $a0, $at, .L80054B0C /* 0556EC 80054AEC 46009006 */ mov.s $f0, $f18 /* 0556F0 80054AF0 00047080 */ sll $t6, $a0, 2 -/* 0556F4 80054AF4 3C01800E */ lui $at, %hi(D_800DCB9C) #$at, 0x800e +/* 0556F4 80054AF4 3C01800E */ lui $at, %hi(D_800DCB9C) # $at, 0x800e /* 0556F8 80054AF8 002E0821 */ addu $at, $at, $t6 /* 0556FC 80054AFC C426CB9C */ lwc1 $f6, %lo(D_800DCB9C)($at) /* 055700 80054B00 18800002 */ blez $a0, .L80054B0C diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index 47ebf5de..3b0c6d2d 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -966,15 +966,15 @@ glabel func_8005A6F0 /* 05C108 8005B508 C600008C */ lwc1 $f0, 0x8c($s0) /* 05C10C 8005B50C 44808000 */ mtc1 $zero, $f16 /* 05C110 8005B510 460E003E */ c.le.s $f0, $f14 -/* 05C114 8005B514 3C01800E */ lui $at, 0x800e +/* 05C114 8005B514 3C01800E */ lui $at, %hi(D_800E69AC) # $at, 0x800e /* 05C118 8005B518 45000005 */ bc1f .L8005B530 /* 05C11C 8005B51C 46007281 */ sub.s $f10, $f14, $f0 /* 05C120 8005B520 3C01800E */ lui $at, %hi(D_800E69A8) # $at, 0x800e /* 05C124 8005B524 C42269A8 */ lwc1 $f2, %lo(D_800E69A8)($at) /* 05C128 8005B528 10000004 */ b .L8005B53C -/* 05C12C 8005B52C 3C013FC0 */ lui $at, %hi(D_3FC069AC) # $at, 0x3fc0 +/* 05C12C 8005B52C 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 .L8005B530: -/* 05C130 8005B530 C42269AC */ lwc1 $f2, %lo(D_3FC069AC)($at) +/* 05C130 8005B530 C42269AC */ lwc1 $f2, %lo(D_800E69AC)($at) /* 05C134 8005B534 00000000 */ nop /* 05C138 8005B538 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 .L8005B53C: 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_80066CDC.s b/asm/non_matchings/unknown_066AA0/func_80066CDC.s index 352b7d17..6912cd3e 100644 --- a/asm/non_matchings/unknown_066AA0/func_80066CDC.s +++ b/asm/non_matchings/unknown_066AA0/func_80066CDC.s @@ -32,7 +32,7 @@ glabel func_80066CDC /* 067950 80066D50 3C1F8012 */ lui $ra, %hi(D_80120CE4) # $ra, 0x8012 /* 067954 80066D54 00024402 */ srl $t0, $v0, 0x10 /* 067958 80066D58 27FF0CE4 */ addiu $ra, %lo(D_80120CE4) # addiu $ra, $ra, 0xce4 -/* 06795C 80066D5C 3C038012 */ lui $v1, 0x8012 +/* 06795C 80066D5C 3C038012 */ lui $v1, %hi(D_80120CE0) # $v1, 0x8012 /* 067960 80066D60 00083842 */ srl $a3, $t0, 1 /* 067964 80066D64 0000C012 */ mflo $t8 /* 067968 80066D68 0158C821 */ addu $t9, $t2, $t8 @@ -142,7 +142,7 @@ glabel func_80066CDC /* 067B04 80066F04 100002C9 */ b .L80067A2C /* 067B08 80066F08 AFF80000 */ sw $t8, ($ra) .L80066F0C: -/* 067B0C 80066F0C 8C630CE0 */ lw $v1, 0xce0($v1) +/* 067B0C 80066F0C 8C630CE0 */ lw $v1, %lo(D_80120CE0)($v1) /* 067B10 80066F10 24040002 */ li $a0, 2 /* 067B14 80066F14 14640002 */ bne $v1, $a0, .L80066F20 /* 067B18 80066F18 3049FFFF */ andi $t1, $v0, 0xffff diff --git a/asm/non_matchings/unknown_066AA0/func_80067A3C.s b/asm/non_matchings/unknown_066AA0/func_80067A3C.s index 1a68b14f..659b8ed2 100644 --- a/asm/non_matchings/unknown_066AA0/func_80067A3C.s +++ b/asm/non_matchings/unknown_066AA0/func_80067A3C.s @@ -22,7 +22,7 @@ glabel func_80067A3C /* 068688 80067A88 106B0008 */ beq $v1, $t3, .L80067AAC /* 06868C 80067A8C 00E02025 */ move $a0, $a3 /* 068690 80067A90 106A0012 */ beq $v1, $t2, .L80067ADC -/* 068694 80067A94 3C0F8012 */ lui $t7, 0x8012 +/* 068694 80067A94 3C0F8012 */ lui $t7, %hi(D_80120CE4) # $t7, 0x8012 /* 068698 80067A98 240C0003 */ li $t4, 3 /* 06869C 80067A9C 106C001A */ beq $v1, $t4, .L80067B08 /* 0686A0 80067AA0 3C028012 */ lui $v0, %hi(D_80120CE4) # $v0, 0x8012 @@ -43,7 +43,7 @@ glabel func_80067A3C /* 0686D4 80067AD4 10000032 */ b .L80067BA0 /* 0686D8 80067AD8 00823823 */ subu $a3, $a0, $v0 .L80067ADC: -/* 0686DC 80067ADC 8DEF0CE4 */ lw $t7, 0xce4($t7) +/* 0686DC 80067ADC 8DEF0CE4 */ lw $t7, %lo(D_80120CE4)($t7) /* 0686E0 80067AE0 00051A03 */ sra $v1, $a1, 8 /* 0686E4 80067AE4 15E00005 */ bnez $t7, .L80067AFC /* 0686E8 80067AE8 00057043 */ sra $t6, $a1, 1 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 1cbedfec..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 @@ -251,7 +251,7 @@ glabel func_80068514 /* 0694E8 800688E8 25080D1C */ addiu $t0, %lo(D_80120D1C) # addiu $t0, $t0, 0xd1c /* 0694EC 800688EC 44CFF800 */ ctc1 $t7, $31 /* 0694F0 800688F0 44194000 */ mfc1 $t9, $f8 -/* 0694F4 800688F4 3C048012 */ lui $a0, 0x8012 +/* 0694F4 800688F4 3C048012 */ lui $a0, %hi(D_80120D70) # $a0, 0x8012 /* 0694F8 800688F8 444AF800 */ cfc1 $t2, $31 /* 0694FC 800688FC A4590002 */ sh $t9, 2($v0) /* 069500 80068900 35410003 */ ori $at, $t2, 3 @@ -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 @@ -321,7 +321,7 @@ glabel func_80068514 /* 0695F8 800689F8 AD0C0000 */ sw $t4, ($t0) /* 0695FC 800689FC 000C7080 */ sll $t6, $t4, 2 /* 069600 80068A00 008E2021 */ addu $a0, $a0, $t6 -/* 069604 80068A04 8C840D70 */ lw $a0, 0xd70($a0) +/* 069604 80068A04 8C840D70 */ lw $a0, %lo(D_80120D70)($a0) /* 069608 80068A08 8CE76174 */ lw $a3, %lo(D_80126174)($a3) /* 06960C 80068A0C 8E060008 */ lw $a2, 8($s0) /* 069610 80068A10 8FA50034 */ lw $a1, 0x34($sp) @@ -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 98482c30..1d16b73f 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068BF4.s +++ b/asm/non_matchings/unknown_066AA0/func_80068BF4.s @@ -72,7 +72,7 @@ glabel func_80068BF4 /* 06990C 80068D0C 25F80001 */ addiu $t8, $t7, 1 /* 069910 80068D10 AE980000 */ sw $t8, ($s4) /* 069914 80068D14 84F90000 */ lh $t9, ($a3) -/* 069918 80068D18 3C0E8012 */ lui $t6, 0x8012 +/* 069918 80068D18 3C0E8012 */ lui $t6, %hi(D_80120AC4) # $t6, 0x8012 /* 06991C 80068D1C 00194823 */ negu $t1, $t9 /* 069920 80068D20 A6490000 */ sh $t1, ($s2) /* 069924 80068D24 84EA0002 */ lh $t2, 2($a3) @@ -85,7 +85,7 @@ glabel func_80068BF4 /* 069940 80068D40 01AC6821 */ addu $t5, $t5, $t4 /* 069944 80068D44 000D6880 */ sll $t5, $t5, 2 /* 069948 80068D48 01CD7021 */ addu $t6, $t6, $t5 -/* 06994C 80068D4C 85CE0AC4 */ lh $t6, 0xac4($t6) +/* 06994C 80068D4C 85CE0AC4 */ lh $t6, %lo(D_80120AC4)($t6) /* 069950 80068D50 3C198012 */ lui $t9, %hi(D_80120D15) # $t9, 0x8012 /* 069954 80068D54 01CFC021 */ addu $t8, $t6, $t7 /* 069958 80068D58 A6580004 */ sh $t8, 4($s2) @@ -93,7 +93,7 @@ glabel func_80068BF4 /* 069960 80068D60 E6400010 */ swc1 $f0, 0x10($s2) /* 069964 80068D64 E6400014 */ swc1 $f0, 0x14($s2) /* 069968 80068D68 83390D15 */ lb $t9, %lo(D_80120D15)($t9) -/* 06996C 80068D6C 3C048012 */ lui $a0, 0x8012 +/* 06996C 80068D6C 3C048012 */ lui $a0, %hi(D_80121060) # $a0, 0x8012 /* 069970 80068D70 13200015 */ beqz $t9, .L80068DC8 /* 069974 80068D74 00000000 */ nop /* 069978 80068D78 C4E00008 */ lwc1 $f0, 8($a3) @@ -118,7 +118,7 @@ glabel func_80068BF4 /* 0699C4 80068DC4 02002025 */ move $a0, $s0 .L80068DC8: /* 0699C8 80068DC8 C6000008 */ lwc1 $f0, 8($s0) -/* 0699CC 80068DCC 24841060 */ addiu $a0, $a0, 0x1060 +/* 0699CC 80068DCC 24841060 */ addiu $a0, %lo(D_80121060) # addiu $a0, $a0, 0x1060 /* 0699D0 80068DD0 44050000 */ mfc1 $a1, $f0 /* 0699D4 80068DD4 44060000 */ mfc1 $a2, $f0 /* 0699D8 80068DD8 0C01C18E */ jal func_80070638 @@ -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..1cbe6152 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 @@ -173,7 +173,7 @@ glabel func_80069484 /* 06A324 80069724 C7B20044 */ lwc1 $f18, 0x44($sp) /* 06A328 80069728 25AE0001 */ addiu $t6, $t5, 1 /* 06A32C 8006972C 000E1080 */ sll $v0, $t6, 2 -/* 06A330 80069730 3C018012 */ lui $at, 0x8012 +/* 06A330 80069730 3C018012 */ lui $at, %hi(D_80120D28) # $at, 0x8012 /* 06A334 80069734 AC8E0000 */ sw $t6, ($a0) /* 06A338 80069738 00220821 */ addu $at, $at, $v0 /* 06A33C 8006973C 8FBF002C */ lw $ra, 0x2c($sp) @@ -185,16 +185,16 @@ glabel func_80069484 /* 06A354 80069754 C7A6004C */ lwc1 $f6, 0x4c($sp) /* 06A358 80069758 46009102 */ mul.s $f4, $f18, $f0 /* 06A35C 8006975C E7B00048 */ swc1 $f16, 0x48($sp) -/* 06A360 80069760 E4260D28 */ swc1 $f6, 0xd28($at) +/* 06A360 80069760 E4260D28 */ swc1 $f6, %lo(D_80120D28)($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_066AA0/func_80069F28.s b/asm/non_matchings/unknown_066AA0/func_80069F28.s index 301b3a39..f2628b53 100644 --- a/asm/non_matchings/unknown_066AA0/func_80069F28.s +++ b/asm/non_matchings/unknown_066AA0/func_80069F28.s @@ -1,9 +1,9 @@ glabel func_80069F28 /* 06AB28 80069F28 3C038012 */ lui $v1, %hi(D_80120CE0) # $v1, 0x8012 /* 06AB2C 80069F2C 8C630CE0 */ lw $v1, %lo(D_80120CE0)($v1) -/* 06AB30 80069F30 3C0E8012 */ lui $t6, 0x8012 +/* 06AB30 80069F30 3C0E8012 */ lui $t6, %hi(D_80120AC0) # $t6, 0x8012 /* 06AB34 80069F34 04600009 */ bltz $v1, .L80069F5C -/* 06AB38 80069F38 25C20AC0 */ addiu $v0, $t6, 0xac0 +/* 06AB38 80069F38 25C20AC0 */ addiu $v0, $t6, %lo(D_80120AC0) /* 06AB3C 80069F3C 00037900 */ sll $t7, $v1, 4 /* 06AB40 80069F40 01E37821 */ addu $t7, $t7, $v1 /* 06AB44 80069F44 000F7880 */ sll $t7, $t7, 2 diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6A0.s b/asm/non_matchings/unknown_066AA0/func_8006A6A0.s index c4e67141..14bebc4a 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6A0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6A0.s @@ -1,5 +1,5 @@ glabel func_8006A6A0 -/* 06B2A0 8006A6A0 3C01800E */ lui $at, %hi(D_800DD304) #$at, 0x800e +/* 06B2A0 8006A6A0 3C01800E */ lui $at, %hi(D_800DD304) # $at, 0x800e /* 06B2A4 8006A6A4 03E00008 */ jr $ra /* 06B2A8 8006A6A8 A420D304 */ sh $zero, %lo(D_800DD304)($at) diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s index 50b17141..a2e42e4b 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s @@ -343,13 +343,13 @@ glabel func_8006A6B0 /* 06B7B0 8006ABB0 27BD0058 */ addiu $sp, $sp, 0x58 /* 06B7B4 8006ABB4 04810003 */ bgez $a0, .L8006ABC4 -/* 06B7B8 8006ABB8 3C0E8012 */ lui $t6, 0x8012 +/* 06B7B8 8006ABB8 3C0E8012 */ lui $t6, %hi(D_80121170) # $t6, 0x8012 /* 06B7BC 8006ABBC 03E00008 */ jr $ra /* 06B7C0 8006ABC0 24020E10 */ li $v0, 3600 .L8006ABC4: -/* 06B7C4 8006ABC4 8DCE1170 */ lw $t6, 0x1170($t6) -/* 06B7C8 8006ABC8 3C0F8012 */ lui $t7, 0x8012 +/* 06B7C4 8006ABC4 8DCE1170 */ lw $t6, %lo(D_80121170)($t6) +/* 06B7C8 8006ABC8 3C0F8012 */ lui $t7, %hi(D_8012117C) # $t7, 0x8012 /* 06B7CC 8006ABCC 008E082A */ slt $at, $a0, $t6 /* 06B7D0 8006ABD0 14200003 */ bnez $at, .L8006ABE0 /* 06B7D4 8006ABD4 0004C080 */ sll $t8, $a0, 2 @@ -357,7 +357,7 @@ glabel func_8006A6B0 /* 06B7DC 8006ABDC 24020E10 */ li $v0, 3600 .L8006ABE0: -/* 06B7E0 8006ABE0 8DEF117C */ lw $t7, 0x117c($t7) +/* 06B7E0 8006ABE0 8DEF117C */ lw $t7, %lo(D_8012117C)($t7) /* 06B7E4 8006ABE4 0304C023 */ subu $t8, $t8, $a0 /* 06B7E8 8006ABE8 0018C040 */ sll $t8, $t8, 1 /* 06B7EC 8006ABEC 01F8C821 */ addu $t9, $t7, $t8 diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index 87bfa2d8..b64f9a41 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -171,10 +171,10 @@ glabel func_8006C60C /* 06D498 8006C898 1041000B */ beq $v0, $at, .L8006C8C8 /* 06D49C 8006C89C 00000000 */ nop /* 06D4A0 8006C8A0 10400012 */ beqz $v0, .L8006C8EC -/* 06D4A4 8006C8A4 3C04800E */ lui $a0, 0x800e +/* 06D4A4 8006C8A4 3C04800E */ lui $a0, %hi(D_800DD404) # $a0, 0x800e /* 06D4A8 8006C8A8 24010001 */ li $at, 1 /* 06D4AC 8006C8AC 1041000A */ beq $v0, $at, .L8006C8D8 -/* 06D4B0 8006C8B0 3C04800E */ lui $a0, 0x800e +/* 06D4B0 8006C8B0 3C04800E */ lui $a0, %hi(D_800DD404) # $a0, 0x800e /* 06D4B4 8006C8B4 24010005 */ li $at, 5 /* 06D4B8 8006C8B8 10410011 */ beq $v0, $at, .L8006C900 /* 06D4BC 8006C8BC 3C04800E */ lui $a0, %hi(D_800DD404) # $a0, 0x800e @@ -192,13 +192,13 @@ glabel func_8006C60C /* 06D4E4 8006C8E4 10000009 */ b .L8006C90C /* 06D4E8 8006C8E8 00000000 */ nop .L8006C8EC: -/* 06D4EC 8006C8EC 8C84D404 */ lw $a0, -0x2bfc($a0) +/* 06D4EC 8006C8EC 8C84D404 */ lw $a0, %lo(D_800DD404)($a0) /* 06D4F0 8006C8F0 0C01B33C */ jal func_8006CCF0 /* 06D4F4 8006C8F4 00000000 */ nop /* 06D4F8 8006C8F8 10000004 */ b .L8006C90C /* 06D4FC 8006C8FC 00000000 */ nop .L8006C900: -/* 06D500 8006C900 8C84D404 */ lw $a0, -0x2bfc($a0) +/* 06D500 8006C900 8C84D404 */ lw $a0, %lo(D_800DD404)($a0) /* 06D504 8006C904 0C02DDF5 */ jal func_800B77D4 /* 06D508 8006C908 00000000 */ nop .L8006C90C: diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index 80705520..58553169 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -461,7 +461,7 @@ glabel func_8006CCF0 /* 06DFB8 8006D3B8 00000000 */ nop /* 06DFBC 8006D3BC 3C028012 */ lui $v0, %hi(D_801234F4) # $v0, 0x8012 /* 06DFC0 8006D3C0 8C4234F4 */ lw $v0, %lo(D_801234F4)($v0) -/* 06DFC4 8006D3C4 3C018012 */ lui $at, 0x8012 +/* 06DFC4 8006D3C4 3C018012 */ lui $at, %hi(D_801234FC) # $at, 0x8012 /* 06DFC8 8006D3C8 0441001B */ bgez $v0, .L8006D438 /* 06DFCC 8006D3CC 240C0001 */ li $t4, 1 /* 06DFD0 8006D3D0 2401FFFF */ li $at, -1 @@ -543,7 +543,7 @@ glabel func_8006CCF0 /* 06E0E4 8006D4E4 8C4234F4 */ lw $v0, %lo(D_801234F4)($v0) /* 06E0E8 8006D4E8 240B0001 */ li $t3, 1 /* 06E0EC 8006D4EC 0441001B */ bgez $v0, .L8006D55C -/* 06E0F0 8006D4F0 3C018012 */ lui $at, 0x8012 +/* 06E0F0 8006D4F0 3C018012 */ lui $at, %hi(D_801234F8) # $at, 0x8012 /* 06E0F4 8006D4F4 2401FFFF */ li $at, -1 /* 06E0F8 8006D4F8 10410003 */ beq $v0, $at, .L8006D508 /* 06E0FC 8006D4FC 2401FFF6 */ li $at, -10 @@ -567,7 +567,7 @@ glabel func_8006CCF0 /* 06E13C 8006D53C 10000008 */ b .L8006D560 /* 06E140 8006D540 AC3934FC */ sw $t9, %lo(D_801234FC)($at) .L8006D544: -/* 06E144 8006D544 3C018012 */ lui $at, %hi(D_801234F8) # $at, 0x8012 +/* 06E144 8006D544 3C018012 */ lui $at, %hi(D_801234FC) # $at, 0x8012 /* 06E148 8006D548 240A0008 */ li $t2, 8 /* 06E14C 8006D54C 00008025 */ move $s0, $zero /* 06E150 8006D550 AC2934FC */ sw $t1, %lo(D_801234FC)($at) diff --git a/asm/non_matchings/unknown_071730/func_80071850.s b/asm/non_matchings/unknown_071730/func_80071850.s index 39c6e069..24625541 100644 --- a/asm/non_matchings/unknown_071730/func_80071850.s +++ b/asm/non_matchings/unknown_071730/func_80071850.s @@ -46,9 +46,9 @@ glabel func_80071850 /* 0724E4 800718E4 ACA0FFF0 */ sw $zero, -0x10($a1) /* 0724E8 800718E8 3C048012 */ lui $a0, %hi(D_801235C0) # $a0, 0x8012 /* 0724EC 800718EC 8C8435C0 */ lw $a0, %lo(D_801235C0)($a0) -/* 0724F0 800718F0 3C0E8012 */ lui $t6, 0x8012 +/* 0724F0 800718F0 3C0E8012 */ lui $t6, %hi(D_80123580) # $t6, 0x8012 /* 0724F4 800718F4 1880003B */ blez $a0, .L800719E4 -/* 0724F8 800718F8 25C53580 */ addiu $a1, $t6, 0x3580 +/* 0724F8 800718F8 25C53580 */ addiu $a1, $t6, %lo(D_80123580) /* 0724FC 800718FC 00047900 */ sll $t7, $a0, 4 /* 072500 80071900 01E55021 */ addu $t2, $t7, $a1 /* 072504 80071904 24100014 */ li $s0, 20 diff --git a/asm/non_matchings/unknown_071730/func_80071A24.s b/asm/non_matchings/unknown_071730/func_80071A24.s index 933950f2..18f8e610 100644 --- a/asm/non_matchings/unknown_071730/func_80071A24.s +++ b/asm/non_matchings/unknown_071730/func_80071A24.s @@ -157,9 +157,9 @@ glabel func_80071A24 /* 072874 80071C74 3C038012 */ lui $v1, %hi(D_801235C0) # $v1, 0x8012 /* 072878 80071C78 8C6335C0 */ lw $v1, %lo(D_801235C0)($v1) -/* 07287C 80071C7C 3C0E8012 */ lui $t6, 0x8012 +/* 07287C 80071C7C 3C0E8012 */ lui $t6, %hi(D_80123580) # $t6, 0x8012 /* 072880 80071C80 04600017 */ bltz $v1, .L80071CE0 -/* 072884 80071C84 25C43580 */ addiu $a0, $t6, 0x3580 +/* 072884 80071C84 25C43580 */ addiu $a0, $t6, %lo(D_80123580) /* 072888 80071C88 00037900 */ sll $t7, $v1, 4 /* 07288C 80071C8C 01E44021 */ addu $t0, $t7, $a0 /* 072890 80071C90 240C0014 */ li $t4, 20 diff --git a/asm/non_matchings/unknown_072E50/func_80073C5C.s b/asm/non_matchings/unknown_072E50/func_80073C5C.s index 7c88e3b1..d099c820 100644 --- a/asm/non_matchings/unknown_072E50/func_80073C5C.s +++ b/asm/non_matchings/unknown_072E50/func_80073C5C.s @@ -39,7 +39,7 @@ glabel func_80073C5C /* 0748EC 80073CEC 13000022 */ beqz $t8, .L80073D78 /* 0748F0 80073CF0 00000000 */ nop /* 0748F4 80073CF4 1736000B */ bne $t9, $s6, .L80073D24 -/* 0748F8 80073CF8 3C04800E */ lui $a0, 0x800e +/* 0748F8 80073CF8 3C04800E */ lui $a0, %hi(D_800E7660) # $a0, 0x800e /* 0748FC 80073CFC 0C033867 */ jal strlen /* 074900 80073D00 02E02025 */ move $a0, $s7 /* 074904 80073D04 8E040000 */ lw $a0, ($s0) @@ -52,7 +52,7 @@ glabel func_80073C5C /* 074920 80073D20 26100004 */ addiu $s0, $s0, 4 .L80073D24: /* 074924 80073D24 0C033867 */ jal strlen -/* 074928 80073D28 24847660 */ addiu $a0, $a0, 0x7660 +/* 074928 80073D28 24847660 */ addiu $a0, %lo(D_800E7660) # addiu $a0, $a0, 0x7660 /* 07492C 80073D2C 8E040000 */ lw $a0, ($s0) /* 074930 80073D30 3C05800E */ lui $a1, %hi(D_800E7650) # $a1, 0x800e /* 074934 80073D34 24A57650 */ addiu $a1, %lo(D_800E7650) # addiu $a1, $a1, 0x7650 diff --git a/asm/non_matchings/unknown_078050/func_80078190.s b/asm/non_matchings/unknown_078050/func_80078190.s index 3fddb3e4..d1907c02 100644 --- a/asm/non_matchings/unknown_078050/func_80078190.s +++ b/asm/non_matchings/unknown_078050/func_80078190.s @@ -428,7 +428,7 @@ glabel func_80078190 /* 0793E8 800787E8 03E00008 */ jr $ra /* 0793EC 800787EC AC28E4CC */ sw $t0, %lo(D_800DE4CC)($at) -/* 0793F0 800787F0 3C01800E */ lui $at, %hi(D_800DE4CC) #$at, 0x800e +/* 0793F0 800787F0 3C01800E */ lui $at, %hi(D_800DE4CC) # $at, 0x800e /* 0793F4 800787F4 03E00008 */ jr $ra /* 0793F8 800787F8 AC20E4CC */ sw $zero, %lo(D_800DE4CC)($at) diff --git a/asm/non_matchings/unknown_07AF10/func_8007A550.s b/asm/non_matchings/unknown_07AF10/func_8007A550.s index 9fd96b03..35120eb0 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A550.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A550.s @@ -86,8 +86,8 @@ glabel func_8007A550 /* 07B284 8007A684 24A56260 */ addiu $a1, %lo(D_80126260) # addiu $a1, $a1, 0x6260 /* 07B288 8007A688 0C01EAFF */ jal func_8007ABFC /* 07B28C 8007A68C 24060050 */ li $a2, 80 -/* 07B290 8007A690 3C058012 */ lui $a1, 0x8012 -/* 07B294 8007A694 24A46260 */ addiu $a0, $a1, 0x6260 +/* 07B290 8007A690 3C058012 */ lui $a1, %hi(D_80126260) # $a1, 0x8012 +/* 07B294 8007A694 24A46260 */ addiu $a0, $a1, %lo(D_80126260) /* 07B298 8007A698 24020500 */ li $v0, 1280 /* 07B29C 8007A69C 24190280 */ li $t9, 640 /* 07B2A0 8007A6A0 24080400 */ li $t0, 1024 @@ -114,8 +114,8 @@ glabel func_8007A550 /* 07B2EC 8007A6EC 24A56260 */ addiu $a1, %lo(D_80126260) # addiu $a1, $a1, 0x6260 /* 07B2F0 8007A6F0 0C01EAFF */ jal func_8007ABFC /* 07B2F4 8007A6F4 24060050 */ li $a2, 80 -/* 07B2F8 8007A6F8 3C058012 */ lui $a1, 0x8012 -/* 07B2FC 8007A6FC 24A46260 */ addiu $a0, $a1, 0x6260 +/* 07B2F8 8007A6F8 3C058012 */ lui $a1, %hi(D_80126260) # $a1, 0x8012 +/* 07B2FC 8007A6FC 24A46260 */ addiu $a0, $a1, %lo(D_80126260) /* 07B300 8007A700 24020500 */ li $v0, 1280 /* 07B304 8007A704 24090280 */ li $t1, 640 /* 07B308 8007A708 240A0400 */ li $t2, 1024 diff --git a/asm/non_matchings/unknown_07AF10/func_8007A98C.s b/asm/non_matchings/unknown_07AF10/func_8007A98C.s index 76eefa3c..f75eec43 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A98C.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A98C.s @@ -48,7 +48,7 @@ glabel func_8007A98C /* 07B634 8007AA34 02001825 */ move $v1, $s0 /* 07B638 8007AA38 0204082A */ slt $at, $s0, $a0 /* 07B63C 8007AA3C 10200012 */ beqz $at, .L8007AA88 -/* 07B640 8007AA40 3C068012 */ lui $a2, 0x8012 +/* 07B640 8007AA40 3C068012 */ lui $a2, %hi(0x80126308) # $a2, 0x8012 /* 07B644 8007AA44 3C068012 */ lui $a2, %hi(D_80126308) # $a2, 0x8012 /* 07B648 8007AA48 24C66308 */ addiu $a2, %lo(D_80126308) # addiu $a2, $a2, 0x6308 /* 07B64C 8007AA4C 90C50000 */ lbu $a1, ($a2) @@ -68,7 +68,7 @@ glabel func_8007A98C /* 07B680 8007AA80 1000000D */ b .L8007AAB8 /* 07B684 8007AA84 320400FF */ andi $a0, $s0, 0xff .L8007AA88: -/* 07B688 8007AA88 24C66308 */ addiu $a2, $a2, 0x6308 +/* 07B688 8007AA88 24C66308 */ addiu $a2, %lo(0x80126308) # addiu $a2, $a2, 0x6308 /* 07B68C 8007AA8C 0083082A */ slt $at, $a0, $v1 /* 07B690 8007AA90 10200009 */ beqz $at, .L8007AAB8 /* 07B694 8007AA94 A0C00000 */ sb $zero, ($a2) diff --git a/asm/non_matchings/unknown_07B870/func_8007B374.s b/asm/non_matchings/unknown_07B870/func_8007B374.s index 4fc5af7e..f05aff98 100644 --- a/asm/non_matchings/unknown_07B870/func_8007B374.s +++ b/asm/non_matchings/unknown_07B870/func_8007B374.s @@ -6,7 +6,7 @@ glabel func_8007B374 /* 07BF80 8007B380 04800006 */ bltz $a0, .L8007B39C /* 07BF84 8007B384 3C0E8012 */ lui $t6, %hi(D_80126330) # $t6, 0x8012 /* 07BF88 8007B388 8DCE6330 */ lw $t6, %lo(D_80126330)($t6) -/* 07BF8C 8007B38C 3C0F8012 */ lui $t7, 0x8012 +/* 07BF8C 8007B38C 3C0F8012 */ lui $t7, %hi(D_80126328) # $t7, 0x8012 /* 07BF90 8007B390 008E082A */ slt $at, $a0, $t6 /* 07BF94 8007B394 14200003 */ bnez $at, .L8007B3A4 /* 07BF98 8007B398 00000000 */ nop @@ -15,7 +15,7 @@ glabel func_8007B374 /* 07BFA0 8007B3A0 00001025 */ move $v0, $zero .L8007B3A4: -/* 07BFA4 8007B3A4 8DEF6328 */ lw $t7, 0x6328($t7) +/* 07BFA4 8007B3A4 8DEF6328 */ lw $t7, %lo(D_80126328)($t7) /* 07BFA8 8007B3A8 0004C8C0 */ sll $t9, $a0, 3 /* 07BFAC 8007B3AC 01F94021 */ addu $t0, $t7, $t9 /* 07BFB0 8007B3B0 8D030004 */ lw $v1, 4($t0) diff --git a/asm/non_matchings/unknown_07B870/func_8007C12C.s b/asm/non_matchings/unknown_07B870/func_8007C12C.s index 5173c29f..a36c423b 100644 --- a/asm/non_matchings/unknown_07B870/func_8007C12C.s +++ b/asm/non_matchings/unknown_07B870/func_8007C12C.s @@ -282,7 +282,7 @@ glabel func_8007C12C /* 07D12C 8007C52C 04800006 */ bltz $a0, .L8007C548 /* 07D130 8007C530 3C0E8012 */ lui $t6, %hi(D_80126358) # $t6, 0x8012 /* 07D134 8007C534 8DCE6358 */ lw $t6, %lo(D_80126358)($t6) -/* 07D138 8007C538 3C0F8012 */ lui $t7, 0x8012 +/* 07D138 8007C538 3C0F8012 */ lui $t7, %hi(D_8012634C) # $t7, 0x8012 /* 07D13C 8007C53C 008E082A */ slt $at, $a0, $t6 /* 07D140 8007C540 14200003 */ bnez $at, .L8007C550 /* 07D144 8007C544 00000000 */ nop @@ -291,7 +291,7 @@ glabel func_8007C12C /* 07D14C 8007C54C 00001025 */ move $v0, $zero .L8007C550: -/* 07D150 8007C550 8DEF634C */ lw $t7, 0x634c($t7) +/* 07D150 8007C550 8DEF634C */ lw $t7, %lo(D_8012634C)($t7) /* 07D154 8007C554 0004C8C0 */ sll $t9, $a0, 3 /* 07D158 8007C558 01F94021 */ addu $t0, $t7, $t9 /* 07D15C 8007C55C 8D030004 */ lw $v1, 4($t0) diff --git a/asm/non_matchings/unknown_07B870/func_8007C57C.s b/asm/non_matchings/unknown_07B870/func_8007C57C.s index a40f4aeb..b6a5062d 100644 --- a/asm/non_matchings/unknown_07B870/func_8007C57C.s +++ b/asm/non_matchings/unknown_07B870/func_8007C57C.s @@ -203,7 +203,7 @@ glabel func_8007C57C /* 07D460 8007C860 04800006 */ bltz $a0, .L8007C87C /* 07D464 8007C864 3C0E8012 */ lui $t6, %hi(D_80126330) # $t6, 0x8012 /* 07D468 8007C868 8DCE6330 */ lw $t6, %lo(D_80126330)($t6) -/* 07D46C 8007C86C 3C0F8012 */ lui $t7, 0x8012 +/* 07D46C 8007C86C 3C0F8012 */ lui $t7, %hi(D_80126328) # $t7, 0x8012 /* 07D470 8007C870 008E082A */ slt $at, $a0, $t6 /* 07D474 8007C874 14200003 */ bnez $at, .L8007C884 /* 07D478 8007C878 00000000 */ nop @@ -212,7 +212,7 @@ glabel func_8007C57C /* 07D480 8007C880 2402FFFF */ li $v0, -1 .L8007C884: -/* 07D484 8007C884 8DEF6328 */ lw $t7, 0x6328($t7) +/* 07D484 8007C884 8DEF6328 */ lw $t7, %lo(D_80126328)($t7) /* 07D488 8007C888 0004C8C0 */ sll $t9, $a0, 3 /* 07D48C 8007C88C 01F94021 */ addu $t0, $t7, $t9 /* 07D490 8007C890 8D020000 */ lw $v0, ($t0) @@ -223,7 +223,7 @@ glabel func_8007C57C /* 07D4A0 8007C8A0 04800006 */ bltz $a0, .L8007C8BC /* 07D4A4 8007C8A4 3C0E8012 */ lui $t6, %hi(D_80126358) # $t6, 0x8012 /* 07D4A8 8007C8A8 8DCE6358 */ lw $t6, %lo(D_80126358)($t6) -/* 07D4AC 8007C8AC 3C0F8012 */ lui $t7, 0x8012 +/* 07D4AC 8007C8AC 3C0F8012 */ lui $t7, %hi(D_8012634C) # $t7, 0x8012 /* 07D4B0 8007C8B0 008E082A */ slt $at, $a0, $t6 /* 07D4B4 8007C8B4 14200003 */ bnez $at, .L8007C8C4 /* 07D4B8 8007C8B8 00000000 */ nop @@ -232,7 +232,7 @@ glabel func_8007C57C /* 07D4C0 8007C8C0 2402FFFF */ li $v0, -1 .L8007C8C4: -/* 07D4C4 8007C8C4 8DEF634C */ lw $t7, 0x634c($t7) +/* 07D4C4 8007C8C4 8DEF634C */ lw $t7, %lo(D_8012634C)($t7) /* 07D4C8 8007C8C8 0004C8C0 */ sll $t9, $a0, 3 /* 07D4CC 8007C8CC 01F94021 */ addu $t0, $t7, $t9 /* 07D4D0 8007C8D0 8D020000 */ lw $v0, ($t0) diff --git a/asm/non_matchings/unknown_080500/D_8008F618.s b/asm/non_matchings/unknown_080500/D_8008F618.s index f0dc28c6..e4c4bd40 100644 --- a/asm/non_matchings/unknown_080500/D_8008F618.s +++ b/asm/non_matchings/unknown_080500/D_8008F618.s @@ -89,8 +89,8 @@ glabel D_8008F618 /* 090368 8008F768 240EFF00 */ li $t6, -256 /* 09036C 8008F76C 3C19FB00 */ lui $t9, 0xfb00 /* 090370 8008F770 3C068012 */ lui $a2, %hi(D_80126924) # $a2, 0x8012 -/* 090374 8008F774 3C11800E */ lui $s1, 0x800e -/* 090378 8008F778 3C12800E */ lui $s2, 0x800e +/* 090374 8008F774 3C11800E */ lui $s1, %hi(D_800E0968) # $s1, 0x800e +/* 090378 8008F778 3C12800E */ lui $s2, %hi(D_800E0970) # $s2, 0x800e /* 09037C 8008F77C 00007812 */ mflo $t7 /* 090380 8008F780 00EF3823 */ subu $a3, $a3, $t7 /* 090384 8008F784 240FFFFF */ li $t7, -1 @@ -106,8 +106,8 @@ glabel D_8008F618 /* 0903AC 8008F7AC 00067880 */ sll $t7, $a2, 2 /* 0903B0 8008F7B0 022F8821 */ addu $s1, $s1, $t7 /* 0903B4 8008F7B4 024F9021 */ addu $s2, $s2, $t7 -/* 0903B8 8008F7B8 8E310968 */ lw $s1, 0x968($s1) -/* 0903BC 8008F7BC 8E520970 */ lw $s2, 0x970($s2) +/* 0903B8 8008F7B8 8E310968 */ lw $s1, %lo(D_800E0968)($s1) +/* 0903BC 8008F7BC 8E520970 */ lw $s2, %lo(D_800E0970)($s2) /* 0903C0 8008F7C0 0317082A */ slt $at, $t8, $s7 /* 0903C4 8008F7C4 10200008 */ beqz $at, .L8008F7E8 /* 0903C8 8008F7C8 00001825 */ move $v1, $zero @@ -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/MenuAudioOptionsLoop.s b/asm/non_matchings/unknown_080500/MenuAudioOptionsLoop.s index 2025bb1b..b3a1c9a5 100644 --- a/asm/non_matchings/unknown_080500/MenuAudioOptionsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuAudioOptionsLoop.s @@ -159,7 +159,7 @@ glabel MenuAudioOptionsLoop /* 085AB4 80084EB4 1100001F */ beqz $t0, .L80084F34 /* 085AB8 80084EB8 00000000 */ nop /* 085ABC 80084EBC 05010008 */ bgez $t0, .L80084EE0 -/* 085AC0 80084EC0 3C02800E */ lui $v0, 0x800e +/* 085AC0 80084EC0 3C02800E */ lui $v0, %hi(D_800DFAC8) # $v0, 0x800e /* 085AC4 80084EC4 3C02800E */ lui $v0, %hi(D_800DFAC8) # $v0, 0x800e /* 085AC8 80084EC8 2442FAC8 */ addiu $v0, %lo(D_800DFAC8) # addiu $v0, $v0, -0x538 /* 085ACC 80084ECC 8C590000 */ lw $t9, ($v0) @@ -168,7 +168,7 @@ glabel MenuAudioOptionsLoop /* 085AD8 80084ED8 10000006 */ b .L80084EF4 /* 085ADC 80084EDC AC4A0000 */ sw $t2, ($v0) .L80084EE0: -/* 085AE0 80084EE0 2442FAC8 */ addiu $v0, $v0, -0x538 +/* 085AE0 80084EE0 2442FAC8 */ addiu $v0, %lo(D_800DFAC8) # addiu $v0, $v0, -0x538 /* 085AE4 80084EE4 8C4C0000 */ lw $t4, ($v0) /* 085AE8 80084EE8 00000000 */ nop /* 085AEC 80084EEC 258B0001 */ addiu $t3, $t4, 1 @@ -323,7 +323,7 @@ glabel MenuAudioOptionsLoop /* 085D04 80085104 85AD6C46 */ lh $t5, %lo(D_80126C46)($t5) /* 085D08 80085108 24010001 */ li $at, 1 /* 085D0C 8008510C 15A1000B */ bne $t5, $at, .L8008513C -/* 085D10 80085110 3C058012 */ lui $a1, 0x8012 +/* 085D10 80085110 3C058012 */ lui $a1, %hi(D_801269FC) # $a1, 0x8012 /* 085D14 80085114 3C058012 */ lui $a1, %hi(D_801269FC) # $a1, 0x8012 /* 085D18 80085118 24A569FC */ addiu $a1, %lo(D_801269FC) # addiu $a1, $a1, 0x69fc /* 085D1C 8008511C 8CAE0000 */ lw $t6, ($a1) @@ -335,7 +335,7 @@ glabel MenuAudioOptionsLoop /* 085D34 80085134 10000009 */ b .L8008515C /* 085D38 80085138 8FAF0030 */ lw $t7, 0x30($sp) .L8008513C: -/* 085D3C 8008513C 24A569FC */ addiu $a1, $a1, 0x69fc +/* 085D3C 8008513C 24A569FC */ addiu $a1, %lo(D_801269FC) # addiu $a1, $a1, 0x69fc /* 085D40 80085140 8CA40000 */ lw $a0, ($a1) /* 085D44 80085144 00000000 */ nop /* 085D48 80085148 10800004 */ beqz $a0, .L8008515C diff --git a/asm/non_matchings/unknown_080500/MenuBootLoop.s b/asm/non_matchings/unknown_080500/MenuBootLoop.s index a4dfaed1..01220f59 100644 --- a/asm/non_matchings/unknown_080500/MenuBootLoop.s +++ b/asm/non_matchings/unknown_080500/MenuBootLoop.s @@ -13,7 +13,7 @@ glabel menu_boot_loop /* 089234 80088634 8C426C20 */ lw $v0, %lo(D_80126C20)($v0) /* 089238 80088638 00603825 */ move $a3, $v1 /* 08923C 8008863C 10400009 */ beqz $v0, .L80088664 -/* 089240 80088640 3C038012 */ lui $v1, 0x8012 +/* 089240 80088640 3C038012 */ lui $v1, %hi(D_80126C18) # $v1, 0x8012 /* 089244 80088644 24010001 */ li $at, 1 /* 089248 80088648 10410019 */ beq $v0, $at, .L800886B0 /* 08924C 8008864C 3C038012 */ lui $v1, %hi(D_80126C18) # $v1, 0x8012 @@ -44,7 +44,7 @@ glabel menu_boot_loop /* 0892A8 800886A8 1000002F */ b .L80088768 /* 0892AC 800886AC AC286C20 */ sw $t0, %lo(D_80126C20)($at) .L800886B0: -/* 0892B0 800886B0 24636C18 */ addiu $v1, $v1, 0x6c18 +/* 0892B0 800886B0 24636C18 */ addiu $v1, $v1, %lo(D_80126C18) /* 0892B4 800886B4 8C620000 */ lw $v0, ($v1) /* 0892B8 800886B8 00000000 */ nop /* 0892BC 800886BC 2841008C */ slti $at, $v0, 0x8c diff --git a/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s b/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s index 5a003899..5c9c47a6 100644 --- a/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s +++ b/asm/non_matchings/unknown_080500/MenuCharacterSelectInit.s @@ -15,7 +15,7 @@ glabel MenuCharacterSelectInit /* 08BC00 8008B000 0C027B2E */ jal is_tt_unlocked /* 08BC04 8008B004 00000000 */ nop /* 08BC08 8008B008 10400007 */ beqz $v0, .L8008B028 -/* 08BC0C 8008B00C 3C078012 */ lui $a3, 0x8012 +/* 08BC0C 8008B00C 3C078012 */ lui $a3, %hi(D_801263CC) # $a3, 0x8012 /* 08BC10 8008B010 3C078012 */ lui $a3, %hi(D_801263CC) # $a3, 0x8012 /* 08BC14 8008B014 3C0E800E */ lui $t6, %hi(D_800DFF40) # $t6, 0x800e /* 08BC18 8008B018 24E763CC */ addiu $a3, %lo(D_801263CC) # addiu $a3, $a3, 0x63cc @@ -24,7 +24,7 @@ glabel MenuCharacterSelectInit /* 08BC24 8008B024 ACEE0000 */ sw $t6, ($a3) .L8008B028: /* 08BC28 8008B028 3C0F800E */ lui $t7, %hi(D_800DFE40) # $t7, 0x800e -/* 08BC2C 8008B02C 24E763CC */ addiu $a3, $a3, 0x63cc +/* 08BC2C 8008B02C 24E763CC */ addiu $a3, %lo(D_801263CC) # addiu $a3, $a3, 0x63cc /* 08BC30 8008B030 25EFFE40 */ addiu $t7, %lo(D_800DFE40) # addiu $t7, $t7, -0x1c0 /* 08BC34 8008B034 1000000F */ b .L8008B074 /* 08BC38 8008B038 ACEF0000 */ sw $t7, ($a3) diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s index fe2c3088..54146090 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s @@ -51,7 +51,7 @@ glabel MenuFileSelectLoop /* 08D470 8008C870 3C0B8012 */ lui $t3, %hi(D_801263E0) # $t3, 0x8012 /* 08D474 8008C874 8D6B63E0 */ lw $t3, %lo(D_801263E0)($t3) /* 08D478 8008C878 8C42F460 */ lw $v0, %lo(D_800DF460)($v0) -/* 08D47C 8008C87C 3C01800E */ lui $at, 0x800e +/* 08D47C 8008C87C 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08D480 8008C880 1562000F */ bne $t3, $v0, .L8008C8C0 /* 08D484 8008C884 00002025 */ move $a0, $zero /* 08D488 8008C888 0C0002CA */ jal func_80000B28 diff --git a/asm/non_matchings/unknown_080500/MenuGameSelectInit.s b/asm/non_matchings/unknown_080500/MenuGameSelectInit.s index 32e16d10..db16ebf4 100644 --- a/asm/non_matchings/unknown_080500/MenuGameSelectInit.s +++ b/asm/non_matchings/unknown_080500/MenuGameSelectInit.s @@ -62,7 +62,7 @@ glabel MenuGameSelectInit /* 08D1F0 8008C5F0 0C027B18 */ jal func_8009EC60 /* 08D1F4 8008C5F4 00000000 */ nop /* 08D1F8 8008C5F8 10400009 */ beqz $v0, .L8008C620 -/* 08D1FC 8008C5FC 3C038012 */ lui $v1, 0x8012 +/* 08D1FC 8008C5FC 3C038012 */ lui $v1, %hi(D_80126460) # $v1, 0x8012 /* 08D200 8008C600 3C038012 */ lui $v1, %hi(D_80126460) # $v1, 0x8012 /* 08D204 8008C604 3C08800E */ lui $t0, %hi(D_800E0278) # $t0, 0x800e /* 08D208 8008C608 24636460 */ addiu $v1, %lo(D_80126460) # addiu $v1, $v1, 0x6460 @@ -73,7 +73,7 @@ glabel MenuGameSelectInit /* 08D21C 8008C61C AE890000 */ sw $t1, ($s4) .L8008C620: /* 08D220 8008C620 3C0A800E */ lui $t2, %hi(D_800E0198) # $t2, 0x800e -/* 08D224 8008C624 24636460 */ addiu $v1, $v1, 0x6460 +/* 08D224 8008C624 24636460 */ addiu $v1, %lo(D_80126460) # addiu $v1, $v1, 0x6460 /* 08D228 8008C628 254A0198 */ addiu $t2, %lo(D_800E0198) # addiu $t2, $t2, 0x198 /* 08D22C 8008C62C 240B0001 */ li $t3, 1 /* 08D230 8008C630 AC6A0000 */ sw $t2, ($v1) diff --git a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s index 3f7e0080..d76e05d6 100644 --- a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s @@ -362,7 +362,7 @@ glabel MenuGameSelectLoop /* 08EFBC 8008E3BC 00001025 */ move $v0, $zero .L8008E3C0: /* 08EFC0 8008E3C0 8C580010 */ lw $t8, 0x10($v0) -/* 08EFC4 8008E3C4 3C01800E */ lui $at, 0x800e +/* 08EFC4 8008E3C4 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08EFC8 8008E3C8 33190004 */ andi $t9, $t8, 4 /* 08EFCC 8008E3CC 13200005 */ beqz $t9, .L8008E3E4 /* 08EFD0 8008E3D0 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e 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/MenuLoadNewAreaLoop.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s index 87c790ad..09750dd8 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s @@ -148,7 +148,7 @@ glabel MenuLoadNewAreaLoop /* 094420 80093820 15A00004 */ bnez $t5, .L80093834 /* 094424 80093824 8FAF0028 */ lw $t7, 0x28($sp) /* 094428 80093828 11C0000E */ beqz $t6, .L80093864 -/* 09442C 8009382C 3C018012 */ lui $at, 0x8012 +/* 09442C 8009382C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 094430 80093830 8FAF0028 */ lw $t7, 0x28($sp) .L80093834: /* 094434 80093834 00000000 */ nop @@ -161,12 +161,12 @@ glabel MenuLoadNewAreaLoop /* 09444C 8009384C 0C030076 */ jal func_800C01D8 /* 094450 80093850 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 094454 80093854 2418FFFF */ li $t8, -1 -/* 094458 80093858 3C01800E */ lui $at, %hi(D_800E63E0) # $at, 0x800e +/* 094458 80093858 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e /* 09445C 8009385C 10000064 */ b .L800939F0 /* 094460 80093860 AC38F47C */ sw $t8, %lo(D_800DF47C)($at) .L80093864: /* 094464 80093864 10000062 */ b .L800939F0 -/* 094468 80093868 AC2063E0 */ sw $zero, %lo(D_800E63E0)($at) +/* 094468 80093868 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) .L8009386C: /* 09446C 8009386C 3C028012 */ lui $v0, %hi(D_801267D8) # $v0, 0x8012 /* 094470 80093870 8C4267D8 */ lw $v0, %lo(D_801267D8)($v0) diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s index c8ff0060..0976b421 100644 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s +++ b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s @@ -215,7 +215,7 @@ glabel MenuMagicCodesLoop /* 08ABE8 80089FE8 244F0001 */ addiu $t7, $v0, 1 /* 08ABEC 80089FEC A4CF0000 */ sh $t7, ($a2) /* 08ABF0 80089FF0 84D80000 */ lh $t8, ($a2) -/* 08ABF4 80089FF4 3C018012 */ lui $at, %hi(D_80126C58) #$at, 0x8012 +/* 08ABF4 80089FF4 3C018012 */ lui $at, %hi(D_80126C58) # $at, 0x8012 /* 08ABF8 80089FF8 00380821 */ addu $at, $at, $t8 /* 08ABFC 80089FFC A0206C58 */ sb $zero, %lo(D_80126C58)($at) .L8008A000: @@ -253,7 +253,7 @@ glabel MenuMagicCodesLoop /* 08AC70 8008A070 244FFFFF */ addiu $t7, $v0, -1 /* 08AC74 8008A074 A4CF0000 */ sh $t7, ($a2) /* 08AC78 8008A078 84D80000 */ lh $t8, ($a2) -/* 08AC7C 8008A07C 3C018012 */ lui $at, %hi(D_80126C58) #$at, 0x8012 +/* 08AC7C 8008A07C 3C018012 */ lui $at, %hi(D_80126C58) # $at, 0x8012 /* 08AC80 8008A080 00380821 */ addu $at, $at, $t8 /* 08AC84 8008A084 A0206C58 */ sb $zero, %lo(D_80126C58)($at) .L8008A088: diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s index 5d0fff27..45cb9352 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s @@ -74,7 +74,7 @@ glabel MenuTitleScreenLoop /* 0846F0 80083AF0 84E30000 */ lh $v1, ($a3) /* 0846F4 80083AF4 00003025 */ move $a2, $zero /* 0846F8 80083AF8 1860001D */ blez $v1, .L80083B70 -/* 0846FC 80083AFC 3C02800E */ lui $v0, 0x800e +/* 0846FC 80083AFC 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e /* 084700 80083B00 8FAC0030 */ lw $t4, 0x30($sp) /* 084704 80083B04 00000000 */ nop /* 084708 80083B08 006C6823 */ subu $t5, $v1, $t4 @@ -106,7 +106,7 @@ glabel MenuTitleScreenLoop /* 08476C 80083B6C 24060001 */ li $a2, 1 .L80083B70: /* 084770 80083B70 A4E00000 */ sh $zero, ($a3) -/* 084774 80083B74 8C42F47C */ lw $v0, -0xb84($v0) +/* 084774 80083B74 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) /* 084778 80083B78 00000000 */ nop .L80083B7C: /* 08477C 80083B7C 1440003F */ bnez $v0, .L80083C7C @@ -230,7 +230,7 @@ glabel MenuTitleScreenLoop /* 084938 80083D38 C4400000 */ lwc1 $f0, ($v0) /* 08493C 80083D3C 3C0F8012 */ lui $t7, %hi(D_801263E0) # $t7, 0x8012 /* 084940 80083D40 4600303C */ c.lt.s $f6, $f0 -/* 084944 80083D44 3C01800F */ lui $at, 0x800f +/* 084944 80083D44 3C01800F */ lui $at, %hi(D_800E83B4) # $at, 0x800f /* 084948 80083D48 4500000D */ bc1f .L80083D80 /* 08494C 80083D4C 00000000 */ nop /* 084950 80083D50 8DEF63E0 */ lw $t7, %lo(D_801263E0)($t7) @@ -240,13 +240,13 @@ glabel MenuTitleScreenLoop /* 084960 80083D60 0C000741 */ jal func_80001D04 /* 084964 80083D64 00002825 */ move $a1, $zero /* 084968 80083D68 24180001 */ li $t8, 1 -/* 08496C 80083D6C 3C018012 */ lui $at, %hi(D_801183B4) # $at, 0x8012 +/* 08496C 80083D6C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 084970 80083D70 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 /* 084974 80083D74 2463686C */ addiu $v1, %lo(D_8012686C) # addiu $v1, $v1, 0x686c /* 084978 80083D78 10000012 */ b .L80083DC4 /* 08497C 80083D7C AC3863E0 */ sw $t8, %lo(D_801263E0)($at) .L80083D80: -/* 084980 80083D80 C42883B4 */ lwc1 $f8, %lo(D_801183B4)($at) +/* 084980 80083D80 C42883B4 */ lwc1 $f8, %lo(D_800E83B4)($at) /* 084984 80083D84 3C198012 */ lui $t9, %hi(D_801263E0) # $t9, 0x8012 /* 084988 80083D88 4600403C */ c.lt.s $f8, $f0 /* 08498C 80083D8C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s index 29c3d245..c8d8d8be 100644 --- a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s @@ -545,7 +545,7 @@ glabel MenuTrackSelectInit /* 08FBCC 8008EFCC 8D6B0410 */ lw $t3, %lo(D_800E0410)($t3) /* 08FBD0 8008EFD0 8FBF0044 */ lw $ra, 0x44($sp) /* 08FBD4 8008EFD4 AC2CF494 */ sw $t4, %lo(gIsInAdventureTwo)($at) -/* 08FBD8 8008EFD8 3C018012 */ lui $at, 0x8012 +/* 08FBD8 8008EFD8 3C018012 */ lui $at, %hi(D_80126548) # $at, 0x8012 /* 08FBDC 8008EFDC 8FB00020 */ lw $s0, 0x20($sp) /* 08FBE0 8008EFE0 8FB10024 */ lw $s1, 0x24($sp) /* 08FBE4 8008EFE4 8FB20028 */ lw $s2, 0x28($sp) @@ -557,5 +557,5 @@ glabel MenuTrackSelectInit /* 08FBFC 8008EFFC 8FBE0040 */ lw $fp, 0x40($sp) /* 08FC00 8008F000 27BD0080 */ addiu $sp, $sp, 0x80 /* 08FC04 8008F004 03E00008 */ jr $ra -/* 08FC08 8008F008 AC2B6548 */ sw $t3, 0x6548($at) +/* 08FC08 8008F008 AC2B6548 */ sw $t3, %lo(D_80126548)($at) diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s index c8cfe689..218069f6 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s @@ -52,7 +52,7 @@ glabel MenuTrophyRaceRankingsInit .L80098AE8: /* 0996E8 80098AE8 28410004 */ slti $at, $v0, 4 /* 0996EC 80098AEC 1020000D */ beqz $at, .L80098B24 -/* 0996F0 80098AF0 3C038012 */ lui $v1, 0x8012 +/* 0996F0 80098AF0 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 0996F4 80098AF4 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e /* 0996F8 80098AF8 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) /* 0996FC 80098AFC 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 @@ -68,7 +68,7 @@ glabel MenuTrophyRaceRankingsInit .L80098B24: /* 099724 80098B24 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e /* 099728 80098B28 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) -/* 09972C 80098B2C 24636BF0 */ addiu $v1, $v1, 0x6bf0 +/* 09972C 80098B2C 24636BF0 */ addiu $v1, %lo(D_80126BF0) # addiu $v1, $v1, 0x6bf0 /* 099730 80098B30 8DAE0244 */ lw $t6, 0x244($t5) /* 099734 80098B34 240F0001 */ li $t7, 1 /* 099738 80098B38 3C018012 */ lui $at, %hi(D_80126C14) # $at, 0x8012 @@ -153,8 +153,8 @@ glabel MenuTrophyRaceRankingsInit /* 09984C 80098C4C 00004025 */ move $t0, $zero .L80098C50: /* 099850 80098C50 18A00011 */ blez $a1, .L80098C98 -/* 099854 80098C54 3C188012 */ lui $t8, 0x8012 -/* 099858 80098C58 270263F8 */ addiu $v0, $t8, 0x63f8 +/* 099854 80098C54 3C188012 */ lui $t8, %hi(D_801263F8) # $t8, 0x8012 +/* 099858 80098C58 270263F8 */ addiu $v0, $t8, %lo(D_801263F8) /* 09985C 80098C5C 0005C880 */ sll $t9, $a1, 2 /* 099860 80098C60 3C04800E */ lui $a0, %hi(D_800E1004) # $a0, 0x800e /* 099864 80098C64 24841004 */ addiu $a0, %lo(D_800E1004) # addiu $a0, $a0, 0x1004 @@ -282,8 +282,8 @@ glabel MenuTrophyRaceRankingsInit /* 099A14 80098E14 3C048012 */ lui $a0, %hi(D_80126430) # $a0, 0x8012 /* 099A18 80098E18 18A00010 */ blez $a1, .L80098E5C /* 099A1C 80098E1C 24846430 */ addiu $a0, %lo(D_80126430) # addiu $a0, $a0, 0x6430 -/* 099A20 80098E20 3C0F8012 */ lui $t7, 0x8012 -/* 099A24 80098E24 25E26420 */ addiu $v0, $t7, 0x6420 +/* 099A20 80098E20 3C0F8012 */ lui $t7, %hi(D_80126420) # $t7, 0x8012 +/* 099A24 80098E24 25E26420 */ addiu $v0, $t7, %lo(D_80126420) /* 099A28 80098E28 00A21821 */ addu $v1, $a1, $v0 .L80098E2C: /* 099A2C 80098E2C 90990000 */ lbu $t9, ($a0) 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_80080580.s b/asm/non_matchings/unknown_080500/func_80080580.s index 9b0712be..8dd1e4dd 100644 --- a/asm/non_matchings/unknown_080500/func_80080580.s +++ b/asm/non_matchings/unknown_080500/func_80080580.s @@ -258,7 +258,7 @@ glabel func_80080580 /* 081570 80080970 1420FFC3 */ bnez $at, .L80080880 /* 081574 80080974 00000000 */ nop /* 081578 80080978 12E0007B */ beqz $s7, .L80080B68 -/* 08157C 8008097C 3C0E8012 */ lui $t6, 0x8012 +/* 08157C 8008097C 3C0E8012 */ lui $t6, %hi(D_80126C2C) # $t6, 0x8012 /* 081580 80080980 3C088012 */ lui $t0, %hi(D_80126C2C) # $t0, 0x8012 /* 081584 80080984 8FCE0000 */ lw $t6, ($fp) /* 081588 80080988 25086C2C */ addiu $t0, %lo(D_80126C2C) # addiu $t0, $t0, 0x6c2c @@ -385,7 +385,7 @@ glabel func_80080580 /* 081764 80080B64 8FD80000 */ lw $t8, ($fp) .L80080B68: /* 081768 80080B68 8FD80000 */ lw $t8, ($fp) -/* 08176C 80080B6C 8DCE6C2C */ lw $t6, 0x6c2c($t6) +/* 08176C 80080B6C 8DCE6C2C */ lw $t6, %lo(D_80126C2C)($t6) /* 081770 80080B70 00187940 */ sll $t7, $t8, 5 /* 081774 80080B74 3C18800E */ lui $t8, %hi(D_800E1DB4) # $t8, 0x800e /* 081778 80080B78 8F181DB4 */ lw $t8, %lo(D_800E1DB4)($t8) diff --git a/asm/non_matchings/unknown_080500/func_80081F4C.s b/asm/non_matchings/unknown_080500/func_80081F4C.s index 792b186a..d0ab7e35 100644 --- a/asm/non_matchings/unknown_080500/func_80081F4C.s +++ b/asm/non_matchings/unknown_080500/func_80081F4C.s @@ -55,7 +55,7 @@ glabel func_80081F4C /* 082C14 80082014 10E00007 */ beqz $a3, .L80082034 /* 082C18 80082018 00E01025 */ move $v0, $a3 /* 082C1C 8008201C 1053001D */ beq $v0, $s3, .L80082094 -/* 082C20 80082020 3C038012 */ lui $v1, 0x8012 +/* 082C20 80082020 3C038012 */ lui $v1, %hi(D_8012685C) # $v1, 0x8012 /* 082C24 80082024 10540044 */ beq $v0, $s4, .L80082138 /* 082C28 80082028 32399000 */ andi $t9, $s1, 0x9000 /* 082C2C 8008202C 10000054 */ b .L80082180 @@ -88,7 +88,7 @@ glabel func_80081F4C /* 082C8C 8008208C 1000003B */ b .L8008217C /* 082C90 80082090 460A3503 */ div.s $f20, $f6, $f10 .L80082094: -/* 082C94 80082094 8C63685C */ lw $v1, 0x685c($v1) +/* 082C94 80082094 8C63685C */ lw $v1, %lo(D_8012685C)($v1) /* 082C98 80082098 32229000 */ andi $v0, $s1, 0x9000 /* 082C9C 8008209C 04610002 */ bgez $v1, .L800820A8 /* 082CA0 800820A0 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80084854.s b/asm/non_matchings/unknown_080500/func_80084854.s index 420c9bc9..89f6f5a9 100644 --- a/asm/non_matchings/unknown_080500/func_80084854.s +++ b/asm/non_matchings/unknown_080500/func_80084854.s @@ -57,7 +57,7 @@ glabel func_80084854 /* 085520 80084920 8CAB0000 */ lw $t3, ($a1) /* 085524 80084924 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012 /* 085528 80084928 01716021 */ addu $t4, $t3, $s1 -/* 08552C 8008492C 3C198012 */ lui $t9, 0x8012 +/* 08552C 8008492C 3C198012 */ lui $t9, %hi(D_801269D0) # $t9, 0x8012 /* 085530 80084930 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8 /* 085534 80084934 02402025 */ move $a0, $s2 /* 085538 80084938 00004812 */ mflo $t1 @@ -78,7 +78,7 @@ glabel func_80084854 /* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA48) # $at, 0x800e /* 085574 80084974 000FC080 */ sll $t8, $t7, 2 /* 085578 80084978 0338C821 */ addu $t9, $t9, $t8 -/* 08557C 8008497C 8F3969D0 */ lw $t9, 0x69d0($t9) +/* 08557C 8008497C 8F3969D0 */ lw $t9, %lo(D_801269D0)($t9) /* 085580 80084980 0C019FCB */ jal func_80067F2C /* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA48)($at) /* 085588 80084988 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index 80180396..37a5f84d 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -82,9 +82,9 @@ glabel func_800853D0 /* 086108 80085508 10000006 */ b .L80085524 /* 08610C 8008550C AFAE0070 */ sw $t6, 0x70($sp) .L80085510: -/* 086110 80085510 3C0F800E */ lui $t7, 0x800e +/* 086110 80085510 3C0F800E */ lui $t7, %hi(D_800E03B0) # $t7, 0x800e /* 086114 80085514 01E37821 */ addu $t7, $t7, $v1 -/* 086118 80085518 8DEF03B0 */ lw $t7, 0x3b0($t7) +/* 086118 80085518 8DEF03B0 */ lw $t7, %lo(D_800E03B0)($t7) /* 08611C 8008551C 00000000 */ nop /* 086120 80085520 AFAF0064 */ sw $t7, 0x64($sp) .L80085524: @@ -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_80086AFC.s b/asm/non_matchings/unknown_080500/func_80086AFC.s index 98f72cee..c2663ac0 100644 --- a/asm/non_matchings/unknown_080500/func_80086AFC.s +++ b/asm/non_matchings/unknown_080500/func_80086AFC.s @@ -168,7 +168,7 @@ glabel func_80086AFC /* 087984 80086D84 10410075 */ beq $v0, $at, .L80086F5C /* 087988 80086D88 24010008 */ li $at, 8 /* 08798C 80086D8C 1041005B */ beq $v0, $at, .L80086EFC -/* 087990 80086D90 3C038012 */ lui $v1, 0x8012 +/* 087990 80086D90 3C038012 */ lui $v1, %hi(D_80126530) # $v1, 0x8012 /* 087994 80086D94 1000010D */ b .L800871CC /* 087998 80086D98 8FBF0014 */ lw $ra, 0x14($sp) .L80086D9C: @@ -262,7 +262,7 @@ glabel func_80086AFC /* 087AF4 80086EF4 100000B4 */ b .L800871C8 /* 087AF8 80086EF8 AF2F0050 */ sw $t7, 0x50($t9) .L80086EFC: -/* 087AFC 80086EFC 24636530 */ addiu $v1, $v1, 0x6530 +/* 087AFC 80086EFC 24636530 */ addiu $v1, %lo(D_80126530) # addiu $v1, $v1, 0x6530 /* 087B00 80086F00 8C66000C */ lw $a2, 0xc($v1) /* 087B04 80086F04 90E40006 */ lbu $a0, 6($a3) /* 087B08 80086F08 8CE50008 */ lw $a1, 8($a3) 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_80087734.s b/asm/non_matchings/unknown_080500/func_80087734.s index 4b96be67..8ad8c89d 100644 --- a/asm/non_matchings/unknown_080500/func_80087734.s +++ b/asm/non_matchings/unknown_080500/func_80087734.s @@ -79,7 +79,7 @@ glabel func_80087734 /* 088450 80087850 3C0D800E */ lui $t5, %hi(D_800DFADC) # $t5, 0x800e /* 088454 80087854 24010007 */ li $at, 7 /* 088458 80087858 11010046 */ beq $t0, $at, .L80087974 -/* 08845C 8008785C 3C0A800E */ lui $t2, 0x800e +/* 08845C 8008785C 3C0A800E */ lui $t2, %hi(D_800DFADC) # $t2, 0x800e /* 088460 80087860 100000BC */ b .L80087B54 /* 088464 80087864 8FBF0014 */ lw $ra, 0x14($sp) .L80087868: @@ -155,7 +155,7 @@ glabel func_80087734 /* 08856C 8008796C 10000078 */ b .L80087B50 /* 088570 80087970 AC396A1C */ sw $t9, %lo(D_80126A1C)($at) .L80087974: -/* 088574 80087974 8D4AFADC */ lw $t2, -0x524($t2) +/* 088574 80087974 8D4AFADC */ lw $t2, %lo(D_800DFADC)($t2) /* 088578 80087978 00000000 */ nop /* 08857C 8008797C 254BFFFF */ addiu $t3, $t2, -1 /* 088580 80087980 2D61000A */ sltiu $at, $t3, 0xa @@ -192,7 +192,7 @@ glabel func_80087734 /* 0885F8 800879F8 8FA8001C */ lw $t0, 0x1c($sp) /* 0885FC 800879FC 24010002 */ li $at, 2 /* 088600 80087A00 10410019 */ beq $v0, $at, .L80087A68 -/* 088604 80087A04 3C04800E */ lui $a0, 0x800e +/* 088604 80087A04 3C04800E */ lui $a0, %hi(D_800DFAE0) # $a0, 0x800e /* 088608 80087A08 24010003 */ li $at, 3 /* 08860C 80087A0C 10410007 */ beq $v0, $at, .L80087A2C /* 088610 80087A10 24010007 */ li $at, 7 @@ -220,7 +220,7 @@ glabel func_80087734 /* 088660 80087A60 1000003B */ b .L80087B50 /* 088664 80087A64 AC206A18 */ sw $zero, %lo(D_80126A18)($at) .L80087A68: -/* 088668 80087A68 8C84FAE0 */ lw $a0, -0x520($a0) +/* 088668 80087A68 8C84FAE0 */ lw $a0, %lo(D_800DFAE0)($a0) /* 08866C 80087A6C 0C01D74E */ jal func_80075D38 /* 088670 80087A70 AFA8001C */ sw $t0, 0x1c($sp) /* 088674 80087A74 8FA8001C */ lw $t0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_080500/func_80088938.s b/asm/non_matchings/unknown_080500/func_80088938.s index 5f3aa3c6..94602b05 100644 --- a/asm/non_matchings/unknown_080500/func_80088938.s +++ b/asm/non_matchings/unknown_080500/func_80088938.s @@ -183,7 +183,7 @@ glabel func_80088938 /* 0897F8 80088BF8 0C0313B7 */ jal func_800C4EDC /* 0897FC 80088BFC 24070124 */ li $a3, 292 /* 089800 80088C00 0621001A */ bgez $s1, .L80088C6C -/* 089804 80088C04 3C0E800F */ lui $t6, 0x800f +/* 089804 80088C04 3C0E800F */ lui $t6, %hi(D_800E820C) # $t6, 0x800f /* 089808 80088C08 240B00E0 */ li $t3, 224 /* 08980C 80088C0C AFAB0010 */ sw $t3, 0x10($sp) /* 089810 80088C10 24040006 */ li $a0, 6 @@ -214,7 +214,7 @@ glabel func_80088938 /* 089870 80088C70 8F1863D8 */ lw $t8, %lo(D_801263D8)($t8) /* 089874 80088C74 3C0F800E */ lui $t7, %hi(D_800DF460) # $t7, 0x800e /* 089878 80088C78 8DEFF460 */ lw $t7, %lo(D_800DF460)($t7) -/* 08987C 80088C7C 25D4820C */ addiu $s4, $t6, -0x7df4 +/* 08987C 80088C7C 25D4820C */ addiu $s4, $t6, %lo(D_800E820C) /* 089880 80088C80 0238C821 */ addu $t9, $s1, $t8 /* 089884 80088C84 15F9000B */ bne $t7, $t9, .L80088CB4 /* 089888 80088C88 02809025 */ move $s2, $s4 diff --git a/asm/non_matchings/unknown_080500/func_800896A4.s b/asm/non_matchings/unknown_080500/func_800896A4.s index d8ea2072..f1665db4 100644 --- a/asm/non_matchings/unknown_080500/func_800896A4.s +++ b/asm/non_matchings/unknown_080500/func_800896A4.s @@ -125,7 +125,7 @@ glabel func_800896A4 /* 08A47C 8008987C 00000000 */ nop .L80089880: /* 08A480 80089880 1617000C */ bne $s0, $s7, .L800898B4 -/* 08A484 80089884 3C048012 */ lui $a0, 0x8012 +/* 08A484 80089884 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A488 80089888 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A48C 8008988C 3C07800F */ lui $a3, %hi(D_800E8210) # $a3, 0x800f /* 08A490 80089890 240B000C */ li $t3, 12 @@ -142,7 +142,7 @@ glabel func_800896A4 /* 08A4B8 800898B8 240C000C */ li $t4, 12 /* 08A4BC 800898BC AFAC0010 */ sw $t4, 0x10($sp) /* 08A4C0 800898C0 24E78214 */ addiu $a3, %lo(D_800E8214) # addiu $a3, $a3, -0x7dec -/* 08A4C4 800898C4 248463A0 */ addiu $a0, $a0, 0x63a0 +/* 08A4C4 800898C4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A4C8 800898C8 02202825 */ move $a1, $s1 /* 08A4CC 800898CC 0C031110 */ jal func_800C4440 /* 08A4D0 800898D0 02803025 */ move $a2, $s4 diff --git a/asm/non_matchings/unknown_080500/func_8008B758.s b/asm/non_matchings/unknown_080500/func_8008B758.s index b0a9a3c6..b2d0d067 100644 --- a/asm/non_matchings/unknown_080500/func_8008B758.s +++ b/asm/non_matchings/unknown_080500/func_8008B758.s @@ -78,7 +78,7 @@ glabel func_8008B758 /* 08C47C 8008B87C AC2AF4BC */ sw $t2, %lo(D_800DF4BC)($at) /* 08C480 8008B880 3C06800E */ lui $a2, %hi(D_800DF4BC) # $a2, 0x800e /* 08C484 8008B884 8CC6F4BC */ lw $a2, %lo(D_800DF4BC)($a2) -/* 08C488 8008B888 3C018012 */ lui $at, %hi(D_801263D4) #$at, 0x8012 +/* 08C488 8008B888 3C018012 */ lui $at, %hi(D_801263D4) # $at, 0x8012 /* 08C48C 8008B88C 00340821 */ addu $at, $at, $s4 /* 08C490 8008B890 18C00026 */ blez $a2, .L8008B92C /* 08C494 8008B894 A02063D4 */ sb $zero, %lo(D_801263D4)($at) diff --git a/asm/non_matchings/unknown_080500/func_8008C168.s b/asm/non_matchings/unknown_080500/func_8008C168.s index 6903c8b8..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 @@ -34,7 +34,7 @@ glabel func_8008C168 /* 08CDE4 8008C1E4 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CDE8 8008C1E8 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CDEC 8008C1EC 80620000 */ lb $v0, ($v1) -/* 08CDF0 8008C1F0 3C04800E */ lui $a0, 0x800e +/* 08CDF0 8008C1F0 3C04800E */ lui $a0, %hi(D_800DFDB4) # $a0, 0x800e /* 08CDF4 8008C1F4 04400004 */ bltz $v0, .L8008C208 /* 08CDF8 8008C1F8 A2020000 */ sb $v0, ($s0) /* 08CDFC 8008C1FC 846A0002 */ lh $t2, 2($v1) @@ -51,16 +51,16 @@ glabel func_8008C168 /* 08CE24 8008C224 84AC0002 */ lh $t4, 2($a1) /* 08CE28 8008C228 008D2021 */ addu $a0, $a0, $t5 /* 08CE2C 8008C22C A46C0002 */ sh $t4, 2($v1) -/* 08CE30 8008C230 9084FDB4 */ lbu $a0, -0x24c($a0) +/* 08CE30 8008C230 9084FDB4 */ lbu $a0, %lo(D_800DFDB4)($a0) /* 08CE34 8008C234 0C00045C */ jal func_80001170 /* 08CE38 8008C238 00000000 */ nop /* 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 @@ -114,32 +114,32 @@ glabel func_8008C168 /* 08CF14 8008C314 86030002 */ lh $v1, 2($s0) /* 08CF18 8008C318 00026040 */ sll $t4, $v0, 1 /* 08CF1C 8008C31C 04610010 */ bgez $v1, .L8008C360 -/* 08CF20 8008C320 3C04800E */ lui $a0, 0x800e +/* 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 /* 08CF5C 8008C35C 860E0002 */ lh $t6, 2($s0) .L8008C360: /* 08CF60 8008C360 008C2021 */ addu $a0, $a0, $t4 -/* 08CF64 8008C364 9084FDB4 */ lbu $a0, -0x24c($a0) +/* 08CF64 8008C364 9084FDB4 */ lbu $a0, %lo(D_800DFDB4)($a0) /* 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_8008D8BC.s b/asm/non_matchings/unknown_080500/func_8008D8BC.s index 6a05d6c5..e54cef79 100644 --- a/asm/non_matchings/unknown_080500/func_8008D8BC.s +++ b/asm/non_matchings/unknown_080500/func_8008D8BC.s @@ -39,7 +39,7 @@ glabel func_8008D8BC /* 08E54C 8008D94C AC206484 */ sw $zero, %lo(D_80126484)($at) .L8008D950: /* 08E550 8008D950 13200025 */ beqz $t9, .L8008D9E8 -/* 08E554 8008D954 3C028012 */ lui $v0, 0x8012 +/* 08E554 8008D954 3C028012 */ lui $v0, %hi(D_8012648C) # $v0, 0x8012 /* 08E558 8008D958 3C028012 */ lui $v0, %hi(D_8012648C) # $v0, 0x8012 /* 08E55C 8008D95C 2442648C */ addiu $v0, %lo(D_8012648C) # addiu $v0, $v0, 0x648c /* 08E560 8008D960 8C490000 */ lw $t1, ($v0) @@ -78,7 +78,7 @@ glabel func_8008D8BC /* 08E5E0 8008D9E0 100000A3 */ b .L8008DC70 /* 08E5E4 8008D9E4 8FBF0014 */ lw $ra, 0x14($sp) .L8008D9E8: -/* 08E5E8 8008D9E8 2442648C */ addiu $v0, $v0, 0x648c +/* 08E5E8 8008D9E8 2442648C */ addiu $v0, %lo(D_8012648C) # addiu $v0, $v0, 0x648c /* 08E5EC 8008D9EC 8C460000 */ lw $a2, ($v0) /* 08E5F0 8008D9F0 04A10005 */ bgez $a1, .L8008DA08 /* 08E5F4 8008D9F4 00C01825 */ move $v1, $a2 diff --git a/asm/non_matchings/unknown_080500/func_8008DC7C.s b/asm/non_matchings/unknown_080500/func_8008DC7C.s index 91283e66..16aa02c3 100644 --- a/asm/non_matchings/unknown_080500/func_8008DC7C.s +++ b/asm/non_matchings/unknown_080500/func_8008DC7C.s @@ -37,7 +37,7 @@ glabel func_8008DC7C /* 08E904 8008DD04 AC206488 */ sw $zero, %lo(D_80126488)($at) .L8008DD08: /* 08E908 8008DD08 11000017 */ beqz $t0, .L8008DD68 -/* 08E90C 8008DD0C 3C068012 */ lui $a2, 0x8012 +/* 08E90C 8008DD0C 3C068012 */ lui $a2, %hi(0x8012648C) # $a2, 0x8012 /* 08E910 8008DD10 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012 /* 08E914 8008DD14 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c /* 08E918 8008DD18 8CC90000 */ lw $t1, ($a2) @@ -63,7 +63,7 @@ glabel func_8008DC7C /* 08E960 8008DD60 10000040 */ b .L8008DE64 /* 08E964 8008DD64 8FBF0014 */ lw $ra, 0x14($sp) .L8008DD68: -/* 08E968 8008DD68 24C6648C */ addiu $a2, $a2, 0x648c +/* 08E968 8008DD68 24C6648C */ addiu $a2, %lo(0x8012648C) # addiu $a2, $a2, 0x648c /* 08E96C 8008DD6C 8CC30000 */ lw $v1, ($a2) /* 08E970 8008DD70 04A10005 */ bgez $a1, .L8008DD88 /* 08E974 8008DD74 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/unknown_080500/func_8008F00C.s b/asm/non_matchings/unknown_080500/func_8008F00C.s index abda2cc8..4900eef6 100644 --- a/asm/non_matchings/unknown_080500/func_8008F00C.s +++ b/asm/non_matchings/unknown_080500/func_8008F00C.s @@ -48,8 +48,8 @@ glabel func_8008F00C /* 08FCB8 8008F0B8 3C048012 */ lui $a0, %hi(D_801269C4) # $a0, 0x8012 /* 08FCBC 8008F0BC 18C0000B */ blez $a2, .L8008F0EC /* 08FCC0 8008F0C0 24180001 */ li $t8, 1 -/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, 0x8012 -/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, 0x69c0 +/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(p1_vehicle) # $t7, 0x8012 +/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(p1_vehicle) /* 08FCCC 8008F0CC 00C32821 */ addu $a1, $a2, $v1 /* 08FCD0 8008F0D0 248469C4 */ addiu $a0, %lo(D_801269C4) # addiu $a0, $a0, 0x69c4 .L8008F0D4: diff --git a/asm/non_matchings/unknown_080500/func_80090918.s b/asm/non_matchings/unknown_080500/func_80090918.s index 926a2103..cb7e8c62 100644 --- a/asm/non_matchings/unknown_080500/func_80090918.s +++ b/asm/non_matchings/unknown_080500/func_80090918.s @@ -284,7 +284,7 @@ glabel func_80090918 /* 091934 80090D34 8FBF001C */ lw $ra, 0x1c($sp) .L80090D38: /* 091938 80090D38 11A0000C */ beqz $t5, .L80090D6C -/* 09193C 80090D3C 3C048012 */ lui $a0, 0x8012 +/* 09193C 80090D3C 3C048012 */ lui $a0, %hi(D_80126820) # $a0, 0x8012 /* 091940 80090D40 0C030060 */ jal func_800C0180 /* 091944 80090D44 00000000 */ nop /* 091948 80090D48 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e @@ -299,7 +299,7 @@ glabel func_80090918 .L80090D6C: /* 09196C 80090D6C 8D420000 */ lw $v0, ($t2) /* 091970 80090D70 8CE30000 */ lw $v1, ($a3) -/* 091974 80090D74 84846820 */ lh $a0, 0x6820($a0) +/* 091974 80090D74 84846820 */ lh $a0, %lo(D_80126820)($a0) /* 091978 80090D78 00404025 */ move $t0, $v0 /* 09197C 80090D7C 04810005 */ bgez $a0, .L80090D94 /* 091980 80090D80 00604825 */ move $t1, $v1 diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index 762ecaa1..d4024dae 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -788,7 +788,7 @@ glabel func_80090F30 .L80091AC8: /* 0926C8 80091AC8 3C0C800E */ lui $t4, %hi(D_800E0414) # $t4, 0x800e /* 0926CC 80091ACC 8D8C0414 */ lw $t4, %lo(D_800E0414)($t4) -/* 0926D0 80091AD0 3C05800E */ lui $a1, 0x800e +/* 0926D0 80091AD0 3C05800E */ lui $a1, %hi(0x800E0648) # $a1, 0x800e /* 0926D4 80091AD4 01960019 */ multu $t4, $s6 /* 0926D8 80091AD8 8FC90000 */ lw $t1, ($fp) /* 0926DC 80091ADC 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -804,7 +804,7 @@ glabel func_80090F30 /* 092704 80091B04 00006812 */ mflo $t5 /* 092708 80091B08 000DC080 */ sll $t8, $t5, 2 /* 09270C 80091B0C 00B82821 */ addu $a1, $a1, $t8 -/* 092710 80091B10 8CA50648 */ lw $a1, 0x648($a1) +/* 092710 80091B10 8CA50648 */ lw $a1, %lo(0x800E0648)($a1) /* 092714 80091B14 0C01E2AE */ jal func_80078AB8 /* 092718 80091B18 AFA9001C */ sw $t1, 0x1c($sp) /* 09271C 80091B1C 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e 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_80093A40.s b/asm/non_matchings/unknown_080500/func_80093A40.s index d5102ce6..4edd49d2 100644 --- a/asm/non_matchings/unknown_080500/func_80093A40.s +++ b/asm/non_matchings/unknown_080500/func_80093A40.s @@ -91,7 +91,7 @@ glabel func_80093A40 /* 094790 80093B90 8FB90024 */ lw $t9, 0x24($sp) /* 094794 80093B94 24010008 */ li $at, 8 /* 094798 80093B98 93280048 */ lbu $t0, 0x48($t9) -/* 09479C 80093B9C 3C02800E */ lui $v0, 0x800e +/* 09479C 80093B9C 3C02800E */ lui $v0, %hi(D_800DF4B8) # $v0, 0x800e /* 0947A0 80093BA0 1900002B */ blez $t0, .L80093C50 /* 0947A4 80093BA4 00000000 */ nop /* 0947A8 80093BA8 12010029 */ beq $s0, $at, .L80093C50 @@ -143,7 +143,7 @@ glabel func_80093A40 /* 094848 80093C48 1000000F */ b .L80093C88 /* 09484C 80093C4C 00000000 */ nop .L80093C50: -/* 094850 80093C50 8C42F4B8 */ lw $v0, -0xb48($v0) +/* 094850 80093C50 8C42F4B8 */ lw $v0, %lo(D_800DF4B8)($v0) /* 094854 80093C54 24010008 */ li $at, 8 /* 094858 80093C58 1440000B */ bnez $v0, .L80093C88 /* 09485C 80093C5C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80094170.s b/asm/non_matchings/unknown_080500/func_80094170.s index a100edf4..a3e7bc18 100644 --- a/asm/non_matchings/unknown_080500/func_80094170.s +++ b/asm/non_matchings/unknown_080500/func_80094170.s @@ -92,7 +92,7 @@ glabel func_80094170 /* 094EC0 800942C0 8FA4001C */ lw $a0, 0x1c($sp) .L800942C4: /* 094EC4 800942C4 11200022 */ beqz $t1, .L80094350 -/* 094EC8 800942C8 3C078012 */ lui $a3, 0x8012 +/* 094EC8 800942C8 3C078012 */ lui $a3, %hi(D_80126A68) # $a3, 0x8012 /* 094ECC 800942CC 240400EF */ li $a0, 239 /* 094ED0 800942D0 0C000741 */ jal func_80001D04 /* 094ED4 800942D4 00002825 */ move $a1, $zero @@ -131,7 +131,7 @@ glabel func_80094170 .L80094350: /* 094F50 80094350 3C04800E */ lui $a0, %hi(D_800E098C) # $a0, 0x800e /* 094F54 80094354 8C84098C */ lw $a0, %lo(D_800E098C)($a0) -/* 094F58 80094358 24E76A68 */ addiu $a3, $a3, 0x6a68 +/* 094F58 80094358 24E76A68 */ addiu $a3, %lo(D_80126A68) # addiu $a3, $a3, 0x6a68 /* 094F5C 8009435C 8CE20000 */ lw $v0, ($a3) /* 094F60 80094360 3C038012 */ lui $v1, %hi(D_80126464) # $v1, 0x8012 /* 094F64 80094364 00641821 */ addu $v1, $v1, $a0 @@ -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_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 0214dbf9..8b065120 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -461,7 +461,7 @@ glabel func_80094D28 /* 095FCC 800953CC 8E2C0000 */ lw $t4, ($s1) /* 095FD0 800953D0 2652FFE8 */ addiu $s2, $s2, -0x18 /* 095FD4 800953D4 1180003E */ beqz $t4, .L800954D0 -/* 095FD8 800953D8 3C0F8012 */ lui $t7, 0x8012 +/* 095FD8 800953D8 3C0F8012 */ lui $t7, %hi(D_80126C14) # $t7, 0x8012 /* 095FDC 800953DC 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e /* 095FE0 800953E0 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) /* 095FE4 800953E4 240E0001 */ li $t6, 1 @@ -526,7 +526,7 @@ glabel func_80094D28 /* 0960C8 800954C8 1000002D */ b .L80095580 /* 0960CC 800954CC 00000000 */ nop .L800954D0: -/* 0960D0 800954D0 8DEF6C14 */ lw $t7, 0x6c14($t7) +/* 0960D0 800954D0 8DEF6C14 */ lw $t7, %lo(D_80126C14)($t7) /* 0960D4 800954D4 2412000C */ li $s2, 12 /* 0960D8 800954D8 19E00029 */ blez $t7, .L80095580 /* 0960DC 800954DC 00008025 */ move $s0, $zero diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 54937b76..f4094a8b 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -746,7 +746,7 @@ glabel func_80095728 /* 096E04 80096204 AFAD004C */ sw $t5, 0x4c($sp) .L80096208: /* 096E08 80096208 13200021 */ beqz $t9, .L80096290 -/* 096E0C 8009620C 3C068012 */ lui $a2, 0x8012 +/* 096E0C 8009620C 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 096E10 80096210 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 096E14 80096214 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 /* 096E18 80096218 8CCE0000 */ lw $t6, ($a2) @@ -782,7 +782,7 @@ glabel func_80095728 /* 096E88 80096288 10000072 */ b .L80096454 /* 096E8C 8009628C AC3963E0 */ sw $t9, %lo(D_801263E0)($at) .L80096290: -/* 096E90 80096290 24C66A68 */ addiu $a2, $a2, 0x6a68 +/* 096E90 80096290 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 /* 096E94 80096294 8CC20000 */ lw $v0, ($a2) /* 096E98 80096298 00002025 */ move $a0, $zero /* 096E9C 8009629C 1940006A */ blez $t2, .L80096448 @@ -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 d2a0b6fc..449c1f72 100644 --- a/asm/non_matchings/unknown_080500/func_80097D10.s +++ b/asm/non_matchings/unknown_080500/func_80097D10.s @@ -49,7 +49,7 @@ glabel func_80097D10 /* 0989C0 80097DC0 AC6C0000 */ sw $t4, ($v1) .L80097DC4: /* 0989C4 80097DC4 1880001A */ blez $a0, .L80097E30 -/* 0989C8 80097DC8 3C028012 */ lui $v0, 0x8012 +/* 0989C8 80097DC8 3C028012 */ lui $v0, %hi(D_80126C3C) # $v0, 0x8012 /* 0989CC 80097DCC 3C028012 */ lui $v0, %hi(D_80126C3C) # $v0, 0x8012 /* 0989D0 80097DD0 24426C3C */ addiu $v0, %lo(D_80126C3C) # addiu $v0, $v0, 0x6c3c /* 0989D4 80097DD4 8C4D0000 */ lw $t5, ($v0) @@ -80,7 +80,7 @@ glabel func_80097D10 .L80097E30: /* 098A30 80097E30 3C038012 */ lui $v1, %hi(D_80126C34) # $v1, 0x8012 /* 098A34 80097E34 24636C34 */ addiu $v1, %lo(D_80126C34) # addiu $v1, $v1, 0x6c34 -/* 098A38 80097E38 24426C3C */ addiu $v0, $v0, 0x6c3c +/* 098A38 80097E38 24426C3C */ addiu $v0, %lo(D_80126C3C) # addiu $v0, $v0, 0x6c3c /* 098A3C 80097E3C AC600000 */ sw $zero, ($v1) /* 098A40 80097E40 AC400000 */ sw $zero, ($v0) .L80097E44: @@ -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_8009963C.s b/asm/non_matchings/unknown_080500/func_8009963C.s index ed522b33..8196d271 100644 --- a/asm/non_matchings/unknown_080500/func_8009963C.s +++ b/asm/non_matchings/unknown_080500/func_8009963C.s @@ -139,8 +139,8 @@ glabel func_8009963C .L80099830: /* 09A430 80099830 19800027 */ blez $t4, .L800998D0 /* 09A434 80099834 3C048012 */ lui $a0, %hi(D_80126508) # $a0, 0x8012 -/* 09A438 80099838 3C198012 */ lui $t9, 0x8012 -/* 09A43C 8009983C 27236520 */ addiu $v1, $t9, 0x6520 +/* 09A438 80099838 3C198012 */ lui $t9, %hi(D_80126520) # $t9, 0x8012 +/* 09A43C 8009983C 27236520 */ addiu $v1, $t9, %lo(D_80126520) /* 09A440 80099840 3C058012 */ lui $a1, %hi(D_80126540) # $a1, 0x8012 /* 09A444 80099844 3C068012 */ lui $a2, %hi(D_80126510) # $a2, 0x8012 /* 09A448 80099848 3C078012 */ lui $a3, %hi(D_80126518) # $a3, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_800998E0.s b/asm/non_matchings/unknown_080500/func_800998E0.s index 42518e10..90f8023b 100644 --- a/asm/non_matchings/unknown_080500/func_800998E0.s +++ b/asm/non_matchings/unknown_080500/func_800998E0.s @@ -78,8 +78,8 @@ glabel func_800998E0 /* 09A60C 80099A0C A478FFFE */ sh $t8, -2($v1) .L80099A10: /* 09A610 80099A10 1920000D */ blez $t1, .L80099A48 -/* 09A614 80099A14 3C198012 */ lui $t9, 0x8012 -/* 09A618 80099A18 27226540 */ addiu $v0, $t9, 0x6540 +/* 09A614 80099A14 3C198012 */ lui $t9, %hi(D_80126540) # $t9, 0x8012 +/* 09A618 80099A18 27226540 */ addiu $v0, $t9, %lo(D_80126540) /* 09A61C 80099A1C 01222021 */ addu $a0, $t1, $v0 .L80099A20: /* 09A620 80099A20 90430000 */ lbu $v1, ($v0) diff --git a/asm/non_matchings/unknown_080500/func_80099E8C.s b/asm/non_matchings/unknown_080500/func_80099E8C.s index 9e7c907d..a3e4a2e3 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 @@ -309,7 +309,7 @@ glabel func_80099E8C /* 09AF28 8009A328 240FFFFF */ li $t7, -1 /* 09AF2C 8009A32C 24010002 */ li $at, 2 /* 09AF30 8009A330 10410007 */ beq $v0, $at, .L8009A350 -/* 09AF34 8009A334 3C05800E */ lui $a1, 0x800e +/* 09AF34 8009A334 3C05800E */ lui $a1, %hi(D_800E048C) # $a1, 0x800e /* 09AF38 8009A338 3C05800E */ lui $a1, %hi(D_800E045C) # $a1, 0x800e /* 09AF3C 8009A33C 10000005 */ b .L8009A354 /* 09AF40 8009A340 24A5045C */ addiu $a1, %lo(D_800E045C) # addiu $a1, $a1, 0x45c @@ -318,7 +318,7 @@ glabel func_80099E8C /* 09AF48 8009A348 10000002 */ b .L8009A354 /* 09AF4C 8009A34C 24A50474 */ addiu $a1, %lo(D_800E0474) # addiu $a1, $a1, 0x474 .L8009A350: -/* 09AF50 8009A350 24A5048C */ addiu $a1, $a1, 0x48c +/* 09AF50 8009A350 24A5048C */ addiu $a1, %lo(D_800E048C) # addiu $a1, $a1, 0x48c .L8009A354: /* 09AF54 8009A354 862B0008 */ lh $t3, 8($s1) /* 09AF58 8009A358 862D000A */ lh $t5, 0xa($s1) diff --git a/asm/non_matchings/unknown_080500/func_8009C6D4.s b/asm/non_matchings/unknown_080500/func_8009C6D4.s index 0dd55927..b68acb9f 100644 --- a/asm/non_matchings/unknown_080500/func_8009C6D4.s +++ b/asm/non_matchings/unknown_080500/func_8009C6D4.s @@ -38,8 +38,8 @@ glabel func_8009C6D4 /* 09D35C 8009C75C 3C01800E */ lui $at, %hi(D_800DF758) # $at, 0x800e /* 09D360 8009C760 18600008 */ blez $v1, .L8009C784 /* 09D364 8009C764 A420F758 */ sh $zero, %lo(D_800DF758)($at) -/* 09D368 8009C768 3C0C8012 */ lui $t4, 0x8012 -/* 09D36C 8009C76C 25826750 */ addiu $v0, $t4, 0x6750 +/* 09D368 8009C768 3C0C8012 */ lui $t4, %hi(D_80126750) # $t4, 0x8012 +/* 09D36C 8009C76C 25826750 */ addiu $v0, $t4, %lo(D_80126750) /* 09D370 8009C770 00622021 */ addu $a0, $v1, $v0 .L8009C774: /* 09D374 8009C774 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/non_matchings/unknown_080500/func_8009CA60.s b/asm/non_matchings/unknown_080500/func_8009CA60.s index 567ea1e0..bbcc171d 100644 --- a/asm/non_matchings/unknown_080500/func_8009CA60.s +++ b/asm/non_matchings/unknown_080500/func_8009CA60.s @@ -32,7 +32,7 @@ glabel func_8009CA60 /* 09D6D8 8009CAD8 3C0F800E */ lui $t7, %hi(D_800DF468) # $t7, 0x800e /* 09D6DC 8009CADC A54C0000 */ sh $t4, ($t2) /* 09D6E0 8009CAE0 844D0002 */ lh $t5, 2($v0) -/* 09D6E4 8009CAE4 3C108012 */ lui $s0, 0x8012 +/* 09D6E4 8009CAE4 3C108012 */ lui $s0, %hi(D_801263A0) # $s0, 0x8012 /* 09D6E8 8009CAE8 A54D0002 */ sh $t5, 2($t2) /* 09D6EC 8009CAEC 844E0004 */ lh $t6, 4($v0) /* 09D6F0 8009CAF0 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012 @@ -44,7 +44,7 @@ glabel func_8009CA60 /* 09D708 8009CB08 01403825 */ move $a3, $t2 /* 09D70C 8009CB0C E5460010 */ swc1 $f6, 0x10($t2) /* 09D710 8009CB10 C4480014 */ lwc1 $f8, 0x14($v0) -/* 09D714 8009CB14 260463A0 */ addiu $a0, $s0, 0x63a0 +/* 09D714 8009CB14 260463A0 */ addiu $a0, $s0, %lo(D_801263A0) /* 09D718 8009CB18 E5480014 */ swc1 $f8, 0x14($t2) /* 09D71C 8009CB1C C44A0008 */ lwc1 $f10, 8($v0) /* 09D720 8009CB20 3C0C800E */ lui $t4, %hi(D_800DF764) # $t4, 0x800e 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/asm/non_matchings/unknown_080500/func_8009D360.s b/asm/non_matchings/unknown_080500/func_8009D360.s index 4cabb56b..208308ff 100644 --- a/asm/non_matchings/unknown_080500/func_8009D360.s +++ b/asm/non_matchings/unknown_080500/func_8009D360.s @@ -254,7 +254,7 @@ glabel func_8009D360 /* 09E324 8009D724 80636516 */ lb $v1, %lo(D_80126516)($v1) /* 09E328 8009D728 240B0002 */ li $t3, 2 /* 09E32C 8009D72C 10600014 */ beqz $v1, .L8009D780 -/* 09E330 8009D730 3C018012 */ lui $at, 0x8012 +/* 09E330 8009D730 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012 /* 09E334 8009D734 24010001 */ li $at, 1 /* 09E338 8009D738 10610006 */ beq $v1, $at, .L8009D754 /* 09E33C 8009D73C 24090003 */ li $t1, 3 @@ -266,7 +266,7 @@ glabel func_8009D360 .L8009D754: /* 09E354 8009D754 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012 /* 09E358 8009D758 A02964E2 */ sb $t1, %lo(D_801264E2)($at) -/* 09E35C 8009D75C 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012 +/* 09E35C 8009D75C 3C018012 */ lui $at, %hi(D_801264D8) # $at, 0x8012 /* 09E360 8009D760 A02064D8 */ sb $zero, %lo(D_801264D8)($at) /* 09E364 8009D764 24040239 */ li $a0, 569 /* 09E368 8009D768 0C00EB0F */ jal func_8003AC3C diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/unknown_09F8F0/func_8009F034.s index d8585950..da6653b2 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009F034.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009F034.s @@ -251,8 +251,8 @@ glabel func_8009F034 /* 09FFE0 8009F3E0 3C014188 */ li $at, 0x41880000 # 17.000000 /* 09FFE4 8009F3E4 15830084 */ bne $t4, $v1, .L8009F5F8 /* 09FFE8 8009F3E8 00000000 */ nop -/* 09FFEC 8009F3EC 3C03800E */ lui $v1, 0x800e -/* 09FFF0 8009F3F0 246225C4 */ addiu $v0, $v1, 0x25c4 +/* 09FFEC 8009F3EC 3C03800E */ lui $v1, %hi(D_800E25C4) # $v1, 0x800e +/* 09FFF0 8009F3F0 246225C4 */ addiu $v0, $v1, %lo(D_800E25C4) /* 09FFF4 8009F3F4 84590000 */ lh $t9, ($v0) /* 09FFF8 8009F3F8 44810000 */ mtc1 $at, $f0 /* 09FFFC 8009F3FC 1159003F */ beq $t2, $t9, .L8009F4FC @@ -393,8 +393,8 @@ glabel func_8009F034 /* 0A01FC 8009F5FC 24010003 */ li $at, 3 /* 0A0200 8009F600 1461006E */ bne $v1, $at, .L8009F7BC .L8009F604: -/* 0A0204 8009F604 3C04800E */ lui $a0, 0x800e -/* 0A0208 8009F608 24822684 */ addiu $v0, $a0, 0x2684 +/* 0A0204 8009F604 3C04800E */ lui $a0, %hi(D_800E2684) # $a0, 0x800e +/* 0A0208 8009F608 24822684 */ addiu $v0, $a0, %lo(D_800E2684) /* 0A020C 8009F60C 844F0000 */ lh $t7, ($v0) /* 0A0210 8009F610 3C19800E */ lui $t9, %hi(D_800E2684) # $t9, 0x800e /* 0A0214 8009F614 114F0069 */ beq $t2, $t7, .L8009F7BC @@ -1052,7 +1052,7 @@ glabel func_8009F034 /* 0A0BA8 8009FFA8 00000000 */ nop /* 0A0BAC 8009FFAC 30590040 */ andi $t9, $v0, 0x40 /* 0A0BB0 8009FFB0 13200008 */ beqz $t9, .L8009FFD4 -/* 0A0BB4 8009FFB4 3C02800E */ lui $v0, 0x800e +/* 0A0BB4 8009FFB4 3C02800E */ lui $v0, %hi(D_800E27A4) # $v0, 0x800e /* 0A0BB8 8009FFB8 3C02800E */ lui $v0, %hi(D_800E27A4) # $v0, 0x800e /* 0A0BBC 8009FFBC 244227A4 */ addiu $v0, %lo(D_800E27A4) # addiu $v0, $v0, 0x27a4 /* 0A0BC0 8009FFC0 80580001 */ lb $t8, 1($v0) @@ -1063,7 +1063,7 @@ glabel func_8009F034 .L8009FFD4: /* 0A0BD4 8009FFD4 3C0E800E */ lui $t6, %hi(D_800E27A8) # $t6, 0x800e /* 0A0BD8 8009FFD8 81CE27A8 */ lb $t6, %lo(D_800E27A8)($t6) -/* 0A0BDC 8009FFDC 244227A4 */ addiu $v0, $v0, 0x27a4 +/* 0A0BDC 8009FFDC 244227A4 */ addiu $v0, %lo(D_800E27A4) # addiu $v0, $v0, 0x27a4 /* 0A0BE0 8009FFE0 A04E0001 */ sb $t6, 1($v0) .L8009FFE4: /* 0A0BE4 8009FFE4 8FBF0064 */ lw $ra, 0x64($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A19A4.s b/asm/non_matchings/unknown_09F8F0/func_800A19A4.s index 8d1d6245..89abce14 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A19A4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A19A4.s @@ -43,12 +43,12 @@ glabel func_800A19A4 /* 0A2648 800A1A48 00000000 */ nop .L800A1A4C: /* 0A264C 800A1A4C 8E470000 */ lw $a3, ($s2) -/* 0A2650 800A1A50 3C148012 */ lui $s4, 0x8012 -/* 0A2654 800A1A54 3C158012 */ lui $s5, 0x8012 -/* 0A2658 800A1A58 3C168012 */ lui $s6, 0x8012 -/* 0A265C 800A1A5C 26C66D04 */ addiu $a2, $s6, 0x6d04 -/* 0A2660 800A1A60 26A56D00 */ addiu $a1, $s5, 0x6d00 -/* 0A2664 800A1A64 26846CFC */ addiu $a0, $s4, 0x6cfc +/* 0A2650 800A1A50 3C148012 */ lui $s4, %hi(D_80126CFC) # $s4, 0x8012 +/* 0A2654 800A1A54 3C158012 */ lui $s5, %hi(D_80126D00) # $s5, 0x8012 +/* 0A2658 800A1A58 3C168012 */ lui $s6, %hi(D_80126D04) # $s6, 0x8012 +/* 0A265C 800A1A5C 26C66D04 */ addiu $a2, $s6, %lo(D_80126D04) +/* 0A2660 800A1A60 26A56D00 */ addiu $a1, $s5, %lo(D_80126D00) +/* 0A2664 800A1A64 26846CFC */ addiu $a0, $s4, %lo(D_80126CFC) /* 0A2668 800A1A68 24110003 */ li $s1, 3 /* 0A266C 800A1A6C 0C02A980 */ jal func_800AA600 /* 0A2670 800A1A70 24E70640 */ addiu $a3, $a3, 0x640 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s index 3a99b020..1719d7b1 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s @@ -27,7 +27,7 @@ glabel func_800A3CE4 /* 0A4944 800A3D44 00000000 */ nop .L800A3D48: /* 0A4948 800A3D48 19200083 */ blez $t1, .L800A3F58 -/* 0A494C 800A3D4C 3C088012 */ lui $t0, 0x8012 +/* 0A494C 800A3D4C 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012 /* 0A4950 800A3D50 3C188012 */ lui $t8, %hi(D_80126D34) # $t8, 0x8012 /* 0A4954 800A3D54 93186D34 */ lbu $t8, %lo(D_80126D34)($t8) /* 0A4958 800A3D58 00095A00 */ sll $t3, $t1, 8 @@ -160,7 +160,7 @@ glabel func_800A3CE4 /* 0A4B50 800A3F50 1000007A */ b .L800A413C /* 0A4B54 800A3F54 00000000 */ nop .L800A3F58: -/* 0A4B58 800A3F58 25086CDC */ addiu $t0, $t0, 0x6cdc +/* 0A4B58 800A3F58 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc /* 0A4B5C 800A3F5C 8D0F0000 */ lw $t7, ($t0) /* 0A4B60 800A3F60 3C01C348 */ li $at, 0xC3480000 # -200.000000 /* 0A4B64 800A3F64 44819000 */ mtc1 $at, $f18 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s index b697b9ec..077d0ac4 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s @@ -53,7 +53,7 @@ glabel func_800A5F18 /* 0A6BE0 800A5FE0 8FB90028 */ lw $t9, 0x28($sp) /* 0A6BE4 800A5FE4 8FB80024 */ lw $t8, 0x24($sp) /* 0A6BE8 800A5FE8 872801AC */ lh $t0, 0x1ac($t9) -/* 0A6BEC 800A5FEC 3C028012 */ lui $v0, 0x8012 +/* 0A6BEC 800A5FEC 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012 /* 0A6BF0 800A5FF0 13080078 */ beq $t8, $t0, .L800A61D4 /* 0A6BF4 800A5FF4 3C01420C */ li $at, 0x420C0000 # 35.000000 /* 0A6BF8 800A5FF8 240900FF */ li $t1, 255 @@ -176,7 +176,7 @@ glabel func_800A5F18 /* 0A6DCC 800A61CC 1000001E */ b .L800A6248 /* 0A6DD0 800A61D0 8FBF001C */ lw $ra, 0x1c($sp) .L800A61D4: -/* 0A6DD4 800A61D4 8C426CDC */ lw $v0, 0x6cdc($v0) +/* 0A6DD4 800A61D4 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0) /* 0A6DD8 800A61D8 44815000 */ mtc1 $at, $f10 /* 0A6DDC 800A61DC C448016C */ lwc1 $f8, 0x16c($v0) /* 0A6DE0 800A61E0 C4440170 */ lwc1 $f4, 0x170($v0) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index c1646dd2..4f407e1b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -1432,7 +1432,7 @@ glabel func_800A8474 /* 0AA5AC 800A99AC 10410019 */ beq $v0, $at, .L800A9A14 /* 0AA5B0 800A99B0 24010003 */ li $at, 3 /* 0AA5B4 800A99B4 1041004E */ beq $v0, $at, .L800A9AF0 -/* 0AA5B8 800A99B8 3C108012 */ lui $s0, 0x8012 +/* 0AA5B8 800A99B8 3C108012 */ lui $s0, %hi(D_80126D5C) # $s0, 0x8012 /* 0AA5BC 800A99BC 3C108012 */ lui $s0, %hi(D_80126D5C) # $s0, 0x8012 /* 0AA5C0 800A99C0 240E0087 */ li $t6, 135 /* 0AA5C4 800A99C4 3C018012 */ lui $at, %hi(D_80126D58) # $at, 0x8012 @@ -1472,7 +1472,7 @@ glabel func_800A8474 /* 0AA640 800A9A40 00000000 */ nop /* 0AA644 800A9A44 24010041 */ li $at, 65 /* 0AA648 800A9A48 14410015 */ bne $v0, $at, .L800A9AA0 -/* 0AA64C 800A9A4C 3C108012 */ lui $s0, 0x8012 +/* 0AA64C 800A9A4C 3C108012 */ lui $s0, %hi(D_80126D5C) # $s0, 0x8012 .L800A9A50: /* 0AA650 800A9A50 3C0C8012 */ lui $t4, %hi(D_80126D1C) # $t4, 0x8012 /* 0AA654 800A9A54 8D8C6D1C */ lw $t4, %lo(D_80126D1C)($t4) @@ -1502,7 +1502,7 @@ glabel func_800A8474 /* 0AA6A8 800A9AA8 3C0D8012 */ lui $t5, %hi(D_80126D20) # $t5, 0x8012 /* 0AA6AC 800A9AAC 8DAD6D20 */ lw $t5, %lo(D_80126D20)($t5) /* 0AA6B0 800A9AB0 240FFFC4 */ li $t7, -60 -/* 0AA6B4 800A9AB4 26106D5C */ addiu $s0, $s0, 0x6d5c +/* 0AA6B4 800A9AB4 26106D5C */ addiu $s0, %lo(D_80126D5C) # addiu $s0, $s0, 0x6d5c /* 0AA6B8 800A9AB8 05410003 */ bgez $t2, .L800A9AC8 /* 0AA6BC 800A9ABC 000A5843 */ sra $t3, $t2, 1 /* 0AA6C0 800A9AC0 25410001 */ addiu $at, $t2, 1 @@ -1524,7 +1524,7 @@ glabel func_800A8474 /* 0AA6F4 800A9AF4 8F396D1C */ lw $t9, %lo(D_80126D1C)($t9) /* 0AA6F8 800A9AF8 3C0C8012 */ lui $t4, %hi(D_80126D20) # $t4, 0x8012 /* 0AA6FC 800A9AFC 8D8C6D20 */ lw $t4, %lo(D_80126D20)($t4) -/* 0AA700 800A9B00 26106D5C */ addiu $s0, $s0, 0x6d5c +/* 0AA700 800A9B00 26106D5C */ addiu $s0, %lo(D_80126D5C) # addiu $s0, $s0, 0x6d5c /* 0AA704 800A9B04 07210003 */ bgez $t9, .L800A9B14 /* 0AA708 800A9B08 00195043 */ sra $t2, $t9, 1 /* 0AA70C 800A9B0C 27210001 */ addiu $at, $t9, 1 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/unknown_09F8F0/func_800AA600.s index b6969b86..f9b36469 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA600.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA600.s @@ -180,7 +180,7 @@ glabel func_800AA600 /* 0AB4A0 800AA8A0 154D0140 */ bne $t2, $t5, .L800AADA4 /* 0AB4A4 800AA8A4 30598000 */ andi $t9, $v0, 0x8000 /* 0AB4A8 800AA8A8 14200095 */ bnez $at, .L800AAB00 -/* 0AB4AC 800AA8AC 3C198012 */ lui $t9, 0x8012 +/* 0AB4AC 800AA8AC 3C198012 */ lui $t9, %hi(D_80126CD5) # $t9, 0x8012 /* 0AB4B0 800AA8B0 29010036 */ slti $at, $t0, 0x36 /* 0AB4B4 800AA8B4 10200092 */ beqz $at, .L800AAB00 /* 0AB4B8 800AA8B8 3C048000 */ lui $a0, %hi(osTvType) # $a0, 0x8000 @@ -273,7 +273,7 @@ glabel func_800AA600 /* 0AB604 800AAA04 860E0006 */ lh $t6, 6($s0) /* 0AB608 800AAA08 24010035 */ li $at, 53 /* 0AB60C 800AAA0C 15C1001A */ bne $t6, $at, .L800AAA78 -/* 0AB610 800AAA10 3C048012 */ lui $a0, 0x8012 +/* 0AB610 800AAA10 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 /* 0AB614 800AAA14 240100FF */ li $at, 255 /* 0AB618 800AAA18 14610003 */ bne $v1, $at, .L800AAA28 /* 0AB61C 800AAA1C 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 @@ -308,7 +308,7 @@ glabel func_800AA600 /* 0AB684 800AAA84 AFAB0018 */ sw $t3, 0x18($sp) /* 0AB688 800AAA88 AFB80014 */ sw $t8, 0x14($sp) /* 0AB68C 800AAA8C AFB90010 */ sw $t9, 0x10($sp) -/* 0AB690 800AAA90 24846CFC */ addiu $a0, $a0, 0x6cfc +/* 0AB690 800AAA90 24846CFC */ addiu $a0, %lo(D_80126CFC) # addiu $a0, $a0, 0x6cfc /* 0AB694 800AAA94 27A50088 */ addiu $a1, $sp, 0x88 /* 0AB698 800AAA98 00003025 */ move $a2, $zero /* 0AB69C 800AAA9C 00003825 */ move $a3, $zero @@ -547,7 +547,7 @@ glabel func_800AA600 /* 0ABA24 800AAE24 A60C0004 */ sh $t4, 4($s0) .L800AAE28: /* 0ABA28 800AAE28 11C0001F */ beqz $t6, .L800AAEA8 -/* 0ABA2C 800AAE2C 3C048012 */ lui $a0, 0x8012 +/* 0ABA2C 800AAE2C 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 /* 0ABA30 800AAE30 8D2F0000 */ lw $t7, ($t1) /* 0ABA34 800AAE34 0008C880 */ sll $t9, $t0, 2 /* 0ABA38 800AAE38 01F9C021 */ addu $t8, $t7, $t9 @@ -582,7 +582,7 @@ glabel func_800AA600 /* 0ABAA8 800AAEA8 44809000 */ mtc1 $zero, $f18 /* 0ABAAC 800AAEAC 3C058012 */ lui $a1, %hi(D_80126D00) # $a1, 0x8012 /* 0ABAB0 800AAEB0 24A56D00 */ addiu $a1, %lo(D_80126D00) # addiu $a1, $a1, 0x6d00 -/* 0ABAB4 800AAEB4 24846CFC */ addiu $a0, $a0, 0x6cfc +/* 0ABAB4 800AAEB4 24846CFC */ addiu $a0, %lo(D_80126CFC) # addiu $a0, $a0, 0x6cfc /* 0ABAB8 800AAEB8 02003025 */ move $a2, $s0 /* 0ABABC 800AAEBC 3C073F80 */ lui $a3, 0x3f80 /* 0ABAC0 800AAEC0 0C01A521 */ jal func_80069484 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s b/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s index b84877c6..992618ad 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s @@ -70,7 +70,7 @@ glabel func_800AC8A8 /* 0AD598 800AC998 906B000E */ lbu $t3, 0xe($v1) /* 0AD59C 800AC99C 3C0C800E */ lui $t4, %hi(D_800E2980) # $t4, 0x800e /* 0AD5A0 800AC9A0 14CB0005 */ bne $a2, $t3, .L800AC9B8 -/* 0AD5A4 800AC9A4 3C018012 */ lui $at, 0x8012 +/* 0AD5A4 800AC9A4 3C018012 */ lui $at, %hi(D_80127C2C) # $at, 0x8012 /* 0AD5A8 800AC9A8 258C2980 */ addiu $t4, %lo(D_800E2980) # addiu $t4, $t4, 0x2980 /* 0AD5AC 800AC9AC 3C018012 */ lui $at, %hi(D_80127C2C) # $at, 0x8012 /* 0AD5B0 800AC9B0 10000002 */ b .L800AC9BC diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s b/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s index ac70995a..e1f97c3b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s @@ -18,7 +18,7 @@ glabel func_800AD4B8 /* 0AE0F8 800AD4F8 18400023 */ blez $v0, .L800AD588 /* 0AE0FC 800AD4FC 0242082A */ slt $at, $s2, $v0 /* 0AE100 800AD500 10200017 */ beqz $at, .L800AD560 -/* 0AE104 800AD504 3C04800E */ lui $a0, 0x800e +/* 0AE104 800AD504 3C04800E */ lui $a0, %hi(D_800E2C6C) # $a0, 0x800e /* 0AE108 800AD508 00527823 */ subu $t7, $v0, $s2 /* 0AE10C 800AD50C AC6F0000 */ sw $t7, ($v1) /* 0AE110 800AD510 3C19800E */ lui $t9, %hi(D_800E2C64) # $t9, 0x800e @@ -50,7 +50,7 @@ glabel func_800AD4B8 /* 0AE174 800AD574 3C0F800E */ lui $t7, %hi(D_800E2C74) # $t7, 0x800e /* 0AE178 800AD578 AE0E0000 */ sw $t6, ($s0) /* 0AE17C 800AD57C 8DEF2C74 */ lw $t7, %lo(D_800E2C74)($t7) -/* 0AE180 800AD580 24842C6C */ addiu $a0, $a0, 0x2c6c +/* 0AE180 800AD580 24842C6C */ addiu $a0, $a0, %lo(D_800E2C6C) /* 0AE184 800AD584 AC8F0000 */ sw $t7, ($a0) .L800AD588: /* 0AE188 800AD588 3C10800E */ lui $s0, %hi(D_800E2C60) # $s0, 0x800e diff --git a/asm/non_matchings/unknown_0AEE70/func_800AF714.s b/asm/non_matchings/unknown_0AEE70/func_800AF714.s index b640349e..6f9dbca7 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800AF714.s +++ b/asm/non_matchings/unknown_0AEE70/func_800AF714.s @@ -328,7 +328,7 @@ glabel func_800AF714 /* 0B07BC 800AFBBC 00000000 */ nop .L800AFBC0: /* 0B07C0 800AFBC0 82790002 */ lb $t9, 2($s3) -/* 0B07C4 800AFBC4 3C018012 */ lui $at, %hi(D_80127C88) #$at, 0x8012 +/* 0B07C4 800AFBC4 3C018012 */ lui $at, %hi(D_80127C88) # $at, 0x8012 /* 0B07C8 800AFBC8 33380007 */ andi $t8, $t9, 7 /* 0B07CC 800AFBCC 00186040 */ sll $t4, $t8, 1 /* 0B07D0 800AFBD0 002C0821 */ addu $at, $at, $t4 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B0698.s b/asm/non_matchings/unknown_0AEE70/func_800B0698.s index 58da9dfc..209bcdc0 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B0698.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B0698.s @@ -218,7 +218,7 @@ glabel func_800B0698 /* 0B15C0 800B09C0 0C02C004 */ jal func_800B0010 /* 0B15C4 800B09C4 AFA3002C */ sw $v1, 0x2c($sp) /* 0B15C8 800B09C8 8E0D0040 */ lw $t5, 0x40($s0) -/* 0B15CC 800B09CC 3C01800E */ lui $at, %hi(D_800E2E2C) #$at, 0x800e +/* 0B15CC 800B09CC 3C01800E */ lui $at, %hi(D_800E2E2C) # $at, 0x800e /* 0B15D0 800B09D0 000D7903 */ sra $t7, $t5, 4 /* 0B15D4 800B09D4 31EE0007 */ andi $t6, $t7, 7 /* 0B15D8 800B09D8 000EC080 */ sll $t8, $t6, 2 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1130.s b/asm/non_matchings/unknown_0AEE70/func_800B1130.s index 422f24af..bd02c90c 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1130.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1130.s @@ -687,7 +687,7 @@ glabel func_800B1130 /* 0B2724 800B1B24 0C02C004 */ jal func_800B0010 /* 0B2728 800B1B28 02203825 */ move $a3, $s1 /* 0B272C 800B1B2C 8E0C0040 */ lw $t4, 0x40($s0) -/* 0B2730 800B1B30 3C01800E */ lui $at, %hi(D_800E2E2C) #$at, 0x800e +/* 0B2730 800B1B30 3C01800E */ lui $at, %hi(D_800E2E2C) # $at, 0x800e /* 0B2734 800B1B34 000C6903 */ sra $t5, $t4, 4 /* 0B2738 800B1B38 31AF0007 */ andi $t7, $t5, 7 /* 0B273C 800B1B3C 000F7080 */ sll $t6, $t7, 2 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s b/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s index 898ee3d6..9d887f31 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s @@ -5,13 +5,13 @@ glabel func_800B1CB8 /* 0B28C4 800B1CC4 00001025 */ move $v0, $zero /* 0B28C8 800B1CC8 24070002 */ li $a3, 2 /* 0B28CC 800B1CCC 1087005D */ beq $a0, $a3, .L800B1E44 -/* 0B28D0 800B1CD0 3C08800E */ lui $t0, 0x800e +/* 0B28D0 800B1CD0 3C08800E */ lui $t0, %hi(D_800E2CB4) # $t0, 0x800e /* 0B28D4 800B1CD4 24070003 */ li $a3, 3 /* 0B28D8 800B1CD8 10870083 */ beq $a0, $a3, .L800B1EE8 -/* 0B28DC 800B1CDC 3C08800E */ lui $t0, 0x800e +/* 0B28DC 800B1CDC 3C08800E */ lui $t0, %hi(D_800E2CCC) # $t0, 0x800e /* 0B28E0 800B1CE0 24060004 */ li $a2, 4 /* 0B28E4 800B1CE4 108600A9 */ beq $a0, $a2, .L800B1F8C -/* 0B28E8 800B1CE8 3C07800E */ lui $a3, 0x800e +/* 0B28E8 800B1CE8 3C07800E */ lui $a3, %hi(D_800E2CD8) # $a3, 0x800e /* 0B28EC 800B1CEC 24070080 */ li $a3, 128 /* 0B28F0 800B1CF0 148700CE */ bne $a0, $a3, .L800B202C /* 0B28F4 800B1CF4 3C08800E */ lui $t0, %hi(D_800E2CC0) # $t0, 0x800e @@ -106,7 +106,7 @@ glabel func_800B1CB8 /* 0B2A3C 800B1E3C 1000007B */ b .L800B202C /* 0B2A40 800B1E40 00CB1821 */ addu $v1, $a2, $t3 .L800B1E44: -/* 0B2A44 800B1E44 25082CB4 */ addiu $t0, $t0, 0x2cb4 +/* 0B2A44 800B1E44 25082CB4 */ addiu $t0, %lo(D_800E2CB4) # addiu $t0, $t0, 0xE2cb4 /* 0B2A48 800B1E48 8D040000 */ lw $a0, ($t0) /* 0B2A4C 800B1E4C 3C09800E */ lui $t1, %hi(D_800E2CAC) # $t1, 0x800e /* 0B2A50 800B1E50 10800076 */ beqz $a0, .L800B202C @@ -151,7 +151,7 @@ glabel func_800B1CB8 /* 0B2AE0 800B1EE0 10000052 */ b .L800B202C /* 0B2AE4 800B1EE4 00CF1821 */ addu $v1, $a2, $t7 .L800B1EE8: -/* 0B2AE8 800B1EE8 25082CCC */ addiu $t0, $t0, 0x2ccc +/* 0B2AE8 800B1EE8 25082CCC */ addiu $t0, %lo(D_800E2CCC) # addiu $t0, $t0, 0x2ccc /* 0B2AEC 800B1EEC 8D040000 */ lw $a0, ($t0) /* 0B2AF0 800B1EF0 3C09800E */ lui $t1, %hi(D_800E2CC4) # $t1, 0x800e /* 0B2AF4 800B1EF4 1080004D */ beqz $a0, .L800B202C @@ -196,7 +196,7 @@ glabel func_800B1CB8 /* 0B2B84 800B1F84 10000029 */ b .L800B202C /* 0B2B88 800B1F88 00CA1821 */ addu $v1, $a2, $t2 .L800B1F8C: -/* 0B2B8C 800B1F8C 24E72CD8 */ addiu $a3, $a3, 0x2cd8 +/* 0B2B8C 800B1F8C 24E72CD8 */ addiu $a3, %lo(D_800E2CD8) # $a3, $a3, 0x2cd8 /* 0B2B90 800B1F90 8CE40000 */ lw $a0, ($a3) /* 0B2B94 800B1F94 3C08800E */ lui $t0, %hi(D_800E2CD0) # $t0, 0x800e /* 0B2B98 800B1F98 10800024 */ beqz $a0, .L800B202C diff --git a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s index d579b90c..6a4798b0 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s @@ -20,7 +20,7 @@ glabel func_800B26E0 /* 0B3324 800B2724 8FA70030 */ lw $a3, 0x30($sp) /* 0B3328 800B2728 29010002 */ slti $at, $t0, 2 /* 0B332C 800B272C 102001CE */ beqz $at, .L800B2E68 -/* 0B3330 800B2730 3C058012 */ lui $a1, 0x8012 +/* 0B3330 800B2730 3C058012 */ lui $a1, %hi(D_80127C80) # $a1, 0x8012 /* 0B3334 800B2734 8FA90034 */ lw $t1, 0x34($sp) /* 0B3338 800B2738 00000000 */ nop /* 0B333C 800B273C 112001CA */ beqz $t1, .L800B2E68 @@ -159,7 +159,7 @@ glabel func_800B26E0 /* 0B3528 800B2928 E7AC004C */ swc1 $f12, 0x4c($sp) .L800B292C: /* 0B352C 800B292C 106000CE */ beqz $v1, .L800B2C68 -/* 0B3530 800B2930 3C058012 */ lui $a1, 0x8012 +/* 0B3530 800B2930 3C058012 */ lui $a1, %hi(D_80127C80) # $a1, 0x8012 /* 0B3534 800B2934 90D80068 */ lbu $t8, 0x68($a2) /* 0B3538 800B2938 C7A40044 */ lwc1 $f4, 0x44($sp) /* 0B353C 800B293C 170000CA */ bnez $t8, .L800B2C68 @@ -496,9 +496,9 @@ glabel func_800B26E0 /* 0B3A5C 800B2E5C A0CB0068 */ sb $t3, 0x68($a2) .L800B2E60: /* 0B3A60 800B2E60 10000041 */ b .L800B2F68 -/* 0B3A64 800B2E64 24A57C80 */ addiu $a1, $a1, 0x7c80 +/* 0B3A64 800B2E64 24A57C80 */ addiu $a1, %lo(D_80127C80) # addiu $a1, $a1, 0x7c80 .L800B2E68: -/* 0B3A68 800B2E68 24A57C80 */ addiu $a1, $a1, 0x7c80 +/* 0B3A68 800B2E68 24A57C80 */ addiu $a1, %lo(D_80127C80) # addiu $a1, $a1, 0x7c80 /* 0B3A6C 800B2E6C 8CA90000 */ lw $t1, ($a1) /* 0B3A70 800B2E70 84CD003A */ lh $t5, 0x3a($a2) /* 0B3A74 800B2E74 00C02025 */ move $a0, $a2 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B3E64.s b/asm/non_matchings/unknown_0AEE70/func_800B3E64.s index 74c6e95d..133b0468 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B3E64.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B3E64.s @@ -403,7 +403,7 @@ glabel func_800B3E64 /* 0B5090 800B4490 3C0E800E */ lui $t6, %hi(D_800E2CF0) # $t6, 0x800e /* 0B5094 800B4494 0083082A */ slt $at, $a0, $v1 /* 0B5098 800B4498 10200007 */ beqz $at, .L800B44B8 -/* 0B509C 800B449C 3C19800E */ lui $t9, 0x800e +/* 0B509C 800B449C 3C19800E */ lui $t9, %hi(D_800E2CF0) # $t9, 0x800e /* 0B50A0 800B44A0 8DCE2CF0 */ lw $t6, %lo(D_800E2CF0)($t6) /* 0B50A4 800B44A4 00047880 */ sll $t7, $a0, 2 /* 0B50A8 800B44A8 01CFC021 */ addu $t8, $t6, $t7 @@ -412,7 +412,7 @@ glabel func_800B3E64 /* 0B50B4 800B44B4 00000000 */ nop .L800B44B8: -/* 0B50B8 800B44B8 8F392CF0 */ lw $t9, 0x2cf0($t9) +/* 0B50B8 800B44B8 8F392CF0 */ lw $t9, %lo(D_800E2CF0)($t9) /* 0B50BC 800B44BC 00034080 */ sll $t0, $v1, 2 /* 0B50C0 800B44C0 03284821 */ addu $t1, $t9, $t0 /* 0B50C4 800B44C4 8D22FFFC */ lw $v0, -4($t1) @@ -472,7 +472,7 @@ glabel func_800B3E64 /* 0B5180 800B4580 3C0E800E */ lui $t6, %hi(D_800E2CFC) # $t6, 0x800e /* 0B5184 800B4584 0083082A */ slt $at, $a0, $v1 /* 0B5188 800B4588 10200007 */ beqz $at, .L800B45A8 -/* 0B518C 800B458C 3C19800E */ lui $t9, 0x800e +/* 0B518C 800B458C 3C19800E */ lui $t9, %hi(D_800E2CFC) # $t9, 0x800e /* 0B5190 800B4590 8DCE2CFC */ lw $t6, %lo(D_800E2CFC)($t6) /* 0B5194 800B4594 00047880 */ sll $t7, $a0, 2 /* 0B5198 800B4598 01CFC021 */ addu $t8, $t6, $t7 @@ -481,7 +481,7 @@ glabel func_800B3E64 /* 0B51A4 800B45A4 00000000 */ nop .L800B45A8: -/* 0B51A8 800B45A8 8F392CFC */ lw $t9, 0x2cfc($t9) +/* 0B51A8 800B45A8 8F392CFC */ lw $t9, %lo(D_800E2CFC)($t9) /* 0B51AC 800B45AC 00034080 */ sll $t0, $v1, 2 /* 0B51B0 800B45B0 03284821 */ addu $t1, $t9, $t0 /* 0B51B4 800B45B4 8D22FFFC */ lw $v0, -4($t1) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B653C.s b/asm/non_matchings/unknown_0AEE70/func_800B653C.s index f4f4dc0f..5e6c866e 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B653C.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B653C.s @@ -50,7 +50,7 @@ glabel func_800B653C .L800B65F4: /* 0B71F4 800B65F4 24010009 */ li $at, 9 /* 0B71F8 800B65F8 12210090 */ beq $s1, $at, .L800B683C -/* 0B71FC 800B65FC 3C038012 */ lui $v1, 0x8012 +/* 0B71FC 800B65FC 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7200 800B6600 2401000A */ li $at, 10 /* 0B7204 800B6604 12210076 */ beq $s1, $at, .L800B67E0 /* 0B7208 800B6608 00000000 */ nop @@ -204,7 +204,7 @@ glabel func_800B653C /* 0B743C 800B683C 96440000 */ lhu $a0, ($s2) /* 0B7440 800B6840 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 /* 0B7444 800B6844 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) -/* 0B7448 800B6848 8C637CB4 */ lw $v1, 0x7cb4($v1) +/* 0B7448 800B6848 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B744C 800B684C 04810004 */ bgez $a0, .L800B6860 /* 0B7450 800B6850 3082001F */ andi $v0, $a0, 0x1f /* 0B7454 800B6854 10400002 */ beqz $v0, .L800B6860 diff --git a/asm/non_matchings/unknown_0B8920/func_800B8134.s b/asm/non_matchings/unknown_0B8920/func_800B8134.s index b1c15f88..48e6173f 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B8134.s +++ b/asm/non_matchings/unknown_0B8920/func_800B8134.s @@ -3,14 +3,14 @@ glabel func_800B8134 /* 0B8D38 800B8138 8C42A078 */ lw $v0, %lo(D_8012A078)($v0) /* 0B8D3C 800B813C 24030002 */ li $v1, 2 /* 0B8D40 800B8140 10620006 */ beq $v1, $v0, .L800B815C -/* 0B8D44 800B8144 3C058013 */ lui $a1, 0x8013 +/* 0B8D44 800B8144 3C058013 */ lui $a1, %hi(D_80129FC8) # $a1, 0x8013 /* 0B8D48 800B8148 908E0056 */ lbu $t6, 0x56($a0) /* 0B8D4C 800B814C 3C058013 */ lui $a1, %hi(D_80129FC8) # $a1, 0x8013 /* 0B8D50 800B8150 24A59FC8 */ addiu $a1, %lo(D_80129FC8) # addiu $a1, $a1, -0x6038 /* 0B8D54 800B8154 10000004 */ b .L800B8168 /* 0B8D58 800B8158 ACAE0000 */ sw $t6, ($a1) .L800B815C: -/* 0B8D5C 800B815C 24A59FC8 */ addiu $a1, $a1, -0x6038 +/* 0B8D5C 800B815C 24A59FC8 */ addiu $a1, %lo(D_80129FC8) # addiu $a1, $a1, -0x6038 /* 0B8D60 800B8160 240F0004 */ li $t7, 4 /* 0B8D64 800B8164 ACAF0000 */ sw $t7, ($a1) .L800B8168: diff --git a/asm/non_matchings/unknown_0B8920/func_800B9228.s b/asm/non_matchings/unknown_0B8920/func_800B9228.s index e99ae33e..85a87d38 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B9228.s +++ b/asm/non_matchings/unknown_0B8920/func_800B9228.s @@ -32,7 +32,7 @@ glabel func_800B9228 /* 0B9E98 800B9298 8DAD30D4 */ lw $t5, %lo(D_800E30D4)($t5) /* 0B9E9C 800B929C 3C05800E */ lui $a1, %hi(D_800E30DC) # $a1, 0x800e /* 0B9EA0 800B92A0 24A530DC */ addiu $a1, %lo(D_800E30DC) # addiu $a1, $a1, 0x30dc -/* 0B9EA4 800B92A4 3C018013 */ lui $at, 0x8013 +/* 0B9EA4 800B92A4 3C018013 */ lui $at, %hi(D_8012A1E8) # $at, 0x8013 /* 0B9EA8 800B92A8 00004812 */ mflo $t1 /* 0B9EAC 800B92AC 01095021 */ addu $t2, $t0, $t1 /* 0B9EB0 800B92B0 8D4B000C */ lw $t3, 0xc($t2) @@ -47,7 +47,7 @@ glabel func_800B9228 /* 0B9ED4 800B92D4 24030001 */ li $v1, 1 /* 0B9ED8 800B92D8 0004C040 */ sll $t8, $a0, 1 /* 0B9EDC 800B92DC 00380821 */ addu $at, $at, $t8 -/* 0B9EE0 800B92E0 A422A1E8 */ sh $v0, -0x5e18($at) +/* 0B9EE0 800B92E0 A422A1E8 */ sh $v0, %lo(D_8012A1E8)($at) /* 0B9EE4 800B92E4 24990001 */ addiu $t9, $a0, 1 /* 0B9EE8 800B92E8 ACB90000 */ sw $t9, ($a1) .L800B92EC: diff --git a/asm/non_matchings/unknown_0B8920/func_800BA288.s b/asm/non_matchings/unknown_0B8920/func_800BA288.s index 806adf42..72642229 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BA288.s +++ b/asm/non_matchings/unknown_0B8920/func_800BA288.s @@ -128,7 +128,7 @@ glabel func_800BA288 /* 0BB058 800BA458 008F7021 */ addu $t6, $a0, $t7 /* 0BB05C 800BA45C 01C33821 */ addu $a3, $t6, $v1 /* 0BB060 800BA460 90F90014 */ lbu $t9, 0x14($a3) -/* 0BB064 800BA464 3C038013 */ lui $v1, 0x8013 +/* 0BB064 800BA464 3C038013 */ lui $v1, %hi(D_8012A0E0) # $v1, 0x8013 /* 0BB068 800BA468 03254021 */ addu $t0, $t9, $a1 /* 0BB06C 800BA46C 29010080 */ slti $at, $t0, 0x80 /* 0BB070 800BA470 10200006 */ beqz $at, .L800BA48C @@ -140,7 +140,7 @@ glabel func_800BA288 /* 0BB088 800BA488 24420001 */ addiu $v0, $v0, 1 .L800BA48C: /* 0BB08C 800BA48C A0F10014 */ sb $s1, 0x14($a3) -/* 0BB090 800BA490 8C63A0E0 */ lw $v1, -0x5f20($v1) +/* 0BB090 800BA490 8C63A0E0 */ lw $v1, %lo(D_8012A0E0)($v1) /* 0BB094 800BA494 00000000 */ nop .L800BA498: /* 0BB098 800BA498 24420001 */ addiu $v0, $v0, 1 diff --git a/asm/non_matchings/unknown_0B8920/func_800BA4B8.s b/asm/non_matchings/unknown_0B8920/func_800BA4B8.s index 9c560bf2..27883dd9 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BA4B8.s +++ b/asm/non_matchings/unknown_0B8920/func_800BA4B8.s @@ -35,7 +35,7 @@ glabel func_800BA4B8 /* 0BB128 800BA528 8FAC005C */ lw $t4, 0x5c($sp) /* 0BB12C 800BA52C 332E000F */ andi $t6, $t9, 0xf /* 0BB130 800BA530 15C00073 */ bnez $t6, .L800BA700 -/* 0BB134 800BA534 3C038013 */ lui $v1, 0x8013 +/* 0BB134 800BA534 3C038013 */ lui $v1, %hi(D_80129FC0) # $v1, 0x8013 /* 0BB138 800BA538 3C038013 */ lui $v1, %hi(D_80129FC0) # $v1, 0x8013 /* 0BB13C 800BA53C 24639FC0 */ addiu $v1, %lo(D_80129FC0) # addiu $v1, $v1, -0x6040 /* 0BB140 800BA540 8C620000 */ lw $v0, ($v1) @@ -158,7 +158,7 @@ glabel func_800BA4B8 /* 0BB2F8 800BA6F8 10000078 */ b .L800BA8DC /* 0BB2FC 800BA6FC 00407825 */ move $t7, $v0 .L800BA700: -/* 0BB300 800BA700 24639FC0 */ addiu $v1, $v1, -0x6040 +/* 0BB300 800BA700 24639FC0 */ addiu $v1, %lo(D_80129FC0) # addiu $v1, $v1, -0x6040 /* 0BB304 800BA704 8C620000 */ lw $v0, ($v1) /* 0BB308 800BA708 3C018000 */ lui $at, (0x80000020 >> 16) # lui $at, 0x8000 /* 0BB30C 800BA70C 244E0008 */ addiu $t6, $v0, 8 diff --git a/asm/non_matchings/unknown_0B8920/func_800BA8E4.s b/asm/non_matchings/unknown_0B8920/func_800BA8E4.s index 43c646c3..be804801 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BA8E4.s +++ b/asm/non_matchings/unknown_0B8920/func_800BA8E4.s @@ -58,7 +58,7 @@ glabel func_800BA8E4 /* 0BB5B8 800BA9B8 8FF8004C */ lw $t8, 0x4c($ra) /* 0BB5BC 800BA9BC 3C190001 */ lui $t9, 1 /* 0BB5C0 800BA9C0 1300006F */ beqz $t8, .L800BAB80 -/* 0BB5C4 800BA9C4 3C0F8013 */ lui $t7, 0x8013 +/* 0BB5C4 800BA9C4 3C0F8013 */ lui $t7, %hi(D_8012A07C) # $t7, 0x8013 /* 0BB5C8 800BA9C8 8E270000 */ lw $a3, ($s1) /* 0BB5CC 800BA9CC 3C0EB600 */ lui $t6, 0xb600 /* 0BB5D0 800BA9D0 24F90008 */ addiu $t9, $a3, 8 @@ -165,7 +165,7 @@ glabel func_800BA8E4 /* 0BB75C 800BAB5C ACF80004 */ sw $t8, 4($a3) .L800BAB60: /* 0BB760 800BAB60 8E270000 */ lw $a3, ($s1) -/* 0BB764 800BAB64 3C0FFB00 */ lui $t7, %hi(D_FAFFA07C) # $t7, 0xfb00 +/* 0BB764 800BAB64 3C0FFB00 */ lui $t7, 0xfb00 /* 0BB768 800BAB68 24F90008 */ addiu $t9, $a3, 8 /* 0BB76C 800BAB6C AE390000 */ sw $t9, ($s1) /* 0BB770 800BAB70 ACE30004 */ sw $v1, 4($a3) @@ -179,7 +179,7 @@ glabel func_800BA8E4 /* 0BB78C 800BAB8C AE2E0000 */ sw $t6, ($s1) /* 0BB790 800BAB90 ACF90004 */ sw $t9, 4($a3) /* 0BB794 800BAB94 ACF80000 */ sw $t8, ($a3) -/* 0BB798 800BAB98 8DEFA07C */ lw $t7, %lo(D_FAFFA07C)($t7) +/* 0BB798 800BAB98 8DEFA07C */ lw $t7, %lo(D_8012A07C)($t7) /* 0BB79C 800BAB9C 3C048013 */ lui $a0, %hi(D_8012A080) # $a0, 0x8013 /* 0BB7A0 800BABA0 91E50007 */ lbu $a1, 7($t7) /* 0BB7A4 800BABA4 8C84A080 */ lw $a0, %lo(D_8012A080)($a0) diff --git a/asm/non_matchings/unknown_0B8920/func_800BBE08.s b/asm/non_matchings/unknown_0B8920/func_800BBE08.s index c204778a..d25bc24e 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BBE08.s +++ b/asm/non_matchings/unknown_0B8920/func_800BBE08.s @@ -85,7 +85,7 @@ glabel func_800BBE08 /* 0BCB3C 800BBF3C 00E1C024 */ and $t8, $a3, $at /* 0BCB40 800BBF40 00187702 */ srl $t6, $t8, 0x1c /* 0BCB44 800BBF44 19C00007 */ blez $t6, .L800BBF64 -/* 0BCB48 800BBF48 3C01800E */ lui $at, 0x800e +/* 0BCB48 800BBF48 3C01800E */ lui $at, %hi(D_800E3180) # $at, 0x800e /* 0BCB4C 800BBF4C 000E7880 */ sll $t7, $t6, 2 /* 0BCB50 800BBF50 00AFC821 */ addu $t9, $a1, $t7 /* 0BCB54 800BBF54 8F380070 */ lw $t8, 0x70($t9) diff --git a/asm/non_matchings/unknown_0B8920/func_800BCC70.s b/asm/non_matchings/unknown_0B8920/func_800BCC70.s index ad586d2c..5d648808 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BCC70.s +++ b/asm/non_matchings/unknown_0B8920/func_800BCC70.s @@ -222,7 +222,7 @@ glabel func_800BCC70 /* 0BDBB8 800BCFB8 006FC004 */ sllv $t8, $t7, $v1 /* 0BDBBC 800BCFBC 030E7824 */ and $t7, $t8, $t6 /* 0BDBC0 800BCFC0 11E00091 */ beqz $t7, .L800BD208 -/* 0BDBC4 800BCFC4 3C0E800E */ lui $t6, 0x800e +/* 0BDBC4 800BCFC4 3C0E800E */ lui $t6, %hi(D_800E317C) # $t6, 0x800e /* 0BDBC8 800BCFC8 3C0E8013 */ lui $t6, %hi(D_8012A0D8) # $t6, 0x8013 /* 0BDBCC 800BCFCC 8DCEA0D8 */ lw $t6, %lo(D_8012A0D8)($t6) /* 0BDBD0 800BCFD0 8FB800A4 */ lw $t8, 0xa4($sp) @@ -380,7 +380,7 @@ glabel func_800BCC70 /* 0BDE00 800BD200 10000014 */ b .L800BD254 /* 0BDE04 800BD204 8FB9018C */ lw $t9, 0x18c($sp) .L800BD208: -/* 0BDE08 800BD208 8DCE317C */ lw $t6, 0x317c($t6) +/* 0BDE08 800BD208 8DCE317C */ lw $t6, %lo(D_800E317C)($t6) /* 0BDE0C 800BD20C 00005025 */ move $t2, $zero /* 0BDE10 800BD210 19C00010 */ blez $t6, .L800BD254 /* 0BDE14 800BD214 8FB9018C */ lw $t9, 0x18c($sp) diff --git a/asm/non_matchings/unknown_0B8920/func_800BF634.s b/asm/non_matchings/unknown_0B8920/func_800BF634.s index f64be6ea..b5319fca 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BF634.s +++ b/asm/non_matchings/unknown_0B8920/func_800BF634.s @@ -150,7 +150,8 @@ glabel func_800BF634 /* 0C0448 800BF848 E4AA0014 */ swc1 $f10, 0x14($a1) /* 0C044C 800BF84C E4A8000C */ swc1 $f8, 0xc($a1) /* 0C0450 800BF850 8FAE0010 */ lw $t6, 0x10($sp) -/* 0C0454 800BF854 3C01800F */ lui $at, 0x800f +# Used to access D_800E92B0 and D_800E92B4. +/* 0C0454 800BF854 3C01800F */ lui $at, %hi(D_800E92B0) # $at, 0x800f /* 0C0458 800BF858 A4AE001A */ sh $t6, 0x1a($a1) /* 0C045C 800BF85C 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 0C0460 800BF860 C7A00014 */ lwc1 $f0, 0x14($sp) @@ -177,7 +178,7 @@ glabel func_800BF634 /* 0C04B4 800BF8B4 44803000 */ mtc1 $zero, $f6 /* 0C04B8 800BF8B8 24190001 */ li $t9, 1 /* 0C04BC 800BF8BC 46262181 */ sub.d $f6, $f4, $f6 -/* 0C04C0 800BF8C0 3C018000 */ lui $at, %hi(D_7FFF92B4) # $at, 0x8000 +/* 0C04C0 800BF8C0 3C018000 */ lui $at, 0x8000 /* 0C04C4 800BF8C4 44D9F800 */ ctc1 $t9, $31 /* 0C04C8 800BF8C8 00000000 */ nop /* 0C04CC 800BF8CC 462031A4 */ cvt.w.d $f6, $f6 @@ -202,8 +203,8 @@ glabel func_800BF634 /* 0C050C 800BF90C 10000029 */ b .L800BF9B4 /* 0C0510 800BF910 ACB9001C */ sw $t9, 0x1c($a1) .L800BF914: -/* 0C0514 800BF914 C42B92B0 */ lwc1 $f11, %lo(D_7FFF92B0)($at) -/* 0C0518 800BF918 C42A92B4 */ lwc1 $f10, %lo(D_7FFF92B4)($at) +/* 0C0514 800BF914 C42B92B0 */ lwc1 $f11, %lo(D_800E92B0)($at) +/* 0C0518 800BF918 C42A92B4 */ lwc1 $f10, %lo(D_800E92B4)($at) /* 0C051C 800BF91C 46000221 */ cvt.d.s $f8, $f0 /* 0C0520 800BF920 462A4402 */ mul.d $f16, $f8, $f10 /* 0C0524 800BF924 240C0001 */ li $t4, 1 @@ -467,10 +468,12 @@ glabel func_800BF634 /* 0C08C4 800BFCC4 E4840004 */ swc1 $f4, 4($a0) /* 0C08C8 800BFCC8 E4880028 */ swc1 $f8, 0x28($a0) /* 0C08CC 800BFCCC 8DCE0300 */ lw $t6, %lo(osTvType)($t6) -/* 0C08D0 800BFCD0 3C01800F */ lui $at, 0x800f +# Used to access D_800E92C0 and D_800E92C4. +/* 0C08D0 800BFCD0 3C01800F */ lui $at, %hi(D_800E92C0) # $at, 0x800f /* 0C08D4 800BFCD4 15C0002B */ bnez $t6, .L800BFD84 /* 0C08D8 800BFCD8 00000000 */ nop -/* 0C08DC 800BFCDC 3C01800F */ lui $at, %hi(D_800E92BC) # $at, 0x800f +# Used to access D_800E92B8 and D_800E92BC. +/* 0C08DC 800BFCDC 3C01800F */ lui $at, %hi(D_800E92B8) # $at, 0x800f /* 0C08E0 800BFCE0 C48A0028 */ lwc1 $f10, 0x28($a0) /* 0C08E4 800BFCE4 C42592B8 */ lwc1 $f5, %lo(D_800E92B8)($at) /* 0C08E8 800BFCE8 C42492BC */ lwc1 $f4, %lo(D_800E92BC)($at) @@ -491,7 +494,7 @@ glabel func_800BF634 /* 0C0924 800BFD24 44804000 */ mtc1 $zero, $f8 /* 0C0928 800BFD28 24180001 */ li $t8, 1 /* 0C092C 800BFD2C 46283201 */ sub.d $f8, $f6, $f8 -/* 0C0930 800BFD30 3C018000 */ lui $at, %hi(D_7FFF92C4) # $at, 0x8000 +/* 0C0930 800BFD30 3C018000 */ lui $at, 0x8000 /* 0C0934 800BFD34 44D8F800 */ ctc1 $t8, $31 /* 0C0938 800BFD38 00000000 */ nop /* 0C093C 800BFD3C 46204224 */ cvt.w.d $f8, $f8 @@ -517,8 +520,8 @@ glabel func_800BF634 /* 0C0980 800BFD80 AC98001C */ sw $t8, 0x1c($a0) .L800BFD84: /* 0C0984 800BFD84 C48A0028 */ lwc1 $f10, 0x28($a0) -/* 0C0988 800BFD88 C42592C0 */ lwc1 $f5, %lo(D_7FFF92C0)($at) -/* 0C098C 800BFD8C C42492C4 */ lwc1 $f4, %lo(D_7FFF92C4)($at) +/* 0C0988 800BFD88 C42592C0 */ lwc1 $f5, %lo(D_800E92C0)($at) +/* 0C098C 800BFD8C C42492C4 */ lwc1 $f4, %lo(D_800E92C4)($at) /* 0C0990 800BFD90 460054A1 */ cvt.d.s $f18, $f10 /* 0C0994 800BFD94 46249182 */ mul.d $f6, $f18, $f4 /* 0C0998 800BFD98 24080001 */ li $t0, 1 diff --git a/asm/non_matchings/unknown_0B8920/func_800C05C8.s b/asm/non_matchings/unknown_0B8920/func_800C05C8.s index c83d1c74..ea38afa7 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C05C8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C05C8.s @@ -10,10 +10,10 @@ glabel func_800C05C8 /* 0C11E8 800C05E8 AFBF001C */ sw $ra, 0x1c($sp) /* 0C11EC 800C05EC 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 0C11F0 800C05F0 8DEF0300 */ lw $t7, %lo(osTvType)($t7) -/* 0C11F4 800C05F4 3C01800F */ lui $at, 0x800f +/* 0C11F4 800C05F4 3C01800F */ lui $at, %hi(D_800E930C) # $at, 0x800f /* 0C11F8 800C05F8 15E00008 */ bnez $t7, .L800C061C /* 0C11FC 800C05FC 00000000 */ nop -/* 0C1200 800C0600 3C01800F */ lui $at, %hi(D_800E930C) # $at, 0x800f +/* 0C1200 800C0600 3C01800F */ lui $at, %hi(D_800E9308) # $at, 0x800f /* 0C1204 800C0604 C42C9308 */ lwc1 $f12, %lo(D_800E9308)($at) /* 0C1208 800C0608 0C019FC8 */ jal func_80067F20 /* 0C120C 800C060C AFA60028 */ sw $a2, 0x28($sp) diff --git a/asm/non_matchings/unknown_0B8920/func_800C0780.s b/asm/non_matchings/unknown_0B8920/func_800C0780.s index 3bd86706..cdaf0cd9 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C0780.s +++ b/asm/non_matchings/unknown_0B8920/func_800C0780.s @@ -1,6 +1,6 @@ glabel func_800C0780 /* 0C1380 800C0780 908E0000 */ lbu $t6, ($a0) -/* 0C1384 800C0784 3C018013 */ lui $at, 0x8013 +/* 0C1384 800C0784 3C018013 */ lui $at, %hi(D_8012A750) # $at, 0x8013 /* 0C1388 800C0788 31CF0080 */ andi $t7, $t6, 0x80 /* 0C138C 800C078C 11E00015 */ beqz $t7, .L800C07E4 /* 0C1390 800C0790 24080001 */ li $t0, 1 @@ -22,7 +22,7 @@ glabel func_800C0780 .L800C07D0: /* 0C13D0 800C07D0 00000000 */ nop /* 0C13D4 800C07D4 460A3483 */ div.s $f18, $f6, $f10 -/* 0C13D8 800C07D8 3C018013 */ lui $at, %hi(D_8012A750) # $at, 0x8013 +/* 0C13D8 800C07D8 3C018013 */ lui $at, %hi(D_8012A754) # $at, 0x8013 /* 0C13DC 800C07DC 10000012 */ b .L800C0828 /* 0C13E0 800C07E0 E432A754 */ swc1 $f18, %lo(D_8012A754)($at) .L800C07E4: diff --git a/asm/non_matchings/unknown_0B8920/func_800C4DA0.s b/asm/non_matchings/unknown_0B8920/func_800C4DA0.s index ad82dd9c..d657ba41 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C4DA0.s +++ b/asm/non_matchings/unknown_0B8920/func_800C4DA0.s @@ -1,6 +1,6 @@ glabel func_800C4DA0 /* 0C59A0 800C4DA0 14800003 */ bnez $a0, .L800C4DB0 -/* 0C59A4 800C4DA4 3C188013 */ lui $t8, 0x8013 +/* 0C59A4 800C4DA4 3C188013 */ lui $t8, %hi(D_8012A7E4) # $t8, 0x8013 /* 0C59A8 800C4DA8 03E00008 */ jr $ra /* 0C59AC 800C4DAC 00001025 */ move $v0, $zero @@ -13,7 +13,7 @@ glabel func_800C4DA0 /* 0C59C4 800C4DC4 91C6001D */ lbu $a2, 0x1d($t6) /* 0C59C8 800C4DC8 00000000 */ nop .L800C4DCC: -/* 0C59CC 800C4DCC 8F18A7E4 */ lw $t8, -0x581c($t8) +/* 0C59CC 800C4DCC 8F18A7E4 */ lw $t8, %lo(D_8012A7E4)($t8) /* 0C59D0 800C4DD0 90990000 */ lbu $t9, ($a0) /* 0C59D4 800C4DD4 00067A80 */ sll $t7, $a2, 0xa /* 0C59D8 800C4DD8 1320003D */ beqz $t9, .L800C4ED0 diff --git a/asm/non_matchings/unknown_0B8920/func_800C5B58.s b/asm/non_matchings/unknown_0B8920/func_800C5B58.s index 6d342178..1bfbb0c2 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C5B58.s +++ b/asm/non_matchings/unknown_0B8920/func_800C5B58.s @@ -126,9 +126,9 @@ glabel func_800C5B58 /* 0C693C 800C5D3C 3C0D800E */ lui $t5, %hi(D_800E3710) # $t5, 0x800e /* 0C6940 800C5D40 AC4B0004 */ sw $t3, 4($v0) /* 0C6944 800C5D44 81AD3710 */ lb $t5, %lo(D_800E3710)($t5) -/* 0C6948 800C5D48 3C0E800E */ lui $t6, 0x800e +/* 0C6948 800C5D48 3C0E800E */ lui $t6, %hi(D_800E3710) # $t6, 0x800e /* 0C694C 800C5D4C 05A00023 */ bltz $t5, .L800C5DDC -/* 0C6950 800C5D50 25D03710 */ addiu $s0, $t6, 0x3710 +/* 0C6950 800C5D50 25D03710 */ addiu $s0, $t6, %lo(D_800E3710) /* 0C6954 800C5D54 82020000 */ lb $v0, ($s0) /* 0C6958 800C5D58 00000000 */ nop .L800C5D5C: diff --git a/data/unknown_043920.rodata.s b/data/unknown_043920.rodata.s index 311560b3..7623e2fb 100644 --- a/data/unknown_043920.rodata.s +++ b/data/unknown_043920.rodata.s @@ -1118,6 +1118,8 @@ glabel D_800E69A4 glabel D_800E69A8 .word 0x3CA3D70A + +glabel D_800E69AC .word 0xBCA3D70A glabel D_800E69B0 diff --git a/data/unknown_072E50.rodata.s b/data/unknown_072E50.rodata.s index 97f488c6..e4ac95b7 100644 --- a/data/unknown_072E50.rodata.s +++ b/data/unknown_072E50.rodata.s @@ -28,6 +28,8 @@ glabel D_800E7640 glabel D_800E7650 .aligned_text "DKRACING-TIMES" + +glabel D_800E7660 .aligned_text "DKRACING-TIMES" glabel D_800E7670 diff --git a/data/unknown_080500.rodata.s b/data/unknown_080500.rodata.s index 20a633da..9f729915 100644 --- a/data/unknown_080500.rodata.s +++ b/data/unknown_080500.rodata.s @@ -165,6 +165,7 @@ glabel D_800E8208 .aligned_text "OK?" +glabel D_800E820C .aligned_text "~" glabel D_800E8210 @@ -302,6 +303,8 @@ glabel D_800E83AC glabel D_800E83B0 .word 0x3F2B851F + +glabel D_800E83B4 .word 0x40351EB8 glabel D_800E83B8 diff --git a/data/unknown_0B8920.rodata.s b/data/unknown_0B8920.rodata.s index 42b113a4..bfa884c6 100644 --- a/data/unknown_0B8920.rodata.s +++ b/data/unknown_0B8920.rodata.s @@ -24,7 +24,11 @@ glabel D_800E92A8 glabel D_800E92AC .word 0x47AE147B + +glabel D_800E92B0 .word 0x40D11111 + +glabel D_800E92B4 .word 0x47AE147B glabel D_800E92B8 @@ -32,7 +36,11 @@ glabel D_800E92B8 glabel D_800E92BC .word 0x47AE147B + +glabel D_800E92C0 .word 0x40D11111 + +glabel D_800E92C4 .word 0x47AE147B .word 0x00000000 .word 0x00000000 diff --git a/data/unknown_0CA530.rodata.s b/data/unknown_0CA530.rodata.s index be84b072..989b95d2 100644 --- a/data/unknown_0CA530.rodata.s +++ b/data/unknown_0CA530.rodata.s @@ -10,6 +10,8 @@ glabel D_800E94B0 .word 0x412E8480 .word 0x00000000 + +glabel D_800E94B8 .word 0x412E8480 .word 0x00000000 diff --git a/data/unknown_0CA9A0.rodata.s b/data/unknown_0CA9A0.rodata.s index ca9bc42f..cee78d89 100644 --- a/data/unknown_0CA9A0.rodata.s +++ b/data/unknown_0CA9A0.rodata.s @@ -63,6 +63,8 @@ glabel D_800E9600 .word 0x800CC144 .word 0x800CC104 .word 0x00000000 + +glabel D_800E9628 .word 0x3FFFFFD6 .word 0x0E94EE39 .word 0x3FFFFEB0 diff --git a/data/unknown_0D3020.rodata.s b/data/unknown_0D3020.rodata.s index 89fa6ac6..7bcc0107 100644 --- a/data/unknown_0D3020.rodata.s +++ b/data/unknown_0D3020.rodata.s @@ -18,12 +18,20 @@ glabel D_800E97C0 .word 0xEEA56814 .word 0x3EC5DBDF .word 0x0E314BFE + +glabel D_800E97E8 .word 0x3FD45F30 .word 0x6DC9C883 + +glabel D_800E97F0 .word 0x400921FB .word 0x50000000 + +glabel D_800E97F8 .word 0x3E6110B4 .word 0x611A6263 + +glabel D_800E9800 .word 0x00000000 .word 0x00000000 .word 0x00000000 @@ -40,12 +48,20 @@ glabel D_800E9810 .word 0xEEA56814 .word 0x3EC5DBDF .word 0x0E314BFE + +glabel D_800E9838 .word 0x3FD45F30 .word 0x6DC9C883 + +glabel D_800E9840 .word 0x400921FB .word 0x50000000 + +glabel D_800E9848 .word 0x3E6110B4 .word 0x611A6263 + +glabel D_800E9850 .word 0x00000000 .word 0x00000000 .word 0x00000000 @@ -79,8 +95,9 @@ glabel D_800E98AC glabel D_800E98B0 .word 0x30000000 - .word 0x00000000 + +glabel D_800E98B8 .word 0x4197D784 .word 0x00000000 diff --git a/data/unknown_0D3160.rodata.s b/data/unknown_0D3160.rodata.s index f09cde4a..b698a160 100644 --- a/data/unknown_0D3160.rodata.s +++ b/data/unknown_0D3160.rodata.s @@ -7,6 +7,7 @@ .section .rodata +glabel D_800E9640 .word 0x3F91DF46 .word 0x9D353918 .word 0x00000000 diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s index f6674ab6..b7b7375f 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s +++ b/lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s @@ -1,9 +1,9 @@ glabel func_800C8284 /* 0C8E84 800C8284 8C8E0000 */ lw $t6, ($a0) /* 0C8E88 800C8288 44856000 */ mtc1 $a1, $f12 -/* 0C8E8C 800C828C 3C01800F */ lui $at, 0x800f +/* 0C8E8C 800C828C 3C01800F */ lui $at, %hi(D_800E94B0) # $at, 0x800f /* 0C8E90 800C8290 8DCF0040 */ lw $t7, 0x40($t6) -/* 0C8E94 800C8294 D42694B0 */ ldc1 $f6, -0x6b50($at) +/* 0C8E94 800C8294 D42694B0 */ ldc1 $f6, %lo(D_800E94B0)($at) /* 0C8E98 800C8298 46006121 */ cvt.d.s $f4, $f12 /* 0C8E9C 800C829C 448F5000 */ mtc1 $t7, $f10 /* 0C8EA0 800C82A0 46262202 */ mul.d $f8, $f4, $f6 diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s index 150108f6..ea7cab8e 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s +++ b/lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s @@ -21,8 +21,8 @@ glabel func_800C8380 /* 0C8FC8 800C83C8 00000000 */ nop /* 0C8FCC 800C83CC 46068400 */ add.s $f16, $f16, $f6 .L800C83D0: -/* 0C8FD0 800C83D0 3C01800F */ lui $at, 0x800f -/* 0C8FD4 800C83D4 D43294B8 */ ldc1 $f18, -0x6b48($at) +/* 0C8FD0 800C83D0 3C01800F */ lui $at, %hi(D_800E94B8) # $at, 0x800f +/* 0C8FD4 800C83D4 D43294B8 */ ldc1 $f18, %lo(D_800E94B8)($at) /* 0C8FD8 800C83D8 460082A1 */ cvt.d.s $f10, $f16 /* 0C8FDC 800C83DC 46325202 */ mul.d $f8, $f10, $f18 /* 0C8FE0 800C83E0 46282183 */ div.d $f6, $f4, $f8 diff --git a/lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s b/lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s index a0bde7af..f2e114f5 100644 --- a/lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s +++ b/lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s @@ -2,8 +2,8 @@ glabel alCents2Ratio /* 0CA5E0 800C99E0 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 0CA5E4 800C99E4 44811000 */ mtc1 $at, $f2 /* 0CA5E8 800C99E8 04800004 */ bltz $a0, .L800C99FC -/* 0CA5EC 800C99EC 3C01800F */ lui $at, 0x800f -/* 0CA5F0 800C99F0 3C01800F */ lui $at, %hi(D_800E94C4) # $at, 0x800f +/* 0CA5EC 800C99EC 3C01800F */ lui $at, %hi(D_800E94C4) # $at, 0x800f +/* 0CA5F0 800C99F0 3C01800F */ lui $at, %hi(D_800E94C0) # $at, 0x800f /* 0CA5F4 800C99F4 10000003 */ b .L800C9A04 /* 0CA5F8 800C99F8 C42094C0 */ lwc1 $f0, %lo(D_800E94C0)($at) .L800C99FC: diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s index c9b3a3ea..d6965aea 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s @@ -41,8 +41,8 @@ glabel alResamplePull /* 0CCE14 800CC214 AC4D0004 */ sw $t5, 4($v0) /* 0CCE18 800CC218 C5020018 */ lwc1 $f2, 0x18($t0) .L800CC21C: -/* 0CCE1C 800CC21C 3C01800F */ lui $at, 0x800f -/* 0CCE20 800CC220 D4249628 */ ldc1 $f4, -0x69d8($at) +/* 0CCE1C 800CC21C 3C01800F */ lui $at, %hi(D_800E9628) # $at, 0x800f +/* 0CCE20 800CC220 D4249628 */ ldc1 $f4, %lo(D_800E9628)($at) /* 0CCE24 800CC224 460011A1 */ cvt.d.s $f6, $f2 /* 0CCE28 800CC228 3C01800F */ lui $at, 0x800f /* 0CCE2C 800CC22C 4626203C */ c.lt.d $f4, $f6 diff --git a/lib/asm/non_matchings/unknown_0CCF90/guPerspectiveF.s b/lib/asm/non_matchings/unknown_0CCF90/guPerspectiveF.s index 39c9e489..c40711e2 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/guPerspectiveF.s +++ b/lib/asm/non_matchings/unknown_0CCF90/guPerspectiveF.s @@ -8,8 +8,8 @@ glabel guPerspectiveF /* 0CD538 800CC938 0C035250 */ jal guMtxIdentF /* 0CD53C 800CC93C E7AE0038 */ swc1 $f14, 0x38($sp) /* 0CD540 800CC940 C7AE0038 */ lwc1 $f14, 0x38($sp) -/* 0CD544 800CC944 3C01800F */ li $at, 0x800F0000 # -0.000000 -/* 0CD548 800CC948 D4269640 */ ldc1 $f6, -0x69c0($at) +/* 0CD544 800CC944 3C01800F */ lui $at, %hi(D_800E9640) # $at, 0x800f +/* 0CD548 800CC948 D4269640 */ ldc1 $f6, %lo(D_800E9640)($at) /* 0CD54C 800CC94C 46007121 */ cvt.d.s $f4, $f14 /* 0CD550 800CC950 3C014000 */ li $at, 0x40000000 # 2.000000 /* 0CD554 800CC954 46262202 */ mul.d $f8, $f4, $f6 diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s index 77fd000b..64272f81 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s +++ b/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s @@ -5,7 +5,7 @@ glabel func_800CCEE8 .L800CCEF4: /* 0CDAF4 800CCEF4 8FAE0000 */ lw $t6, ($sp) /* 0CDAF8 800CCEF8 8FB80000 */ lw $t8, ($sp) -/* 0CDAFC 800CCEFC 3C018013 */ lui $at, %hi(D_8012CD50) #$at, 0x8013 +/* 0CDAFC 800CCEFC 3C018013 */ lui $at, %hi(D_8012CD50) # $at, 0x8013 /* 0CDB00 800CCF00 000E7880 */ sll $t7, $t6, 2 /* 0CDB04 800CCF04 002F0821 */ addu $at, $at, $t7 /* 0CDB08 800CCF08 AC20CD50 */ sw $zero, %lo(D_8012CD50)($at) diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s b/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s index 4f845836..d31c9226 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s +++ b/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s @@ -7,7 +7,7 @@ glabel func_800CD14C .L800CD160: /* 0CDD60 800CD160 8FAF0000 */ lw $t7, ($sp) /* 0CDD64 800CD164 8FB90000 */ lw $t9, ($sp) -/* 0CDD68 800CD168 3C018013 */ lui $at, %hi(D_8012CD50) #$at, 0x8013 +/* 0CDD68 800CD168 3C018013 */ lui $at, %hi(D_8012CD50) # $at, 0x8013 /* 0CDD6C 800CD16C 000FC080 */ sll $t8, $t7, 2 /* 0CDD70 800CD170 00380821 */ addu $at, $at, $t8 /* 0CDD74 800CD174 AC20CD50 */ sw $zero, %lo(D_8012CD50)($at) diff --git a/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s b/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s index a9b3465c..ef00afec 100644 --- a/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s +++ b/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s @@ -7,7 +7,7 @@ glabel __osPfsRequestData .L800CD444: /* 0CE044 800CD444 8FAE0000 */ lw $t6, ($sp) /* 0CE048 800CD448 8FB80000 */ lw $t8, ($sp) -/* 0CE04C 800CD44C 3C018013 */ lui $at, %hi(__osPfsPifRam) #$at, 0x8013 +/* 0CE04C 800CD44C 3C018013 */ lui $at, %hi(__osPfsPifRam) # $at, 0x8013 /* 0CE050 800CD450 000E7880 */ sll $t7, $t6, 2 /* 0CE054 800CD454 002F0821 */ addu $at, $at, $t7 /* 0CE058 800CD458 AC20CDE0 */ sw $zero, %lo(__osPfsPifRam)($at) diff --git a/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s b/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s index 7afed174..7b794ab7 100644 --- a/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s +++ b/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s @@ -11,7 +11,7 @@ glabel __osPackRamWriteData .L800CDB44: /* 0CE744 800CDB44 8FAF0018 */ lw $t7, 0x18($sp) /* 0CE748 800CDB48 8FB90018 */ lw $t9, 0x18($sp) -/* 0CE74C 800CDB4C 3C018013 */ lui $at, %hi(__osPfsPifRam) #$at, 0x8013 +/* 0CE74C 800CDB4C 3C018013 */ lui $at, %hi(__osPfsPifRam) # $at, 0x8013 /* 0CE750 800CDB50 000FC080 */ sll $t8, $t7, 2 /* 0CE754 800CDB54 00380821 */ addu $at, $at, $t8 /* 0CE758 800CDB58 AC20CDE0 */ sw $zero, %lo(__osPfsPifRam)($at) diff --git a/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s b/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s index 16e48aca..9d6cd6ab 100644 --- a/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s +++ b/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s @@ -10,7 +10,7 @@ glabel __osPackRamReadData .L800CDF04: /* 0CEB04 800CDF04 8FAF0018 */ lw $t7, 0x18($sp) /* 0CEB08 800CDF08 8FB90018 */ lw $t9, 0x18($sp) -/* 0CEB0C 800CDF0C 3C018013 */ lui $at, %hi(__osPfsPifRam) #$at, 0x8013 +/* 0CEB0C 800CDF0C 3C018013 */ lui $at, %hi(__osPfsPifRam) # $at, 0x8013 /* 0CEB10 800CDF10 000FC080 */ sll $t8, $t7, 2 /* 0CEB14 800CDF14 00380821 */ addu $at, $at, $t8 /* 0CEB18 800CDF18 AC20CDE0 */ sw $zero, %lo(__osPfsPifRam)($at) diff --git a/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s b/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s index 9464c0f8..0183b29b 100644 --- a/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s +++ b/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s @@ -11,7 +11,7 @@ glabel __osEepStatus .L800CE860: /* 0CF460 800CE860 8FAF0028 */ lw $t7, 0x28($sp) /* 0CF464 800CE864 8FB90028 */ lw $t9, 0x28($sp) -/* 0CF468 800CE868 3C018013 */ lui $at, %hi(D_8012CE40) #$at, 0x8013 +/* 0CF468 800CE868 3C018013 */ lui $at, %hi(D_8012CE40) # $at, 0x8013 /* 0CF46C 800CE86C 000FC080 */ sll $t8, $t7, 2 /* 0CF470 800CE870 00380821 */ addu $at, $at, $t8 /* 0CF474 800CE874 AC20CE40 */ sw $zero, %lo(D_8012CE40)($at) diff --git a/lib/asm/non_matchings/unknown_0D3020/_Ldtob.s b/lib/asm/non_matchings/unknown_0D3020/_Ldtob.s index eb464a9e..5d88caa2 100644 --- a/lib/asm/non_matchings/unknown_0D3020/_Ldtob.s +++ b/lib/asm/non_matchings/unknown_0D3020/_Ldtob.s @@ -229,8 +229,8 @@ glabel _Ldtob /* 0D7E34 800D7234 1A800008 */ blez $s4, .L800D7258 /* 0D7E38 800D7238 00000000 */ nop /* 0D7E3C 800D723C 44915000 */ mtc1 $s1, $f10 -/* 0D7E40 800D7240 3C01800F */ lui $at, 0x800f -/* 0D7E44 800D7244 D42898B8 */ ldc1 $f8, -0x6748($at) +/* 0D7E40 800D7240 3C01800F */ lui $at, %hi(D_800E98B8) # $at, 0x800f +/* 0D7E44 800D7244 D42898B8 */ ldc1 $f8, %lo(D_800E98B8)($at) /* 0D7E48 800D7248 46805121 */ cvt.d.w $f4, $f10 /* 0D7E4C 800D724C 4624A181 */ sub.d $f6, $f20, $f4 /* 0D7E50 800D7250 46283502 */ mul.d $f20, $f6, $f8 diff --git a/lib/asm/non_matchings/unknown_0D3020/cosf.s b/lib/asm/non_matchings/unknown_0D3020/cosf.s index f2f95704..0222e3d0 100644 --- a/lib/asm/non_matchings/unknown_0D3020/cosf.s +++ b/lib/asm/non_matchings/unknown_0D3020/cosf.s @@ -13,14 +13,14 @@ glabel cosf /* 0D56DC 800D4ADC 44819800 */ mtc1 $at, $f19 /* 0D56E0 800D4AE0 4606203C */ c.lt.s $f4, $f6 /* 0D56E4 800D4AE4 C7A00000 */ lwc1 $f0, ($sp) -/* 0D56E8 800D4AE8 3C01800F */ lui $at, 0x800f +/* 0D56E8 800D4AE8 3C01800F */ lui $at, %hi(D_800E97E8) # $at, 0x800f /* 0D56EC 800D4AEC 45020004 */ bc1fl .L800D4B00 /* 0D56F0 800D4AF0 46000007 */ neg.s $f0, $f0 /* 0D56F4 800D4AF4 10000002 */ b .L800D4B00 /* 0D56F8 800D4AF8 46003006 */ mov.s $f0, $f6 /* 0D56FC 800D4AFC 46000007 */ neg.s $f0, $f0 .L800D4B00: -/* 0D5700 800D4B00 D42897E8 */ ldc1 $f8, -0x6818($at) +/* 0D5700 800D4B00 D42897E8 */ ldc1 $f8, %lo(D_800E97E8)($at) /* 0D5704 800D4B04 46000321 */ cvt.d.s $f12, $f0 /* 0D5708 800D4B08 44809000 */ mtc1 $zero, $f18 /* 0D570C 800D4B0C 46286282 */ mul.d $f10, $f12, $f8 @@ -43,11 +43,11 @@ glabel cosf /* 0D574C 800D4B4C 00000000 */ nop /* 0D5750 800D4B50 44823000 */ mtc1 $v0, $f6 .L800D4B54: -/* 0D5754 800D4B54 3C01800F */ lui $at, 0x800f -/* 0D5758 800D4B58 D42A97F0 */ ldc1 $f10, -0x6810($at) +/* 0D5754 800D4B54 3C01800F */ lui $at, %hi(D_800E97F0) # $at, 0x800f +/* 0D5758 800D4B58 D42A97F0 */ ldc1 $f10, %lo(D_800E97F0)($at) /* 0D575C 800D4B5C 46803221 */ cvt.d.w $f8, $f6 -/* 0D5760 800D4B60 3C01800F */ lui $at, 0x800f -/* 0D5764 800D4B64 D42697F8 */ ldc1 $f6, -0x6808($at) +/* 0D5760 800D4B60 3C01800F */ lui $at, %hi(D_800E97F8) # $at, 0x800f +/* 0D5764 800D4B64 D42697F8 */ ldc1 $f6, %lo(D_800E97F8)($at) /* 0D5768 800D4B68 3C03800F */ lui $v1, %hi(D_800E97C0) # $v1, 0x800f /* 0D576C 800D4B6C 246397C0 */ addiu $v1, %lo(D_800E97C0) # addiu $v1, $v1, -0x6840 /* 0D5770 800D4B70 46324001 */ sub.d $f0, $f8, $f18 @@ -87,15 +87,15 @@ glabel cosf /* 0D57F0 800D4BF0 460A5032 */ c.eq.s $f10, $f10 .L800D4BF4: -/* 0D57F4 800D4BF4 3C01800F */ lui $at, %hi(D_800E98C0) #$at, 0x800f +/* 0D57F4 800D4BF4 3C01800F */ lui $at, %hi(D_800E9800) # $at, 0x800f /* 0D57F8 800D4BF8 45010004 */ bc1t .L800D4C0C /* 0D57FC 800D4BFC 00000000 */ nop -/* 0D5800 800D4C00 3C01800F */ lui $at, 0x800f +/* 0D5800 800D4C00 3C01800F */ lui $at, %hi(D_800E98C0) # $at, 0x800f /* 0D5804 800D4C04 03E00008 */ jr $ra /* 0D5808 800D4C08 C42098C0 */ lwc1 $f0, %lo(D_800E98C0)($at) .L800D4C0C: -/* 0D580C 800D4C0C C4209800 */ lwc1 $f0, -0x6800($at) +/* 0D580C 800D4C0C C4209800 */ lwc1 $f0, %lo(D_800E9800)($at) /* 0D5810 800D4C10 03E00008 */ jr $ra /* 0D5814 800D4C14 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0D3020/sinf.s b/lib/asm/non_matchings/unknown_0D3020/sinf.s index 2278aa9b..b7750dbe 100644 --- a/lib/asm/non_matchings/unknown_0D3020/sinf.s +++ b/lib/asm/non_matchings/unknown_0D3020/sinf.s @@ -39,8 +39,8 @@ glabel sinf /* 0D58A4 800D4CA4 10200044 */ beqz $at, .L800D4DB8 /* 0D58A8 800D4CA8 C7A40000 */ lwc1 $f4, ($sp) /* 0D58AC 800D4CAC C7A60000 */ lwc1 $f6, ($sp) -/* 0D58B0 800D4CB0 3C01800F */ li $at, 0x800F0000 # -0.000000 -/* 0D58B4 800D4CB4 D42A9838 */ ldc1 $f10, -0x67c8($at) +/* 0D58B0 800D4CB0 3C01800F */ lui $at, %hi(D_800E9838) # $at, 0x800f +/* 0D58B4 800D4CB4 D42A9838 */ ldc1 $f10, %lo(D_800E9838)($at) /* 0D58B8 800D4CB8 460030A1 */ cvt.d.s $f2, $f6 /* 0D58BC 800D4CBC 44804800 */ mtc1 $zero, $f9 /* 0D58C0 800D4CC0 462A1002 */ mul.d $f0, $f2, $f10 @@ -69,11 +69,11 @@ glabel sinf /* 0D5918 800D4D18 00000000 */ nop /* 0D591C 800D4D1C 44828000 */ mtc1 $v0, $f16 .L800D4D20: -/* 0D5920 800D4D20 3C01800F */ lui $at, 0x800f -/* 0D5924 800D4D24 D4329840 */ ldc1 $f18, -0x67c0($at) +/* 0D5920 800D4D20 3C01800F */ lui $at, %hi(D_800E9840) # $at, 0x800f +/* 0D5924 800D4D24 D4329840 */ ldc1 $f18, %lo(D_800E9840)($at) /* 0D5928 800D4D28 46808021 */ cvt.d.w $f0, $f16 -/* 0D592C 800D4D2C 3C01800F */ lui $at, 0x800f -/* 0D5930 800D4D30 D4269848 */ ldc1 $f6, -0x67b8($at) +/* 0D592C 800D4D2C 3C01800F */ lui $at, %hi(D_800E9848) # $at, 0x800f +/* 0D5930 800D4D30 D4269848 */ ldc1 $f6, %lo(D_800E9848)($at) /* 0D5934 800D4D34 3C03800F */ lui $v1, %hi(D_800E9810) # $v1, 0x800f /* 0D5938 800D4D38 24639810 */ addiu $v1, %lo(D_800E9810) # addiu $v1, $v1, -0x67f0 /* 0D593C 800D4D3C 46320102 */ mul.d $f4, $f0, $f18 @@ -112,15 +112,15 @@ glabel sinf .L800D4DB8: /* 0D59B8 800D4DB8 46042032 */ c.eq.s $f4, $f4 -/* 0D59BC 800D4DBC 3C01800F */ lui $at, %hi(D_800E98C0) #$at, 0x800f +/* 0D59BC 800D4DBC 3C01800F */ lui $at, %hi(D_800E9850) # $at, 0x800f /* 0D59C0 800D4DC0 45010004 */ bc1t .L800D4DD4 /* 0D59C4 800D4DC4 00000000 */ nop -/* 0D59C8 800D4DC8 3C01800F */ lui $at, 0x800f +/* 0D59C8 800D4DC8 3C01800F */ lui $at, %hi(D_800E98C0) # $at, 0x800f /* 0D59CC 800D4DCC 03E00008 */ jr $ra /* 0D59D0 800D4DD0 C42098C0 */ lwc1 $f0, %lo(D_800E98C0)($at) .L800D4DD4: -/* 0D59D4 800D4DD4 C4209850 */ lwc1 $f0, -0x67b0($at) +/* 0D59D4 800D4DD4 C4209850 */ lwc1 $f0, %lo(D_800E9850)($at) /* 0D59D8 800D4DD8 03E00008 */ jr $ra /* 0D59DC 800D4DDC 00000000 */ nop diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index b75e3837..71c775ed 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -72,13 +72,10 @@ s16 D_800DC7B8[52] = { 0x0003, 0x0004, 0x0051, 0x0054, 0x0055, 0x0056, 0x00ED, 0x00FF, 0x0001, 0x0002, 0x0003, 0x0004, - 0x0051, - -//s16 D_800DC802[15] = { 37 - 0x0054, 0x0055, 0x0056, 0x00ED, - 0x00FF, 0x00D9, 0x00DF, 0x00E0, - 0x0105, 0x008A, 0x00DA, 0x00E8, - 0x0115, 0x0118, 0x0000 + 0x0051, 0x0054, 0x0055, 0x0056, + 0x00ED, 0x00FF, 0x00D9, 0x00DF, + 0x00E0, 0x0105, 0x008A, 0x00DA, + 0x00E8, 0x0115, 0x0118, 0x0000 }; s16 D_800DC820[16] = { @@ -91,10 +88,9 @@ s16 D_800DC820[16] = { s8 D_800DC840[8] = { 9, 1, 2, 3, 4, 5, 7, 0 }; s8 D_800DC848 = 0; -s32 D_800DC84C = 0xFF401000; // Currently unknown, might be a different type. - -s32 D_800DC850 = 0x1040FF00; // Currently unknown, might be a different type. -s32 D_800DC854 = 0x10FF4000; // Currently unknown, might be a different type. +s32 D_800DC84C[3] = { // Currently unknown, might be a different type. + 0xFF401000, 0x1040FF00, 0x10FF4000 +}; s32 D_800DC858 = 0; // Currently unknown, might be a different type. s32 D_800DC85C = 0x0028FFFF; // Currently unknown, might be a different type. diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 1a5bbb45..8b09eb9b 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -55,8 +55,10 @@ u16 D_800DC9D0[64] = { 0x0002, 0x0504, 0x0001, 0x0000, 0x0000, 0x0004, 0x0000, 0x0000 }; -s8 D_800DCA50[17] = { - 2, 5, 6, 3, 10, 8, 7, 9, +s8 D_800DCA50[8] = { + 2, 5, 6, 3, 10, 8, 7, 9 +}; +u8 D_800DCA58[9] = { 2, 5, 6, 3, 10, 8, 7, 9, 11 }; s8 D_800DCA64[9] = { 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 b0b1bf07..a66b00a2 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -2,14 +2,23 @@ import re 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]|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][bhw](u|c1)?\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 +# Maximum number of lines between a glabel's upper/lower usage to look for. +MAX_LINE_DIFF = 10 -UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*lui\s+)([^\n]*)' -LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw](u|c1)?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)' +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]|f[0-9]{1,2}|k[01]|gp|sp|fp|ra|zero))' +GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' +#GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'li\s+' + REG_REGEX + r',\s+(0x80[0-9A-F]{2})0000\s+#[^\n]*)' +GLABEL_LOWER_LS_REGEX = r'[sl][bhwd](u|c1)?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{3,4})\(\4\)' +GLABEL_LOWER_ADDU_REGEX = r'addiu\s+' + REG_REGEX + r',\s+\4,\s+(-?0x[0-9a-f]{3,4})' +GLABEL_LOWER_REGEX = LINE_START_REGEX + '(' + GLABEL_LOWER_LS_REGEX + '|' + GLABEL_LOWER_ADDU_REGEX + ')' +GLABEL_REGEX_STR = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,' + str(MAX_LINE_DIFF) + '}' + GLABEL_LOWER_REGEX +GLABEL_REGEX = re.compile(GLABEL_REGEX_STR) + +UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n#]*lui\s+)([^\n]*)' +LOWER_INSTR_LS_REGEX_TMPL = r'(/\* %s[^\n#]*[ls][bhwd](u|c1)?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{3,4}([^\n]*)' +LOWER_INSTR_ADDU_REGEX_TMPL = r'(/\* %s[^\n#]*addiu\s+' + REG_REGEX + r',\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{3,4}' +LOWER_INSTR_ADDU_SAME_REGEX_TMPL = r'(/\* %s[^\n#]*)(addiu\s+' + REG_REGEX + r',\s+\3,\s+-?0x[0-9a-f]{3,4})' IGNORE_GLABELS = ['D_800E389E', 'D_801264A1', 'D_800E1B84'] @@ -17,14 +26,15 @@ 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) + matches = GLABEL_REGEX.findall(contents) for match in matches: reg = match[3] - offsets = (match[2], match[11]) # ROM offsets of the lui and [sl][bhw] + offsets = (match[2], match[10]) # 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 - if glabel_lower < 0: - glabel_lower = (-glabel_lower ^ 0xFFFF) + 1 + lower_group = 15 if match[15] else 18 # lower immediate of the glabel + is_addu = lower_group == 18 + glabel_lower = int(match[lower_group], 16) + glabel_lower &= 0xFFFF if glabel_lower & 0x8000: glabel_upper -= 1 glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) @@ -32,11 +42,17 @@ def _find_glabels(asm): glabels.append((glabel, *offsets)) # replace upper instruction contents = re.sub(UPPER_INSTR_REGEX_TMPL % offsets[0], - r'\1' + '%s, %%hi(%s) #' % (reg, glabel) + r'\2', + r'\1%s, %%hi(%s) # \2' % (reg, glabel), contents) # replace lower instruction - contents = re.sub(LOWER_INSTR_REGEX_TMPL % offsets[1], - r'\1' + '%%lo(%s)' % (glabel) + r'\5', + contents = re.sub(LOWER_INSTR_LS_REGEX_TMPL % offsets[1], + r'\1%%lo(%s)\5' % glabel, + contents) + contents = re.sub(LOWER_INSTR_ADDU_SAME_REGEX_TMPL % offsets[1], + r'\1addiu \3, %%lo(%s) # \2' % glabel, + contents) + contents = re.sub(LOWER_INSTR_ADDU_REGEX_TMPL % offsets[1], + r'\1%%lo(%s)' % glabel, contents) if len(matches): FileUtil.write_text_to_file(file, contents) diff --git a/undefined_syms.txt b/undefined_syms.txt index b54de153..0942d052 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -12,10 +12,6 @@ D_3B9A0001 = 0x3B9A0001; D_3FC069AC = 0x3FC069AC; D_46FF9630 = 0x46FF9630; D_57410001 = 0x57410001; -D_7FFF92B0 = 0x7FFF92B0; -D_7FFF92B4 = 0x7FFF92B4; -D_7FFF92C0 = 0x7FFF92C0; -D_7FFF92C4 = 0x7FFF92C4; D_80000004 = 0x80000004; D_80000008 = 0x80000008; D_8000000C = 0x8000000C; @@ -156,6 +152,7 @@ D_800DC980 = 0x800DC980; D_800DC9A8 = 0x800DC9A8; D_800DC9D0 = 0x800DC9D0; D_800DCA50 = 0x800DCA50; +D_800DCA58 = 0x800DCA58; D_800DCA64 = 0x800DCA64; D_800DCA70 = 0x800DCA70; D_800DCA7C = 0x800DCA7C; @@ -389,6 +386,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; @@ -403,6 +401,7 @@ gActiveMagicCodes = 0x800DFD98; gUnlockedMagicCodes = 0x800DFD9C; D_800DFDA0 = 0x800DFDA0; D_800DFDB4 = 0x800DFDB4; +D_800DFDB5 = 0x800DFDB5; D_800DFDC8 = 0x800DFDC8; D_800DFDCC = 0x800DFDCC; D_800DFDD0 = 0x800DFDD0; @@ -470,6 +469,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; @@ -493,6 +493,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; @@ -1447,6 +1448,7 @@ D_800E6968 = 0x800E6968; D_800E69A0 = 0x800E69A0; D_800E69A4 = 0x800E69A4; D_800E69A8 = 0x800E69A8; +D_800E69AC = 0x800E69AC; D_800E69B0 = 0x800E69B0; D_800E69B8 = 0x800E69B8; D_800E69BC = 0x800E69BC; @@ -1559,6 +1561,7 @@ D_800E7584 = 0x800E7584; D_800E7630 = 0x800E7630; D_800E7640 = 0x800E7640; D_800E7650 = 0x800E7650; +D_800E7660 = 0x800E7660; D_800E7670 = 0x800E7670; D_800E7680 = 0x800E7680; D_800E7690 = 0x800E7690; @@ -1592,6 +1595,7 @@ D_800E7B08 = 0x800E7B08; D_800E7B0C = 0x800E7B0C; D_800E7C90 = 0x800E7C90; D_800E8208 = 0x800E8208; +D_800E820C = 0x800E820C; D_800E8210 = 0x800E8210; D_800E8214 = 0x800E8214; D_800E8218 = 0x800E8218; @@ -1615,6 +1619,7 @@ D_800E83A4 = 0x800E83A4; D_800E83A8 = 0x800E83A8; D_800E83AC = 0x800E83AC; D_800E83B0 = 0x800E83B0; +D_800E83B4 = 0x800E83B4; D_800E83B8 = 0x800E83B8; D_800E83E0 = 0x800E83E0; D_800E8400 = 0x800E8400; @@ -1773,8 +1778,12 @@ D_800E92A0 = 0x800E92A0; D_800E92A4 = 0x800E92A4; D_800E92A8 = 0x800E92A8; D_800E92AC = 0x800E92AC; +D_800E92B0 = 0x800E92B0; +D_800E92B4 = 0x800E92B4; D_800E92B8 = 0x800E92B8; D_800E92BC = 0x800E92BC; +D_800E92C0 = 0x800E92C0; +D_800E92C4 = 0x800E92C4; D_800E92D0 = 0x800E92D0; D_800E92EC = 0x800E92EC; D_800E9308 = 0x800E9308; @@ -1804,6 +1813,8 @@ D_800E95B0 = 0x800E95B0; D_800E95F8 = 0x800E95F8; D_800E95FC = 0x800E95FC; D_800E9600 = 0x800E9600; +D_800E9628 = 0x800E9628; +D_800E9640 = 0x800E9640; D_800E9650 = 0x800E9650; D_800E9670 = 0x800E9670; D_800E9690 = 0x800E9690; @@ -1812,11 +1823,20 @@ D_800E96C4 = 0x800E96C4; D_800E96CC = 0x800E96CC; D_800E96E4 = 0x800E96E4; D_800E97C0 = 0x800E97C0; +D_800E97E8 = 0x800E97E8; +D_800E97F0 = 0x800E97F0; +D_800E97F8 = 0x800E97F8; +D_800E9800 = 0x800E9800; D_800E9810 = 0x800E9810; +D_800E9838 = 0x800E9838; +D_800E9840 = 0x800E9840; +D_800E9848 = 0x800E9848; +D_800E9850 = 0x800E9850; D_800E9860 = 0x800E9860; D_800E98A8 = 0x800E98A8; D_800E98AC = 0x800E98AC; D_800E98B0 = 0x800E98B0; +D_800E98B8 = 0x800E98B8; D_800E98C0 = 0x800E98C0; D_800E98D0 = 0x800E98D0; D_800EA3A0 = 0x800EA3A0; @@ -2231,7 +2251,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; @@ -2244,8 +2267,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; @@ -2992,7 +3019,6 @@ D_A4800018 = 0xA4800018; D_A5000508 = 0xA5000508; D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; -D_FAFFA07C = 0xFAFFA07C; D_FF7F0001 = 0xFF7F0001; D_FFFDFFFB = 0xFFFDFFFB; D_FFFF0028 = 0xFFFF0028;