From e456e75fec23a20b7ce6e4afe5e7d4d3f200ba81 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Thu, 27 May 2021 21:30:47 -0700 Subject: [PATCH] Added additional usage of existing globals --- .../unknown_066AA0/func_8006A6B0.s | 4 ++-- .../unknown_066AA0/func_8006C3E0.s | 4 ++-- .../unknown_066AA0/func_8006C60C.s | 24 +++++++++---------- .../unknown_066AA0/func_8006DCF8.s | 12 +++++----- .../unknown_066AA0/func_8006ECFC.s | 12 +++++----- .../unknown_071730/func_80071278.s | 4 ++-- .../unknown_071730/func_80071478.s | 4 ++-- .../unknown_071730/func_80071538.s | 4 ++-- .../unknown_071730/func_8007164C.s | 4 ++-- asm/non_matchings/unknown_080500/Menu11Loop.s | 8 +++---- .../unknown_080500/func_800853D0.s | 12 +++++----- .../unknown_080500/func_8008B758.s | 8 +++---- .../unknown_080500/func_80090918.s | 4 ++-- .../unknown_080500/func_80092188.s | 4 ++-- .../unknown_080500/func_80094170.s | 16 ++++++------- .../unknown_080500/func_80094688.s | 8 +++---- .../unknown_080500/func_80095728.s | 8 +++---- .../unknown_080500/func_8009CA60.s | 8 +++---- .../unknown_09F8F0/func_800A01A0.s | 4 ++-- .../unknown_09F8F0/func_800A3884.s | 4 ++-- .../unknown_09F8F0/func_800A8458.s | 4 ++-- .../unknown_09F8F0/func_800A8474.s | 16 ++++++------- 22 files changed, 88 insertions(+), 88 deletions(-) diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s index df2cad99..50b17141 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s @@ -682,9 +682,9 @@ glabel func_8006A6B0 /* 06BC28 8006B028 29E10010 */ slti $at, $t7, 0x10 /* 06BC2C 8006B02C 10200006 */ beqz $at, .L8006B048 /* 06BC30 8006B030 000FC080 */ sll $t8, $t7, 2 -/* 06BC34 8006B034 3C028012 */ lui $v0, 0x8012 +/* 06BC34 8006B034 3C028012 */ lui $v0, %hi(D_80121180) # $v0, 0x8012 /* 06BC38 8006B038 00581021 */ addu $v0, $v0, $t8 -/* 06BC3C 8006B03C 8C421180 */ lw $v0, 0x1180($v0) +/* 06BC3C 8006B03C 8C421180 */ lw $v0, %lo(D_80121180)($v0) /* 06BC40 8006B040 03E00008 */ jr $ra /* 06BC44 8006B044 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s index 4fc0fab2..107837a1 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s @@ -118,10 +118,10 @@ glabel func_8006C3E0 /* 06D19C 8006C59C 250834E8 */ addiu $t0, %lo(D_801234E8) # addiu $t0, $t0, 0x34e8 /* 06D1A0 8006C5A0 AC203508 */ sw $zero, %lo(D_80123508)($at) /* 06D1A4 8006C5A4 00005880 */ sll $t3, $zero, 2 -/* 06D1A8 8006C5A8 3C0C8012 */ lui $t4, 0x8012 +/* 06D1A8 8006C5A8 3C0C8012 */ lui $t4, %hi(D_801211F0) # $t4, 0x8012 /* 06D1AC 8006C5AC AD000000 */ sw $zero, ($t0) /* 06D1B0 8006C5B0 018B6021 */ addu $t4, $t4, $t3 -/* 06D1B4 8006C5B4 8D8C11F0 */ lw $t4, 0x11f0($t4) +/* 06D1B4 8006C5B4 8D8C11F0 */ lw $t4, %lo(D_801211F0)($t4) /* 06D1B8 8006C5B8 3C038012 */ lui $v1, %hi(D_801211F8) # $v1, 0x8012 /* 06D1BC 8006C5BC 246311F8 */ addiu $v1, %lo(D_801211F8) # addiu $v1, $v1, 0x11f8 /* 06D1C0 8006C5C0 AC6C0000 */ sw $t4, ($v1) diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index 8f058a03..87bfa2d8 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -10,10 +10,10 @@ glabel func_8006C60C /* 06D22C 8006C62C 15C1001F */ bne $t6, $at, .L8006C6AC /* 06D230 8006C630 3C0F8012 */ lui $t7, %hi(D_801234E8) # $t7, 0x8012 /* 06D234 8006C634 8DEF34E8 */ lw $t7, %lo(D_801234E8)($t7) -/* 06D238 8006C638 3C198012 */ lui $t9, 0x8012 +/* 06D238 8006C638 3C198012 */ lui $t9, %hi(D_801211F0) # $t9, 0x8012 /* 06D23C 8006C63C 000FC080 */ sll $t8, $t7, 2 /* 06D240 8006C640 0338C821 */ addu $t9, $t9, $t8 -/* 06D244 8006C644 8F3911F0 */ lw $t9, 0x11f0($t9) +/* 06D244 8006C644 8F3911F0 */ lw $t9, %lo(D_801211F0)($t9) /* 06D248 8006C648 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 /* 06D24C 8006C64C 248411F8 */ addiu $a0, %lo(D_801211F8) # addiu $a0, $a0, 0x11f8 /* 06D250 8006C650 00002825 */ move $a1, $zero @@ -46,12 +46,12 @@ glabel func_8006C60C /* 06D2B8 8006C6B8 14600014 */ bnez $v1, .L8006C70C /* 06D2BC 8006C6BC 3C088012 */ lui $t0, %hi(D_801234E8) # $t0, 0x8012 /* 06D2C0 8006C6C0 8D0834E8 */ lw $t0, %lo(D_801234E8)($t0) -/* 06D2C4 8006C6C4 3C048012 */ lui $a0, 0x8012 +/* 06D2C4 8006C6C4 3C048012 */ lui $a0, %hi(D_801211F0) # $a0, 0x8012 /* 06D2C8 8006C6C8 00084880 */ sll $t1, $t0, 2 /* 06D2CC 8006C6CC 00892021 */ addu $a0, $a0, $t1 /* 06D2D0 8006C6D0 3C058012 */ lui $a1, %hi(D_801211F8) # $a1, 0x8012 /* 06D2D4 8006C6D4 8CA511F8 */ lw $a1, %lo(D_801211F8)($a1) -/* 06D2D8 8006C6D8 8C8411F0 */ lw $a0, 0x11f0($a0) +/* 06D2D8 8006C6D8 8C8411F0 */ lw $a0, %lo(D_801211F0)($a0) /* 06D2DC 8006C6DC 0C01DD14 */ jal setupOSTasks /* 06D2E0 8006C6E0 00003025 */ move $a2, $zero /* 06D2E4 8006C6E4 3C078012 */ lui $a3, %hi(D_801234E8) # $a3, 0x8012 @@ -73,25 +73,25 @@ glabel func_8006C60C /* 06D320 8006C720 A02ED3F0 */ sb $t6, %lo(D_800DD3F0)($at) .L8006C724: /* 06D324 8006C724 8CE20000 */ lw $v0, ($a3) -/* 06D328 8006C728 3C188012 */ lui $t8, 0x8012 +/* 06D328 8006C728 3C188012 */ lui $t8, %hi(D_801211F0) # $t8, 0x8012 /* 06D32C 8006C72C 00027880 */ sll $t7, $v0, 2 /* 06D330 8006C730 030FC021 */ addu $t8, $t8, $t7 -/* 06D334 8006C734 8F1811F0 */ lw $t8, 0x11f0($t8) +/* 06D334 8006C734 8F1811F0 */ lw $t8, %lo(D_801211F0)($t8) /* 06D338 8006C738 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 /* 06D33C 8006C73C 248411F8 */ addiu $a0, %lo(D_801211F8) # addiu $a0, $a0, 0x11f8 -/* 06D340 8006C740 3C198012 */ lui $t9, 0x8012 +/* 06D340 8006C740 3C198012 */ lui $t9, %hi(D_80121200) # $t9, 0x8012 /* 06D344 8006C744 032FC821 */ addu $t9, $t9, $t7 /* 06D348 8006C748 AC980000 */ sw $t8, ($a0) -/* 06D34C 8006C74C 8F391200 */ lw $t9, 0x1200($t9) -/* 06D350 8006C750 3C088012 */ lui $t0, 0x8012 +/* 06D34C 8006C74C 8F391200 */ lw $t9, %lo(D_80121200)($t9) +/* 06D350 8006C750 3C088012 */ lui $t0, %hi(D_80121210) # $t0, 0x8012 /* 06D354 8006C754 3C018012 */ lui $at, %hi(D_80121208) # $at, 0x8012 /* 06D358 8006C758 010F4021 */ addu $t0, $t0, $t7 -/* 06D35C 8006C75C 8D081210 */ lw $t0, 0x1210($t0) -/* 06D360 8006C760 3C098012 */ lui $t1, 0x8012 +/* 06D35C 8006C75C 8D081210 */ lw $t0, %lo(D_80121210)($t0) +/* 06D360 8006C760 3C098012 */ lui $t1, %hi(D_80121220) # $t1, 0x8012 /* 06D364 8006C764 AC391208 */ sw $t9, %lo(D_80121208)($at) /* 06D368 8006C768 3C018012 */ lui $at, %hi(D_80121218) # $at, 0x8012 /* 06D36C 8006C76C 012F4821 */ addu $t1, $t1, $t7 -/* 06D370 8006C770 8D291220 */ lw $t1, 0x1220($t1) +/* 06D370 8006C770 8D291220 */ lw $t1, %lo(D_80121220)($t1) /* 06D374 8006C774 AC281218 */ sw $t0, %lo(D_80121218)($at) /* 06D378 8006C778 3C018012 */ lui $at, %hi(D_80121228) # $at, 0x8012 /* 06D37C 8006C77C 00002825 */ move $a1, $zero diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index 8c0d1434..a9903794 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -50,10 +50,10 @@ glabel func_8006DCF8 /* 06E9AC 8006DDAC 00000000 */ nop /* 06E9B0 8006DDB0 3C0D8012 */ lui $t5, %hi(D_801234E8) # $t5, 0x8012 /* 06E9B4 8006DDB4 8DAD34E8 */ lw $t5, %lo(D_801234E8)($t5) -/* 06E9B8 8006DDB8 3C0F8012 */ lui $t7, 0x8012 +/* 06E9B8 8006DDB8 3C0F8012 */ lui $t7, %hi(D_801211F0) # $t7, 0x8012 /* 06E9BC 8006DDBC 000D7080 */ sll $t6, $t5, 2 /* 06E9C0 8006DDC0 01EE7821 */ addu $t7, $t7, $t6 -/* 06E9C4 8006DDC4 8DEF11F0 */ lw $t7, 0x11f0($t7) +/* 06E9C4 8006DDC4 8DEF11F0 */ lw $t7, %lo(D_801211F0)($t7) /* 06E9C8 8006DDC8 3C19E900 */ lui $t9, 0xe900 /* 06E9CC 8006DDCC AE0F0000 */ sw $t7, ($s0) /* 06E9D0 8006DDD0 25F80008 */ addiu $t8, $t7, 8 @@ -273,10 +273,10 @@ glabel func_8006DCF8 /* 06ED10 8006E110 00000000 */ nop /* 06ED14 8006E114 3C0D8012 */ lui $t5, %hi(D_801234E8) # $t5, 0x8012 /* 06ED18 8006E118 8DAD34E8 */ lw $t5, %lo(D_801234E8)($t5) -/* 06ED1C 8006E11C 3C0F8012 */ lui $t7, 0x8012 +/* 06ED1C 8006E11C 3C0F8012 */ lui $t7, %hi(D_801211F0) # $t7, 0x8012 /* 06ED20 8006E120 000D7080 */ sll $t6, $t5, 2 /* 06ED24 8006E124 01EE7821 */ addu $t7, $t7, $t6 -/* 06ED28 8006E128 8DEF11F0 */ lw $t7, 0x11f0($t7) +/* 06ED28 8006E128 8DEF11F0 */ lw $t7, %lo(D_801211F0)($t7) /* 06ED2C 8006E12C 8FAA002C */ lw $t2, 0x2c($sp) /* 06ED30 8006E130 AE0F0000 */ sw $t7, ($s0) /* 06ED34 8006E134 25F80008 */ addiu $t8, $t7, 8 @@ -344,10 +344,10 @@ glabel func_8006DCF8 /* 06EE28 8006E228 00000000 */ nop /* 06EE2C 8006E22C 3C198012 */ lui $t9, %hi(D_801234E8) # $t9, 0x8012 /* 06EE30 8006E230 8F3934E8 */ lw $t9, %lo(D_801234E8)($t9) -/* 06EE34 8006E234 3C0D8012 */ lui $t5, 0x8012 +/* 06EE34 8006E234 3C0D8012 */ lui $t5, %hi(D_801211F0) # $t5, 0x8012 /* 06EE38 8006E238 00196080 */ sll $t4, $t9, 2 /* 06EE3C 8006E23C 01AC6821 */ addu $t5, $t5, $t4 -/* 06EE40 8006E240 8DAD11F0 */ lw $t5, 0x11f0($t5) +/* 06EE40 8006E240 8DAD11F0 */ lw $t5, %lo(D_801211F0)($t5) /* 06EE44 8006E244 3C0FE900 */ lui $t7, 0xe900 /* 06EE48 8006E248 AE0D0000 */ sw $t5, ($s0) /* 06EE4C 8006E24C 25AE0008 */ addiu $t6, $t5, 8 diff --git a/asm/non_matchings/unknown_066AA0/func_8006ECFC.s b/asm/non_matchings/unknown_066AA0/func_8006ECFC.s index 0e9432f1..dbb02375 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006ECFC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006ECFC.s @@ -146,19 +146,19 @@ glabel func_8006ECFC /* 06FB28 8006EF28 8F190000 */ lw $t9, ($t8) /* 06FB2C 8006EF2C 3C048012 */ lui $a0, %hi(D_801211F8) # $a0, 0x8012 /* 06FB30 8006EF30 248411F8 */ addiu $a0, %lo(D_801211F8) # addiu $a0, $a0, 0x11f8 -/* 06FB34 8006EF34 3C0D8012 */ lui $t5, 0x8012 +/* 06FB34 8006EF34 3C0D8012 */ lui $t5, %hi(D_80121200) # $t5, 0x8012 /* 06FB38 8006EF38 01AF6821 */ addu $t5, $t5, $t7 /* 06FB3C 8006EF3C AC990000 */ sw $t9, ($a0) -/* 06FB40 8006EF40 8DAD1200 */ lw $t5, 0x1200($t5) -/* 06FB44 8006EF44 3C0C8012 */ lui $t4, 0x8012 +/* 06FB40 8006EF40 8DAD1200 */ lw $t5, %lo(D_80121200)($t5) +/* 06FB44 8006EF44 3C0C8012 */ lui $t4, %hi(D_80121220) # $t4, 0x8012 /* 06FB48 8006EF48 3C018012 */ lui $at, %hi(D_80121208) # $at, 0x8012 /* 06FB4C 8006EF4C 018F6021 */ addu $t4, $t4, $t7 -/* 06FB50 8006EF50 8D8C1220 */ lw $t4, 0x1220($t4) -/* 06FB54 8006EF54 3C0E8012 */ lui $t6, 0x8012 +/* 06FB50 8006EF50 8D8C1220 */ lw $t4, %lo(D_80121220)($t4) +/* 06FB54 8006EF54 3C0E8012 */ lui $t6, %hi(D_80121210) # $t6, 0x8012 /* 06FB58 8006EF58 AC2D1208 */ sw $t5, %lo(D_80121208)($at) /* 06FB5C 8006EF5C 3C018012 */ lui $at, %hi(D_80121228) # $at, 0x8012 /* 06FB60 8006EF60 01CF7021 */ addu $t6, $t6, $t7 -/* 06FB64 8006EF64 8DCE1210 */ lw $t6, 0x1210($t6) +/* 06FB64 8006EF64 8DCE1210 */ lw $t6, %lo(D_80121210)($t6) /* 06FB68 8006EF68 AC2C1228 */ sw $t4, %lo(D_80121228)($at) /* 06FB6C 8006EF6C 3C018012 */ lui $at, %hi(D_80121218) # $at, 0x8012 /* 06FB70 8006EF70 AC2E1218 */ sw $t6, %lo(D_80121218)($at) diff --git a/asm/non_matchings/unknown_071730/func_80071278.s b/asm/non_matchings/unknown_071730/func_80071278.s index 958d07a4..8dd66386 100644 --- a/asm/non_matchings/unknown_071730/func_80071278.s +++ b/asm/non_matchings/unknown_071730/func_80071278.s @@ -4,10 +4,10 @@ glabel func_80071278 /* 071E80 80071280 0C01C57B */ jal func_800715EC /* 071E84 80071284 AFA40020 */ sw $a0, 0x20($sp) /* 071E88 80071288 00027100 */ sll $t6, $v0, 4 -/* 071E8C 8007128C 3C038012 */ lui $v1, 0x8012 +/* 071E8C 8007128C 3C038012 */ lui $v1, %hi(D_80123588) # $v1, 0x8012 /* 071E90 80071290 006E1821 */ addu $v1, $v1, $t6 /* 071E94 80071294 8FA40020 */ lw $a0, 0x20($sp) -/* 071E98 80071298 8C633588 */ lw $v1, 0x3588($v1) +/* 071E98 80071298 8C633588 */ lw $v1, %lo(D_80123588)($v1) /* 071E9C 8007129C AFA20018 */ sw $v0, 0x18($sp) /* 071EA0 800712A0 00002825 */ move $a1, $zero /* 071EA4 800712A4 2407FFFF */ li $a3, -1 diff --git a/asm/non_matchings/unknown_071730/func_80071478.s b/asm/non_matchings/unknown_071730/func_80071478.s index 047b88bc..2fd0193d 100644 --- a/asm/non_matchings/unknown_071730/func_80071478.s +++ b/asm/non_matchings/unknown_071730/func_80071478.s @@ -8,9 +8,9 @@ glabel func_80071478 /* 072090 80071490 0C01C57B */ jal func_800715EC /* 072094 80071494 02002025 */ move $a0, $s0 /* 072098 80071498 00027100 */ sll $t6, $v0, 4 -/* 07209C 8007149C 3C048012 */ lui $a0, 0x8012 +/* 07209C 8007149C 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 /* 0720A0 800714A0 008E2021 */ addu $a0, $a0, $t6 -/* 0720A4 800714A4 8C843588 */ lw $a0, 0x3588($a0) +/* 0720A4 800714A4 8C843588 */ lw $a0, %lo(D_80123588)($a0) /* 0720A8 800714A8 00001825 */ move $v1, $zero /* 0720AC 800714AC 2409FFFF */ li $t1, -1 /* 0720B0 800714B0 24080004 */ li $t0, 4 diff --git a/asm/non_matchings/unknown_071730/func_80071538.s b/asm/non_matchings/unknown_071730/func_80071538.s index b7e8329b..a5e2e0d1 100644 --- a/asm/non_matchings/unknown_071730/func_80071538.s +++ b/asm/non_matchings/unknown_071730/func_80071538.s @@ -7,10 +7,10 @@ glabel func_80071538 /* 07214C 8007154C 0C01C57B */ jal func_800715EC /* 072150 80071550 AFA20018 */ sw $v0, 0x18($sp) /* 072154 80071554 00027100 */ sll $t6, $v0, 4 -/* 072158 80071558 3C048012 */ lui $a0, 0x8012 +/* 072158 80071558 3C048012 */ lui $a0, %hi(D_80123588) # $a0, 0x8012 /* 07215C 8007155C 008E2021 */ addu $a0, $a0, $t6 /* 072160 80071560 8FA70028 */ lw $a3, 0x28($sp) -/* 072164 80071564 8C843588 */ lw $a0, 0x3588($a0) +/* 072164 80071564 8C843588 */ lw $a0, %lo(D_80123588)($a0) /* 072168 80071568 00001825 */ move $v1, $zero /* 07216C 8007156C 2406FFFF */ li $a2, -1 /* 072170 80071570 24050014 */ li $a1, 20 diff --git a/asm/non_matchings/unknown_071730/func_8007164C.s b/asm/non_matchings/unknown_071730/func_8007164C.s index 4c196dcb..e3b1ba33 100644 --- a/asm/non_matchings/unknown_071730/func_8007164C.s +++ b/asm/non_matchings/unknown_071730/func_8007164C.s @@ -79,9 +79,9 @@ glabel func_8007164C /* 072370 80071770 00000000 */ nop /* 072374 80071774 00047100 */ sll $t6, $a0, 4 -/* 072378 80071778 3C028012 */ lui $v0, 0x8012 +/* 072378 80071778 3C028012 */ lui $v0, %hi(D_80123588) # $v0, 0x8012 /* 07237C 8007177C 004E1021 */ addu $v0, $v0, $t6 -/* 072380 80071780 8C423588 */ lw $v0, 0x3588($v0) +/* 072380 80071780 8C423588 */ lw $v0, %lo(D_80123588)($v0) /* 072384 80071784 03E00008 */ jr $ra /* 072388 80071788 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/Menu11Loop.s b/asm/non_matchings/unknown_080500/Menu11Loop.s index 52311619..445a7aa8 100644 --- a/asm/non_matchings/unknown_080500/Menu11Loop.s +++ b/asm/non_matchings/unknown_080500/Menu11Loop.s @@ -165,11 +165,11 @@ glabel Menu11Loop /* 098108 80097508 8CCA0000 */ lw $t2, ($a2) /* 09810C 8009750C 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e /* 098110 80097510 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) -/* 098114 80097514 3C0C8012 */ lui $t4, 0x8012 +/* 098114 80097514 3C0C8012 */ lui $t4, %hi(D_80126BF0) # $t4, 0x8012 /* 098118 80097518 000A5880 */ sll $t3, $t2, 2 /* 09811C 8009751C AFA80020 */ sw $t0, 0x20($sp) /* 098120 80097520 018B6021 */ addu $t4, $t4, $t3 -/* 098124 80097524 8D8C6BF0 */ lw $t4, 0x6bf0($t4) +/* 098124 80097524 8D8C6BF0 */ lw $t4, %lo(D_80126BF0)($t4) /* 098128 80097528 8DAE0070 */ lw $t6, 0x70($t5) /* 09812C 8009752C 240F0002 */ li $t7, 2 /* 098130 80097530 158E0003 */ bne $t4, $t6, .L80097540 @@ -255,10 +255,10 @@ glabel Menu11Loop /* 09824C 8009764C 8CCB0000 */ lw $t3, ($a2) /* 098250 80097650 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 098254 80097654 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) -/* 098258 80097658 3C028012 */ lui $v0, 0x8012 +/* 098258 80097658 3C028012 */ lui $v0, %hi(D_80126BF0) # $v0, 0x8012 /* 09825C 8009765C 000B6880 */ sll $t5, $t3, 2 /* 098260 80097660 004D1021 */ addu $v0, $v0, $t5 -/* 098264 80097664 8C426BF0 */ lw $v0, 0x6bf0($v0) +/* 098264 80097664 8C426BF0 */ lw $v0, %lo(D_80126BF0)($v0) /* 098268 80097668 8C6C005C */ lw $t4, 0x5c($v1) /* 09826C 8009766C 00000000 */ nop /* 098270 80097670 144C0003 */ bne $v0, $t4, .L80097680 diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index 69f1223a..376f1dc4 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -22,10 +22,10 @@ glabel func_800853D0 /* 086020 80085420 2739FC10 */ addiu $t9, %lo(D_800DFC10) # addiu $t9, $t9, -0x3f0 /* 086024 80085424 AFB90068 */ sw $t9, 0x68($sp) /* 086028 80085428 92030006 */ lbu $v1, 6($s0) -/* 08602C 8008542C 3C028012 */ lui $v0, 0x8012 +/* 08602C 8008542C 3C028012 */ lui $v0, %hi(D_80126530) # $v0, 0x8012 /* 086030 80085430 00035080 */ sll $t2, $v1, 2 /* 086034 80085434 004A1021 */ addu $v0, $v0, $t2 -/* 086038 80085438 8C426530 */ lw $v0, 0x6530($v0) +/* 086038 80085438 8C426530 */ lw $v0, %lo(D_80126530)($v0) /* 08603C 8008543C 3C088012 */ lui $t0, %hi(D_8012665C) # $t0, 0x8012 /* 086040 80085440 904B004B */ lbu $t3, 0x4b($v0) /* 086044 80085444 8D08665C */ lw $t0, %lo(D_8012665C)($t0) @@ -45,10 +45,10 @@ glabel func_800853D0 /* 08607C 8008547C 27AC0050 */ addiu $t4, $sp, 0x50 /* 086080 80085480 AFAC0064 */ sw $t4, 0x64($sp) /* 086084 80085484 920D0006 */ lbu $t5, 6($s0) -/* 086088 80085488 3C028012 */ lui $v0, 0x8012 +/* 086088 80085488 3C028012 */ lui $v0, %hi(D_80126530) # $v0, 0x8012 /* 08608C 8008548C 000D7080 */ sll $t6, $t5, 2 /* 086090 80085490 004E1021 */ addu $v0, $v0, $t6 -/* 086094 80085494 8C426530 */ lw $v0, 0x6530($v0) +/* 086094 80085494 8C426530 */ lw $v0, %lo(D_80126530)($v0) /* 086098 80085498 2404000A */ li $a0, 10 /* 08609C 8008549C 8C4F0000 */ lw $t7, ($v0) /* 0860A0 800854A0 8FA8004C */ lw $t0, 0x4c($sp) @@ -332,10 +332,10 @@ glabel func_800853D0 /* 0864C8 800858C8 14410050 */ bne $v0, $at, .L80085A0C /* 0864CC 800858CC 8FAA0068 */ lw $t2, 0x68($sp) /* 0864D0 800858D0 92180006 */ lbu $t8, 6($s0) -/* 0864D4 800858D4 3C198012 */ lui $t9, 0x8012 +/* 0864D4 800858D4 3C198012 */ lui $t9, %hi(D_80126530) # $t9, 0x8012 /* 0864D8 800858D8 00185080 */ sll $t2, $t8, 2 /* 0864DC 800858DC 032AC821 */ addu $t9, $t9, $t2 -/* 0864E0 800858E0 8F396530 */ lw $t9, 0x6530($t9) +/* 0864E0 800858E0 8F396530 */ lw $t9, %lo(D_80126530)($t9) /* 0864E4 800858E4 00000000 */ nop /* 0864E8 800858E8 932B004B */ lbu $t3, 0x4b($t9) /* 0864EC 800858EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_8008B758.s b/asm/non_matchings/unknown_080500/func_8008B758.s index 2669674e..bb501060 100644 --- a/asm/non_matchings/unknown_080500/func_8008B758.s +++ b/asm/non_matchings/unknown_080500/func_8008B758.s @@ -167,10 +167,10 @@ glabel func_8008B758 /* 08C5C4 8008B9C4 82580000 */ lb $t8, ($s2) /* 08C5C8 8008B9C8 00141840 */ sll $v1, $s4, 1 /* 08C5CC 8008B9CC 03130019 */ multu $t8, $s3 -/* 08C5D0 8008B9D0 3C048012 */ lui $a0, 0x8012 +/* 08C5D0 8008B9D0 3C048012 */ lui $a0, %hi(D_80126830) # $a0, 0x8012 /* 08C5D4 8008B9D4 00832021 */ addu $a0, $a0, $v1 /* 08C5D8 8008B9D8 8FC50000 */ lw $a1, ($fp) -/* 08C5DC 8008B9DC 84846830 */ lh $a0, 0x6830($a0) +/* 08C5DC 8008B9DC 84846830 */ lh $a0, %lo(D_80126830)($a0) /* 08C5E0 8008B9E0 24060002 */ li $a2, 2 /* 08C5E4 8008B9E4 240700EC */ li $a3, 236 /* 08C5E8 8008B9E8 2419015C */ li $t9, 348 @@ -204,9 +204,9 @@ glabel func_8008B758 /* 08C654 8008BA54 1000001F */ b .L8008BAD4 /* 08C658 8008BA58 000A1040 */ sll $v0, $t2, 1 .L8008BA5C: -/* 08C65C 8008BA5C 3C048012 */ lui $a0, 0x8012 +/* 08C65C 8008BA5C 3C048012 */ lui $a0, %hi(D_80126818) # $a0, 0x8012 /* 08C660 8008BA60 00832021 */ addu $a0, $a0, $v1 -/* 08C664 8008BA64 84846818 */ lh $a0, 0x6818($a0) +/* 08C664 8008BA64 84846818 */ lh $a0, %lo(D_80126818)($a0) /* 08C668 8008BA68 24060004 */ li $a2, 4 /* 08C66C 8008BA6C 0481000C */ bgez $a0, .L8008BAA0 /* 08C670 8008BA70 240700EC */ li $a3, 236 diff --git a/asm/non_matchings/unknown_080500/func_80090918.s b/asm/non_matchings/unknown_080500/func_80090918.s index af0fafd4..926a2103 100644 --- a/asm/non_matchings/unknown_080500/func_80090918.s +++ b/asm/non_matchings/unknown_080500/func_80090918.s @@ -369,11 +369,11 @@ glabel func_80090918 /* 091A64 80090E64 032D7821 */ addu $t7, $t9, $t5 /* 091A68 80090E68 3C0D8012 */ lui $t5, %hi(D_80126480) # $t5, 0x8012 /* 091A6C 80090E6C 8DAD6480 */ lw $t5, %lo(D_80126480)($t5) -/* 091A70 80090E70 3C0E8012 */ lui $t6, 0x8012 +/* 091A70 80090E70 3C0E8012 */ lui $t6, %hi(D_801268E8) # $t6, 0x8012 /* 091A74 80090E74 006D0019 */ multu $v1, $t5 /* 091A78 80090E78 01CF7021 */ addu $t6, $t6, $t7 /* 091A7C 80090E7C 0002C880 */ sll $t9, $v0, 2 -/* 091A80 80090E80 85CE68E8 */ lh $t6, 0x68e8($t6) +/* 091A80 80090E80 85CE68E8 */ lh $t6, %lo(D_801268E8)($t6) /* 091A84 80090E84 0322C821 */ addu $t9, $t9, $v0 /* 091A88 80090E88 3C01800E */ lui $at, %hi(D_800DF4C4) # $at, 0x800e /* 091A8C 80090E8C 0019C980 */ sll $t9, $t9, 6 diff --git a/asm/non_matchings/unknown_080500/func_80092188.s b/asm/non_matchings/unknown_080500/func_80092188.s index 8f8c7649..0c9ef3da 100644 --- a/asm/non_matchings/unknown_080500/func_80092188.s +++ b/asm/non_matchings/unknown_080500/func_80092188.s @@ -327,11 +327,11 @@ glabel func_80092188 /* 093244 80092644 13200027 */ beqz $t9, .L800926E4 /* 093248 80092648 271869C0 */ addiu $t8, %lo(p1_vehicle) # addiu $t8, $t8, 0x69c0 /* 09324C 8009264C 00057040 */ sll $t6, $a1, 1 -/* 093250 80092650 3C068012 */ lui $a2, 0x8012 +/* 093250 80092650 3C068012 */ lui $a2, %hi(D_80126830) # $a2, 0x8012 /* 093254 80092654 00B81821 */ addu $v1, $a1, $t8 /* 093258 80092658 00CE3021 */ addu $a2, $a2, $t6 /* 09325C 8009265C 80620000 */ lb $v0, ($v1) -/* 093260 80092660 84C66830 */ lh $a2, 0x6830($a2) +/* 093260 80092660 84C66830 */ lh $a2, %lo(D_80126830)($a2) /* 093264 80092664 00403825 */ move $a3, $v0 /* 093268 80092668 18C0000A */ blez $a2, .L80092694 /* 09326C 8009266C 244FFFFF */ addiu $t7, $v0, -1 diff --git a/asm/non_matchings/unknown_080500/func_80094170.s b/asm/non_matchings/unknown_080500/func_80094170.s index 4c620f30..a100edf4 100644 --- a/asm/non_matchings/unknown_080500/func_80094170.s +++ b/asm/non_matchings/unknown_080500/func_80094170.s @@ -73,9 +73,9 @@ glabel func_80094170 .L8009427C: /* 094E7C 8009427C 3C04800E */ lui $a0, %hi(D_800E098C) # $a0, 0x800e /* 094E80 80094280 8C84098C */ lw $a0, %lo(D_800E098C)($a0) -/* 094E84 80094284 3C0F8012 */ lui $t7, 0x8012 +/* 094E84 80094284 3C0F8012 */ lui $t7, %hi(D_80126464) # $t7, 0x8012 /* 094E88 80094288 01E47821 */ addu $t7, $t7, $a0 -/* 094E8C 8009428C 81EF6464 */ lb $t7, 0x6464($t7) +/* 094E8C 8009428C 81EF6464 */ lb $t7, %lo(D_80126464)($t7) /* 094E90 80094290 00057603 */ sra $t6, $a1, 0x18 /* 094E94 80094294 11E00005 */ beqz $t7, .L800942AC /* 094E98 80094298 01C02825 */ move $a1, $t6 @@ -101,10 +101,10 @@ glabel func_80094170 /* 094EE0 800942E0 8CEA0000 */ lw $t2, ($a3) /* 094EE4 800942E4 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 094EE8 800942E8 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) -/* 094EEC 800942EC 3C028012 */ lui $v0, 0x8012 +/* 094EEC 800942EC 3C028012 */ lui $v0, %hi(D_80126A40) # $v0, 0x8012 /* 094EF0 800942F0 000A5880 */ sll $t3, $t2, 2 /* 094EF4 800942F4 004B1021 */ addu $v0, $v0, $t3 -/* 094EF8 800942F8 8C426A40 */ lw $v0, 0x6a40($v0) +/* 094EF8 800942F8 8C426A40 */ lw $v0, %lo(D_80126A40)($v0) /* 094EFC 800942FC 8C6C020C */ lw $t4, 0x20c($v1) /* 094F00 80094300 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e /* 094F04 80094304 3C08800E */ lui $t0, %hi(D_800E0988) # $t0, 0x800e @@ -133,9 +133,9 @@ glabel func_80094170 /* 094F54 80094354 8C84098C */ lw $a0, %lo(D_800E098C)($a0) /* 094F58 80094358 24E76A68 */ addiu $a3, $a3, 0x6a68 /* 094F5C 8009435C 8CE20000 */ lw $v0, ($a3) -/* 094F60 80094360 3C038012 */ lui $v1, 0x8012 +/* 094F60 80094360 3C038012 */ lui $v1, %hi(D_80126464) # $v1, 0x8012 /* 094F64 80094364 00641821 */ addu $v1, $v1, $a0 -/* 094F68 80094368 80636464 */ lb $v1, 0x6464($v1) +/* 094F68 80094368 80636464 */ lb $v1, %lo(D_80126464)($v1) /* 094F6C 8009436C 00022E00 */ sll $a1, $v0, 0x18 /* 094F70 80094370 0005C603 */ sra $t8, $a1, 0x18 /* 094F74 80094374 04610004 */ bgez $v1, .L80094388 @@ -207,10 +207,10 @@ glabel func_80094170 /* 09505C 8009445C 8CE90000 */ lw $t1, ($a3) /* 095060 80094460 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 095064 80094464 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) -/* 095068 80094468 3C028012 */ lui $v0, 0x8012 +/* 095068 80094468 3C028012 */ lui $v0, %hi(D_80126A40) # $v0, 0x8012 /* 09506C 8009446C 00095080 */ sll $t2, $t1, 2 /* 095070 80094470 004A1021 */ addu $v0, $v0, $t2 -/* 095074 80094474 8C426A40 */ lw $v0, 0x6a40($v0) +/* 095074 80094474 8C426A40 */ lw $v0, %lo(D_80126A40)($v0) /* 095078 80094478 8C6B0188 */ lw $t3, 0x188($v1) /* 09507C 8009447C 00000000 */ nop /* 095080 80094480 144B0005 */ bne $v0, $t3, .L80094498 diff --git a/asm/non_matchings/unknown_080500/func_80094688.s b/asm/non_matchings/unknown_080500/func_80094688.s index e0eb2b06..834887a8 100644 --- a/asm/non_matchings/unknown_080500/func_80094688.s +++ b/asm/non_matchings/unknown_080500/func_80094688.s @@ -197,12 +197,12 @@ glabel func_80094688 /* 095568 80094968 0C0271B5 */ jal func_8009C6D4 /* 09556C 8009496C AFA30024 */ sw $v1, 0x24($sp) /* 095570 80094970 8FA30024 */ lw $v1, 0x24($sp) -/* 095574 80094974 3C188012 */ lui $t8, 0x8012 +/* 095574 80094974 3C188012 */ lui $t8, %hi(D_80126550) # $t8, 0x8012 /* 095578 80094978 846D0000 */ lh $t5, ($v1) /* 09557C 8009497C 3C018012 */ lui $at, %hi(D_80126BB8) # $at, 0x8012 /* 095580 80094980 000D7880 */ sll $t7, $t5, 2 /* 095584 80094984 030FC021 */ addu $t8, $t8, $t7 -/* 095588 80094988 8F186550 */ lw $t8, 0x6550($t8) +/* 095588 80094988 8F186550 */ lw $t8, %lo(D_80126550)($t8) /* 09558C 8009498C 10000003 */ b .L8009499C /* 095590 80094990 AC386BB8 */ sw $t8, %lo(D_80126BB8)($at) .L80094994: @@ -216,12 +216,12 @@ glabel func_80094688 /* 0955AC 800949AC 0C0271B5 */ jal func_8009C6D4 /* 0955B0 800949B0 AFA30024 */ sw $v1, 0x24($sp) /* 0955B4 800949B4 8FA30024 */ lw $v1, 0x24($sp) -/* 0955B8 800949B8 3C098012 */ lui $t1, 0x8012 +/* 0955B8 800949B8 3C098012 */ lui $t1, %hi(D_80126550) # $t1, 0x8012 /* 0955BC 800949BC 84680002 */ lh $t0, 2($v1) /* 0955C0 800949C0 3C018012 */ lui $at, %hi(D_80126BBC) # $at, 0x8012 /* 0955C4 800949C4 0008C880 */ sll $t9, $t0, 2 /* 0955C8 800949C8 01394821 */ addu $t1, $t1, $t9 -/* 0955CC 800949CC 8D296550 */ lw $t1, 0x6550($t1) +/* 0955CC 800949CC 8D296550 */ lw $t1, %lo(D_80126550)($t1) /* 0955D0 800949D0 10000003 */ b .L800949E0 /* 0955D4 800949D4 AC296BBC */ sw $t1, %lo(D_80126BBC)($at) .L800949D8: diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 97a5b9b1..e57f5a8f 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -753,11 +753,11 @@ glabel func_80095728 /* 096E1C 8009621C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e /* 096E20 80096220 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) /* 096E24 80096224 240C0001 */ li $t4, 1 -/* 096E28 80096228 3C038012 */ lui $v1, 0x8012 +/* 096E28 80096228 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 096E2C 8009622C 000E7880 */ sll $t7, $t6, 2 /* 096E30 80096230 AFAC0050 */ sw $t4, 0x50($sp) /* 096E34 80096234 006F1821 */ addu $v1, $v1, $t7 -/* 096E38 80096238 8C636BF0 */ lw $v1, 0x6bf0($v1) +/* 096E38 80096238 8C636BF0 */ lw $v1, %lo(D_80126BF0)($v1) /* 096E3C 8009623C 8C58006C */ lw $t8, 0x6c($v0) /* 096E40 80096240 24070001 */ li $a3, 1 /* 096E44 80096244 14780003 */ bne $v1, $t8, .L80096254 @@ -1043,10 +1043,10 @@ glabel func_80095728 /* 097238 80096638 8CCD0000 */ lw $t5, ($a2) /* 09723C 8009663C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e /* 097240 80096640 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) -/* 097244 80096644 3C038012 */ lui $v1, 0x8012 +/* 097244 80096644 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 097248 80096648 000DC880 */ sll $t9, $t5, 2 /* 09724C 8009664C 00791821 */ addu $v1, $v1, $t9 -/* 097250 80096650 8C636BF0 */ lw $v1, 0x6bf0($v1) +/* 097250 80096650 8C636BF0 */ lw $v1, %lo(D_80126BF0)($v1) /* 097254 80096654 8C4C005C */ lw $t4, 0x5c($v0) /* 097258 80096658 3C0E800E */ lui $t6, %hi(D_800DF4B8) # $t6, 0x800e /* 09725C 8009665C 146C001A */ bne $v1, $t4, .L800966C8 diff --git a/asm/non_matchings/unknown_080500/func_8009CA60.s b/asm/non_matchings/unknown_080500/func_8009CA60.s index 1fe02ee6..567ea1e0 100644 --- a/asm/non_matchings/unknown_080500/func_8009CA60.s +++ b/asm/non_matchings/unknown_080500/func_8009CA60.s @@ -9,10 +9,10 @@ glabel func_8009CA60 /* 09D67C 8009CA7C AFA40060 */ sw $a0, 0x60($sp) /* 09D680 8009CA80 00687821 */ addu $t7, $v1, $t0 /* 09D684 8009CA84 85E50006 */ lh $a1, 6($t7) -/* 09D688 8009CA88 3C0A8012 */ lui $t2, 0x8012 +/* 09D688 8009CA88 3C0A8012 */ lui $t2, %hi(D_80126550) # $t2, 0x8012 /* 09D68C 8009CA8C 0005C080 */ sll $t8, $a1, 2 /* 09D690 8009CA90 01585021 */ addu $t2, $t2, $t8 -/* 09D694 8009CA94 8D4A6550 */ lw $t2, 0x6550($t2) +/* 09D694 8009CA94 8D4A6550 */ lw $t2, %lo(D_80126550)($t2) /* 09D698 8009CA98 3C19800E */ lui $t9, %hi(D_800DF750) # $t9, 0x800e /* 09D69C 8009CA9C 114000B4 */ beqz $t2, .L8009CD70 /* 09D6A0 8009CAA0 8FBF0024 */ lw $ra, 0x24($sp) @@ -173,13 +173,13 @@ glabel func_8009CA60 /* 09D8F8 8009CCF8 256BF75C */ addiu $t3, %lo(D_800DF75C) # addiu $t3, $t3, -0x8a4 /* 09D8FC 8009CCFC 8FA8002C */ lw $t0, 0x2c($sp) /* 09D900 8009CD00 8D6E0000 */ lw $t6, ($t3) -/* 09D904 8009CD04 3C028012 */ lui $v0, 0x8012 +/* 09D904 8009CD04 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012 /* 09D908 8009CD08 01C87821 */ addu $t7, $t6, $t0 /* 09D90C 8009CD0C 85EC0006 */ lh $t4, 6($t7) /* 09D910 8009CD10 00000000 */ nop /* 09D914 8009CD14 000CC880 */ sll $t9, $t4, 2 /* 09D918 8009CD18 00591021 */ addu $v0, $v0, $t9 -/* 09D91C 8009CD1C 8C426550 */ lw $v0, 0x6550($v0) +/* 09D91C 8009CD1C 8C426550 */ lw $v0, %lo(D_80126550)($v0) /* 09D920 8009CD20 00000000 */ nop /* 09D924 8009CD24 8C440000 */ lw $a0, ($v0) /* 09D928 8009CD28 0C02735F */ jal func_8009CD7C diff --git a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s index 466b590c..d6e31d9e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s @@ -115,10 +115,10 @@ glabel func_800A01A0 /* 0A0F4C 800A034C AC2C6D10 */ sw $t4, %lo(D_80126D10)($at) .L800A0350: /* 0A0F50 800A0350 8DAD6D08 */ lw $t5, %lo(D_80126D08)($t5) -/* 0A0F54 800A0354 3C188012 */ lui $t8, 0x8012 +/* 0A0F54 800A0354 3C188012 */ lui $t8, %hi(D_80126CE0) # $t8, 0x8012 /* 0A0F58 800A0358 000D7080 */ sll $t6, $t5, 2 /* 0A0F5C 800A035C 030EC021 */ addu $t8, $t8, $t6 -/* 0A0F60 800A0360 8F186CE0 */ lw $t8, 0x6ce0($t8) +/* 0A0F60 800A0360 8F186CE0 */ lw $t8, %lo(D_80126CE0)($t8) /* 0A0F64 800A0364 3C018012 */ lui $at, %hi(D_80126CDC) # $at, 0x8012 /* 0A0F68 800A0368 AFA20028 */ sw $v0, 0x28($sp) /* 0A0F6C 800A036C 0C007910 */ jal func_8001E440 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3884.s b/asm/non_matchings/unknown_09F8F0/func_800A3884.s index 3b9f4020..72417d27 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A3884.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A3884.s @@ -147,9 +147,9 @@ glabel func_800A3884 /* 0A46A8 800A3AA8 00000000 */ nop .L800A3AAC: /* 0A46AC 800A3AAC 8DAD6D0C */ lw $t5, %lo(D_80126D0C)($t5) -/* 0A46B0 800A3AB0 3C0E800E */ lui $t6, 0x800e +/* 0A46B0 800A3AB0 3C0E800E */ lui $t6, %hi(D_800E27A4) # $t6, 0x800e /* 0A46B4 800A3AB4 01CD7021 */ addu $t6, $t6, $t5 -/* 0A46B8 800A3AB8 81CE27A4 */ lb $t6, 0x27a4($t6) +/* 0A46B8 800A3AB8 81CE27A4 */ lb $t6, %lo(D_800E27A4)($t6) /* 0A46BC 800A3ABC 3C0F8012 */ lui $t7, %hi(D_80126CD3) # $t7, 0x8012 /* 0A46C0 800A3AC0 15C00084 */ bnez $t6, .L800A3CD4 /* 0A46C4 800A3AC4 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8458.s b/asm/non_matchings/unknown_09F8F0/func_800A8458.s index a04bda95..445756b8 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8458.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8458.s @@ -1,9 +1,9 @@ glabel func_800A8458 /* 0A9058 800A8458 3C0E8012 */ lui $t6, %hi(D_80126D0C) # $t6, 0x8012 /* 0A905C 800A845C 8DCE6D0C */ lw $t6, %lo(D_80126D0C)($t6) -/* 0A9060 800A8460 3C02800E */ lui $v0, 0x800e +/* 0A9060 800A8460 3C02800E */ lui $v0, %hi(D_800E27A4) # $v0, 0x800e /* 0A9064 800A8464 004E1021 */ addu $v0, $v0, $t6 -/* 0A9068 800A8468 804227A4 */ lb $v0, 0x27a4($v0) +/* 0A9068 800A8468 804227A4 */ lb $v0, %lo(D_800E27A4)($v0) /* 0A906C 800A846C 03E00008 */ jr $ra /* 0A9070 800A8470 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 591c69a8..c1646dd2 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -194,9 +194,9 @@ glabel func_800A8474 /* 0A934C 800A874C 1461000E */ bne $v1, $at, .L800A8788 /* 0A9350 800A8750 3C0B8012 */ lui $t3, %hi(D_80126D0C) # $t3, 0x8012 /* 0A9354 800A8754 8D6B6D0C */ lw $t3, %lo(D_80126D0C)($t3) -/* 0A9358 800A8758 3C0C800E */ lui $t4, 0x800e +/* 0A9358 800A8758 3C0C800E */ lui $t4, %hi(D_800E27A4) # $t4, 0x800e /* 0A935C 800A875C 018B6021 */ addu $t4, $t4, $t3 -/* 0A9360 800A8760 818C27A4 */ lb $t4, 0x27a4($t4) +/* 0A9360 800A8760 818C27A4 */ lb $t4, %lo(D_800E27A4)($t4) /* 0A9364 800A8764 8FA5016C */ lw $a1, 0x16c($sp) /* 0A9368 800A8768 15800008 */ bnez $t4, .L800A878C /* 0A936C 800A876C 24010003 */ li $at, 3 @@ -421,9 +421,9 @@ glabel func_800A8474 /* 0A96A0 800A8AA0 1461001B */ bne $v1, $at, .L800A8B10 /* 0A96A4 800A8AA4 3C0A8012 */ lui $t2, %hi(D_80126D0C) # $t2, 0x8012 /* 0A96A8 800A8AA8 8D4A6D0C */ lw $t2, %lo(D_80126D0C)($t2) -/* 0A96AC 800A8AAC 3C0B800E */ lui $t3, 0x800e +/* 0A96AC 800A8AAC 3C0B800E */ lui $t3, %hi(D_800E27A4) # $t3, 0x800e /* 0A96B0 800A8AB0 016A5821 */ addu $t3, $t3, $t2 -/* 0A96B4 800A8AB4 816B27A4 */ lb $t3, 0x27a4($t3) +/* 0A96B4 800A8AB4 816B27A4 */ lb $t3, %lo(D_800E27A4)($t3) /* 0A96B8 800A8AB8 00000000 */ nop /* 0A96BC 800A8ABC 15600015 */ bnez $t3, .L800A8B14 /* 0A96C0 800A8AC0 24010003 */ li $at, 3 @@ -875,9 +875,9 @@ glabel func_800A8474 /* 0A9D68 800A9168 1461007C */ bne $v1, $at, .L800A935C /* 0A9D6C 800A916C 3C0D8012 */ lui $t5, %hi(D_80126D0C) # $t5, 0x8012 /* 0A9D70 800A9170 8DAD6D0C */ lw $t5, %lo(D_80126D0C)($t5) -/* 0A9D74 800A9174 3C0E800E */ lui $t6, 0x800e +/* 0A9D74 800A9174 3C0E800E */ lui $t6, %hi(D_800E27A4) # $t6, 0x800e /* 0A9D78 800A9178 01CD7021 */ addu $t6, $t6, $t5 -/* 0A9D7C 800A917C 81CE27A4 */ lb $t6, 0x27a4($t6) +/* 0A9D7C 800A917C 81CE27A4 */ lb $t6, %lo(D_800E27A4)($t6) /* 0A9D80 800A9180 3C128012 */ lui $s2, %hi(D_80126CDC) # $s2, 0x8012 /* 0A9D84 800A9184 15C00075 */ bnez $t6, .L800A935C /* 0A9D88 800A9188 26526CDC */ addiu $s2, %lo(D_80126CDC) # addiu $s2, $s2, 0x6cdc @@ -1397,9 +1397,9 @@ glabel func_800A8474 /* 0AA524 800A9924 148002A9 */ bnez $a0, .L800AA3CC /* 0AA528 800A9928 3C0A8012 */ lui $t2, %hi(D_80126D0C) # $t2, 0x8012 /* 0AA52C 800A992C 8D4A6D0C */ lw $t2, %lo(D_80126D0C)($t2) -/* 0AA530 800A9930 3C0B800E */ lui $t3, 0x800e +/* 0AA530 800A9930 3C0B800E */ lui $t3, %hi(D_800E27A4) # $t3, 0x800e /* 0AA534 800A9934 016A5821 */ addu $t3, $t3, $t2 -/* 0AA538 800A9938 816B27A4 */ lb $t3, 0x27a4($t3) +/* 0AA538 800A9938 816B27A4 */ lb $t3, %lo(D_800E27A4)($t3) /* 0AA53C 800A993C 24010001 */ li $at, 1 /* 0AA540 800A9940 11610003 */ beq $t3, $at, .L800A9950 /* 0AA544 800A9944 00000000 */ nop