From 0286743ae504eed9854ca6b36634ef61125706ba Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 10 Dec 2020 16:11:43 +0900 Subject: [PATCH] asm update --- asm/boot.s | 4 +- .../code_102610_len_2330/func_802E1EDC.s | 4 +- .../code_104940_len_dc0/func_802E3370.s | 4 +- .../code_105700_len_2130/func_802E4730.s | 4 +- .../code_105700_len_2130/func_802E586C.s | 4 +- .../code_121f0_len_1290/func_80037BC8.s | 4 +- .../code_1370_len_7d0/func_80026164.s | 4 +- .../code_13870_len_6980/func_8003DC38.s | 4 +- .../pause_partners_draw_contents.s | 12 +- .../code_13E120/pause_partners_init.s | 4 +- .../code_16F740/update_run_away.s | 4 +- asm/nonmatchings/code_1776B0/use_cam_preset.s | 16 +- asm/nonmatchings/code_18C790/func_8025E190.s | 4 +- .../code_25f00_len_940/func_8004AB00.s | 2 +- .../code_25f00_len_940/nuAuCleanDMABuffers.s | 10 +- .../code_25f00_len_940/nuAuDmaCallBack.s | 22 +-- asm/nonmatchings/code_316a70/func_80200080.s | 4 +- asm/nonmatchings/code_333EC0/func_E00205D0.s | 4 +- asm/nonmatchings/code_337240/func_E0022998.s | 8 +- asm/nonmatchings/code_339250/func_E0024454.s | 4 +- asm/nonmatchings/code_33FE80/func_E002C414.s | 4 +- asm/nonmatchings/code_342140/func_E0030A68.s | 4 +- asm/nonmatchings/code_343680/func_E003245C.s | 4 +- asm/nonmatchings/code_354F60/func_E004491C.s | 8 +- asm/nonmatchings/code_3584C0/func_E004A78C.s | 4 +- asm/nonmatchings/code_36A8D0/func_E0068234.s | 4 +- asm/nonmatchings/code_372790/func_E006E35C.s | 4 +- asm/nonmatchings/code_389850/func_E00863B4.s | 4 +- asm/nonmatchings/code_38ADF0/func_E00887E0.s | 4 +- asm/nonmatchings/code_3AEE20/func_E00AC2A4.s | 4 +- asm/nonmatchings/code_3B2350/func_E00AE54C.s | 4 +- asm/nonmatchings/code_3B3EB0/func_E00B0234.s | 4 +- .../update_player_shadow.s | 4 +- .../code_891b0_len_fb0/func_800F0490.s | 4 +- .../code_8a160_len_700/func_800F102C.s | 4 +- .../code_8e790_len_2850/draw_box.s | 8 +- .../code_a5dd0_len_114e0/func_801180E8.s | 184 +++++++++--------- .../code_b72b0_len_15ed0/func_80121184.s | 4 +- .../code_b72b0_len_15ed0/func_80122288.s | 4 +- .../code_b72b0_len_15ed0/func_80126790.s | 4 +- .../code_b72b0_len_15ed0/func_80127D90.s | 4 +- .../code_b72b0_len_15ed0/func_8012DB58.s | 4 +- .../code_b72b0_len_15ed0/func_8012E9A0.s | 4 +- .../code_b72b0_len_15ed0/func_8012EC94.s | 4 +- .../code_cd180_len_38f0/func_80136A80.s | 4 +- .../code_cd180_len_38f0/func_80138E54.s | 4 +- .../code_d0a70_len_4fe0/func_8013E2F0.s | 4 +- .../code_dc470_len_14c0/func_80145EC0.s | 4 +- .../os/code_3cb20_len_130/osInvalDCache.s | 4 +- .../os/code_3cb20_len_130/osInvalICache.s | 4 +- .../os/code_3cc50_len_80/osWritebackDCache.s | 4 +- .../code_3ccd0_len_30/osWritebackDCacheAll.s | 4 +- .../os/code_42470_len_310/osViSwapContext.s | 4 +- .../hos_05/A2AAC0/func_80243758_A2D998.s | 4 +- .../kmr_21/8FEE90/func_80240010_8FEE90.s | 4 +- tools/n64splat | 2 +- undefined_syms_auto.txt | 45 ----- 57 files changed, 228 insertions(+), 273 deletions(-) diff --git a/asm/boot.s b/asm/boot.s index 068c67d388..f1df16c865 100644 --- a/asm/boot.s +++ b/asm/boot.s @@ -291,14 +291,14 @@ glabel func_A4000040 .LA4000458: /* 458 A4000458 3C0AA400 */ lui $t2, %hi(D_A4000000) /* 45C A400045C 254A0000 */ addiu $t2, $t2, %lo(D_A4000000) -/* 460 A4000460 3C0BFFF0 */ lui $t3, %hi(D_FFF00768) +/* 460 A4000460 3C0BFFF0 */ lui $t3, 0xfff0 /* 464 A4000464 3C090010 */ lui $t1, 0x10 /* 468 A4000468 014B5024 */ and $t2, $t2, $t3 /* 46C A400046C 3C08A400 */ lui $t0, %hi(D_A40004C0) /* 470 A4000470 2529FFFF */ addiu $t1, $t1, -1 /* 474 A4000474 3C0BA400 */ lui $t3, %hi(D_A4000768) /* 478 A4000478 250804C0 */ addiu $t0, $t0, %lo(D_A40004C0) -/* 47C A400047C 256B0768 */ addiu $t3, $t3, %lo(D_FFF00768) +/* 47C A400047C 256B0768 */ addiu $t3, $t3, %lo(D_A4000768) /* 480 A4000480 01094024 */ and $t0, $t0, $t1 /* 484 A4000484 01695824 */ and $t3, $t3, $t1 /* 488 A4000488 3C09A000 */ lui $t1, %hi(D_A0000000) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s b/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s index 0243403684..17b5f0e587 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1EDC.s @@ -174,7 +174,7 @@ glabel func_802E1EDC /* 1039E4 802E2164 00000000 */ nop .L802E2168: /* 1039E8 802E2168 C602001C */ lwc1 $f2, 0x1c($s0) -/* 1039EC 802E216C 3C01BFE0 */ lui $at, %hi(D_BFDFB110) +/* 1039EC 802E216C 3C01BFE0 */ lui $at, 0xbfe0 /* 1039F0 802E2170 44810800 */ mtc1 $at, $f1 /* 1039F4 802E2174 44800000 */ mtc1 $zero, $f0 /* 1039F8 802E2178 080B888A */ j .L802E2228 @@ -182,7 +182,7 @@ glabel func_802E1EDC .L802E2180: /* 103A00 802E2180 C602001C */ lwc1 $f2, 0x1c($s0) /* 103A04 802E2184 3C01802F */ lui $at, %hi(D_802EB110) -/* 103A08 802E2188 D420B110 */ ldc1 $f0, %lo(D_BFDFB110)($at) +/* 103A08 802E2188 D420B110 */ ldc1 $f0, %lo(D_802EB110)($at) /* 103A0C 802E218C 460010A1 */ cvt.d.s $f2, $f2 /* 103A10 802E2190 46201082 */ mul.d $f2, $f2, $f0 /* 103A14 802E2194 00000000 */ nop diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s index fb0fed7aea..12015016b3 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s @@ -16,7 +16,7 @@ glabel func_802E3370 /* 104C1C 802E339C 10400003 */ beqz $v0, .L802E33AC /* 104C20 802E33A0 00A0902D */ daddu $s2, $a1, $zero /* 104C24 802E33A4 080B8D29 */ j .L802E34A4 -/* 104C28 802E33A8 3C03FFDF */ lui $v1, %hi(D_FFDF0001) +/* 104C28 802E33A8 3C03FFDF */ lui $v1, 0xffdf .L802E33AC: /* 104C2C 802E33AC 8624000E */ lh $a0, 0xe($s1) /* 104C30 802E33B0 9623000E */ lhu $v1, 0xe($s1) @@ -24,7 +24,7 @@ glabel func_802E3370 /* 104C38 802E33B8 1440003F */ bnez $v0, .L802E34B8 /* 104C3C 802E33BC 28820096 */ slti $v0, $a0, 0x96 /* 104C40 802E33C0 1440009C */ bnez $v0, .L802E3634 -/* 104C44 802E33C4 24620001 */ addiu $v0, $v1, %lo(D_FFDF0001) +/* 104C44 802E33C4 24620001 */ addiu $v0, $v1, 1 /* 104C48 802E33C8 C6220014 */ lwc1 $f2, 0x14($s1) /* 104C4C 802E33CC 3C0141C8 */ lui $at, 0x41c8 /* 104C50 802E33D0 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4730.s b/asm/nonmatchings/code_105700_len_2130/func_802E4730.s index af8d31e74c..afb2ebf153 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4730.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4730.s @@ -107,14 +107,14 @@ glabel func_802E4730 /* 106140 802E48C0 269441F0 */ addiu $s4, $s4, %lo(D_800741F0) /* 106144 802E48C4 AFB60058 */ sw $s6, 0x58($sp) /* 106148 802E48C8 96820000 */ lhu $v0, ($s4) -/* 10614C 802E48CC 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 10614C 802E48CC 3C03DA38 */ lui $v1, 0xda38 /* 106150 802E48D0 AD430000 */ sw $v1, ($t2) /* 106154 802E48D4 24430001 */ addiu $v1, $v0, 1 /* 106158 802E48D8 3042FFFF */ andi $v0, $v0, 0xffff /* 10615C 802E48DC 00021180 */ sll $v0, $v0, 6 /* 106160 802E48E0 A6830000 */ sh $v1, ($s4) /* 106164 802E48E4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 106168 802E48E8 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 106168 802E48E8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 10616C 802E48EC 00561021 */ addu $v0, $v0, $s6 /* 106170 802E48F0 00621821 */ addu $v1, $v1, $v0 /* 106174 802E48F4 3C02DE00 */ lui $v0, 0xde00 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E586C.s b/asm/nonmatchings/code_105700_len_2130/func_802E586C.s index 5b741999d3..81187cac9f 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E586C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E586C.s @@ -137,14 +137,14 @@ glabel func_802E586C /* 1072EC 802E5A6C 27DE41F0 */ addiu $fp, $fp, %lo(D_800741F0) /* 1072F0 802E5A70 AFB80064 */ sw $t8, 0x64($sp) /* 1072F4 802E5A74 97C20000 */ lhu $v0, ($fp) -/* 1072F8 802E5A78 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 1072F8 802E5A78 3C03DA38 */ lui $v1, 0xda38 /* 1072FC 802E5A7C ADC30000 */ sw $v1, ($t6) /* 107300 802E5A80 24430001 */ addiu $v1, $v0, 1 /* 107304 802E5A84 3042FFFF */ andi $v0, $v0, 0xffff /* 107308 802E5A88 00021180 */ sll $v0, $v0, 6 /* 10730C 802E5A8C A7C30000 */ sh $v1, ($fp) /* 107310 802E5A90 3C03800A */ lui $v1, %hi(D_8009A674) -/* 107314 802E5A94 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 107314 802E5A94 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 107318 802E5A98 00581021 */ addu $v0, $v0, $t8 /* 10731C 802E5A9C 00621821 */ addu $v1, $v1, $v0 /* 107320 802E5AA0 3C02FD10 */ lui $v0, 0xfd10 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s b/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s index 7e555118e9..a1275a0c58 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s @@ -75,13 +75,13 @@ glabel func_80037BC8 /* 130C8 80037CC8 24A5A66C */ addiu $a1, $a1, %lo(D_8009A66C) /* 130CC 80037CCC 35CE0400 */ ori $t6, $t6, 0x400 /* 130D0 80037CD0 8CA20000 */ lw $v0, ($a1) -/* 130D4 80037CD4 3C03DE00 */ lui $v1, %hi(D_DE007A50) +/* 130D4 80037CD4 3C03DE00 */ lui $v1, 0xde00 /* 130D8 80037CD8 0040202D */ daddu $a0, $v0, $zero /* 130DC 80037CDC 24420008 */ addiu $v0, $v0, 8 /* 130E0 80037CE0 ACA20000 */ sw $v0, ($a1) /* 130E4 80037CE4 AC830000 */ sw $v1, ($a0) /* 130E8 80037CE8 3C038007 */ lui $v1, %hi(D_80077A50) -/* 130EC 80037CEC 24637A50 */ addiu $v1, $v1, %lo(D_DE007A50) +/* 130EC 80037CEC 24637A50 */ addiu $v1, $v1, %lo(D_80077A50) /* 130F0 80037CF0 AC830004 */ sw $v1, 4($a0) /* 130F4 80037CF4 24430008 */ addiu $v1, $v0, 8 /* 130F8 80037CF8 ACA30000 */ sw $v1, ($a1) diff --git a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s index 3a16c1f1d2..10fd8bea6e 100644 --- a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s +++ b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s @@ -136,14 +136,14 @@ glabel func_80026164 /* 1770 80026370 24620048 */ addiu $v0, $v1, 0x48 /* 1774 80026374 AC6E0038 */ sw $t6, 0x38($v1) /* 1778 80026378 AE420000 */ sw $v0, ($s2) -/* 177C 8002637C 3C02F900 */ lui $v0, %hi(D_F9003E10) +/* 177C 8002637C 3C02F900 */ lui $v0, 0xf900 /* 1780 80026380 AC620040 */ sw $v0, 0x40($v1) /* 1784 80026384 2402007F */ addiu $v0, $zero, 0x7f /* 1788 80026388 AC620044 */ sw $v0, 0x44($v1) /* 178C 8002638C 24620050 */ addiu $v0, $v1, 0x50 /* 1790 80026390 AE420000 */ sw $v0, ($s2) /* 1794 80026394 3C028007 */ lui $v0, %hi(D_80073E10) -/* 1798 80026398 24423E10 */ addiu $v0, $v0, %lo(D_F9003E10) +/* 1798 80026398 24423E10 */ addiu $v0, $v0, %lo(D_80073E10) /* 179C 8002639C AC6F0048 */ sw $t7, 0x48($v1) /* 17A0 800263A0 AC62004C */ sw $v0, 0x4c($v1) /* 17A4 800263A4 24620058 */ addiu $v0, $v1, 0x58 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s index 8ec0bd12dc..91312d186c 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s @@ -73,13 +73,13 @@ glabel func_8003DC38 /* 19144 8003DD44 46800020 */ cvt.s.w $f0, $f0 /* 19148 8003DD48 46006307 */ neg.s $f12, $f12 /* 1914C 8003DD4C 46006300 */ add.s $f12, $f12, $f0 -/* 19150 8003DD50 3C01C000 */ lui $at, %hi(D_C0007C28) +/* 19150 8003DD50 3C01C000 */ lui $at, 0xc000 /* 19154 8003DD54 4481A000 */ mtc1 $at, $f20 /* 19158 8003DD58 3C0140A0 */ lui $at, 0x40a0 /* 1915C 8003DD5C 44810000 */ mtc1 $at, $f0 /* 19160 8003DD60 46041080 */ add.s $f2, $f2, $f4 /* 19164 8003DD64 3C018007 */ lui $at, %hi(D_80077C28) -/* 19168 8003DD68 A4207C28 */ sh $zero, %lo(D_C0007C28)($at) +/* 19168 8003DD68 A4207C28 */ sh $zero, %lo(D_80077C28)($at) /* 1916C 8003DD6C 46001083 */ div.s $f2, $f2, $f0 /* 19170 8003DD70 0C00A6C9 */ jal clamp_angle /* 19174 8003DD74 4602A501 */ sub.s $f20, $f20, $f2 diff --git a/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s index c9693a49ac..c5d9bdcfb8 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s @@ -123,14 +123,14 @@ glabel pause_partners_draw_contents .L8024B0CC: /* 13E40C 8024B0CC 2401FFFF */ addiu $at, $zero, -1 /* 13E410 8024B0D0 14410004 */ bne $v0, $at, .L8024B0E4 -/* 13E414 8024B0D4 3C018000 */ lui $at, %hi(D_800006A8) +/* 13E414 8024B0D4 3C018000 */ lui $at, 0x8000 /* 13E418 8024B0D8 16610002 */ bne $s3, $at, .L8024B0E4 /* 13E41C 8024B0DC 00000000 */ nop /* 13E420 8024B0E0 0006000D */ break 6 .L8024B0E4: /* 13E424 8024B0E4 00001012 */ mflo $v0 /* 13E428 8024B0E8 3C018027 */ lui $at, %hi(D_802706A8) -/* 13E42C 8024B0EC C42006A8 */ lwc1 $f0, %lo(D_800006A8)($at) +/* 13E42C 8024B0EC C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E430 8024B0F0 44826000 */ mtc1 $v0, $f12 /* 13E434 8024B0F4 00000000 */ nop /* 13E438 8024B0F8 46806320 */ cvt.s.w $f12, $f12 @@ -212,14 +212,14 @@ glabel pause_partners_draw_contents .L8024B210: /* 13E550 8024B210 2401FFFF */ addiu $at, $zero, -1 /* 13E554 8024B214 14810004 */ bne $a0, $at, .L8024B228 -/* 13E558 8024B218 3C018000 */ lui $at, %hi(D_800006A8) +/* 13E558 8024B218 3C018000 */ lui $at, 0x8000 /* 13E55C 8024B21C 14410002 */ bne $v0, $at, .L8024B228 /* 13E560 8024B220 00000000 */ nop /* 13E564 8024B224 0006000D */ break 6 .L8024B228: /* 13E568 8024B228 00001012 */ mflo $v0 /* 13E56C 8024B22C 3C018027 */ lui $at, %hi(D_802706A8) -/* 13E570 8024B230 C42006A8 */ lwc1 $f0, %lo(D_800006A8)($at) +/* 13E570 8024B230 C42006A8 */ lwc1 $f0, %lo(D_802706A8)($at) /* 13E574 8024B234 4482A000 */ mtc1 $v0, $f20 /* 13E578 8024B238 00000000 */ nop /* 13E57C 8024B23C 4680A520 */ cvt.s.w $f20, $f20 @@ -565,13 +565,13 @@ glabel pause_partners_draw_contents /* 13EAA0 8024B760 01A21021 */ addu $v0, $t5, $v0 /* 13EAA4 8024B764 AFA20124 */ sw $v0, 0x124($sp) /* 13EAA8 8024B768 8E230000 */ lw $v1, ($s1) -/* 13EAAC 8024B76C 3C02DE00 */ lui $v0, %hi(D_DDFFF750) +/* 13EAAC 8024B76C 3C02DE00 */ lui $v0, 0xde00 /* 13EAB0 8024B770 0060202D */ daddu $a0, $v1, $zero /* 13EAB4 8024B774 24630008 */ addiu $v1, $v1, 8 /* 13EAB8 8024B778 AE230000 */ sw $v1, ($s1) /* 13EABC 8024B77C AC820000 */ sw $v0, ($a0) /* 13EAC0 8024B780 3C028025 */ lui $v0, %hi(D_8024F750) -/* 13EAC4 8024B784 2442F750 */ addiu $v0, $v0, %lo(D_DDFFF750) +/* 13EAC4 8024B784 2442F750 */ addiu $v0, $v0, %lo(D_8024F750) /* 13EAC8 8024B788 AC820004 */ sw $v0, 4($a0) /* 13EACC 8024B78C 24620008 */ addiu $v0, $v1, 8 /* 13EAD0 8024B790 AE220000 */ sw $v0, ($s1) diff --git a/asm/nonmatchings/code_13E120/pause_partners_init.s b/asm/nonmatchings/code_13E120/pause_partners_init.s index ed9e66c6ba..54b2347097 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_init.s +++ b/asm/nonmatchings/code_13E120/pause_partners_init.s @@ -136,14 +136,14 @@ glabel pause_partners_init .L8024C2C8: /* 13F608 8024C2C8 2401FFFF */ addiu $at, $zero, -1 /* 13F60C 8024C2CC 14610004 */ bne $v1, $at, .L8024C2E0 -/* 13F610 8024C2D0 3C018000 */ lui $at, %hi(D_800006A4) +/* 13F610 8024C2D0 3C018000 */ lui $at, 0x8000 /* 13F614 8024C2D4 14410002 */ bne $v0, $at, .L8024C2E0 /* 13F618 8024C2D8 00000000 */ nop /* 13F61C 8024C2DC 0006000D */ break 6 .L8024C2E0: /* 13F620 8024C2E0 00001012 */ mflo $v0 /* 13F624 8024C2E4 3C018027 */ lui $at, %hi(D_802706A4) -/* 13F628 8024C2E8 AC2006A4 */ sw $zero, %lo(D_800006A4)($at) +/* 13F628 8024C2E8 AC2006A4 */ sw $zero, %lo(D_802706A4)($at) /* 13F62C 8024C2EC 3C018027 */ lui $at, %hi(D_802706AC) /* 13F630 8024C2F0 AC2006AC */ sw $zero, %lo(D_802706AC)($at) /* 13F634 8024C2F4 44820000 */ mtc1 $v0, $f0 diff --git a/asm/nonmatchings/code_16F740/update_run_away.s b/asm/nonmatchings/code_16F740/update_run_away.s index ebbdb6278a..d29d3d8f90 100644 --- a/asm/nonmatchings/code_16F740/update_run_away.s +++ b/asm/nonmatchings/code_16F740/update_run_away.s @@ -167,14 +167,14 @@ glabel update_run_away .L80245160: /* 173A40 80245160 2401FFFF */ addiu $at, $zero, -1 /* 173A44 80245164 14610004 */ bne $v1, $at, .L80245178 -/* 173A48 80245168 3C018000 */ lui $at, %hi(D_7FFFF264) +/* 173A48 80245168 3C018000 */ lui $at, 0x8000 /* 173A4C 8024516C 14410002 */ bne $v0, $at, .L80245178 /* 173A50 80245170 00000000 */ nop /* 173A54 80245174 0006000D */ break 6 .L80245178: /* 173A58 80245178 00002012 */ mflo $a0 /* 173A5C 8024517C 3C01802A */ lui $at, %hi(D_8029F264) -/* 173A60 80245180 AC20F264 */ sw $zero, %lo(D_7FFFF264)($at) +/* 173A60 80245180 AC20F264 */ sw $zero, %lo(D_8029F264)($at) /* 173A64 80245184 3C01802A */ lui $at, %hi(D_8029F24C) /* 173A68 80245188 AC20F24C */ sw $zero, %lo(D_8029F24C)($at) /* 173A6C 8024518C 3C018028 */ lui $at, %hi(D_80280A30) diff --git a/asm/nonmatchings/code_1776B0/use_cam_preset.s b/asm/nonmatchings/code_1776B0/use_cam_preset.s index 2e87600f17..a00adf398f 100644 --- a/asm/nonmatchings/code_1776B0/use_cam_preset.s +++ b/asm/nonmatchings/code_1776B0/use_cam_preset.s @@ -321,14 +321,14 @@ glabel use_cam_preset /* 17BD00 8024D420 A0220CE0 */ sb $v0, %lo(D_80280CE0)($at) /* 17BD04 8024D424 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BD08 8024D428 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) -/* 17BD0C 8024D42C 3C01C2BE */ lui $at, %hi(D_C2BDF280) +/* 17BD0C 8024D42C 3C01C2BE */ lui $at, 0xc2be /* 17BD10 8024D430 44816000 */ mtc1 $at, $f12 /* 17BD14 8024D434 3C014190 */ lui $at, 0x4190 /* 17BD18 8024D438 44817000 */ mtc1 $at, $f14 /* 17BD1C 8024D43C 3C064120 */ lui $a2, 0x4120 /* 17BD20 8024D440 240200FF */ addiu $v0, $zero, 0xff /* 17BD24 8024D444 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BD28 8024D448 A422F280 */ sh $v0, %lo(D_C2BDF280)($at) +/* 17BD28 8024D448 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17BD2C 8024D44C 24020008 */ addiu $v0, $zero, 8 /* 17BD30 8024D450 3C01802A */ lui $at, %hi(D_8029F284) /* 17BD34 8024D454 A422F284 */ sh $v0, %lo(D_8029F284)($at) @@ -461,13 +461,13 @@ glabel use_cam_preset /* 17BF30 8024D650 00000000 */ nop /* 17BF34 8024D654 3C108028 */ lui $s0, %hi(D_80280D90) /* 17BF38 8024D658 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) -/* 17BF3C 8024D65C 3C01C282 */ lui $at, %hi(D_C281F280) +/* 17BF3C 8024D65C 3C01C282 */ lui $at, 0xc282 /* 17BF40 8024D660 44810000 */ mtc1 $at, $f0 /* 17BF44 8024D664 3C0141F0 */ lui $at, 0x41f0 /* 17BF48 8024D668 44811000 */ mtc1 $at, $f2 /* 17BF4C 8024D66C 2402012C */ addiu $v0, $zero, 0x12c /* 17BF50 8024D670 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BF54 8024D674 A422F280 */ sh $v0, %lo(D_C281F280)($at) +/* 17BF54 8024D674 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17BF58 8024D678 24020008 */ addiu $v0, $zero, 8 /* 17BF5C 8024D67C 3C01802A */ lui $at, %hi(D_8029F284) /* 17BF60 8024D680 A422F284 */ sh $v0, %lo(D_8029F284)($at) @@ -851,13 +851,13 @@ glabel use_cam_preset /* 17C534 8024DC54 00000000 */ nop /* 17C538 8024DC58 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C53C 8024DC5C 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) -/* 17C540 8024DC60 3C01C296 */ lui $at, %hi(D_C295F280) +/* 17C540 8024DC60 3C01C296 */ lui $at, 0xc296 /* 17C544 8024DC64 44810000 */ mtc1 $at, $f0 /* 17C548 8024DC68 3C014316 */ lui $at, 0x4316 /* 17C54C 8024DC6C 44811000 */ mtc1 $at, $f2 /* 17C550 8024DC70 240200A6 */ addiu $v0, $zero, 0xa6 /* 17C554 8024DC74 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C558 8024DC78 A422F280 */ sh $v0, %lo(D_C295F280)($at) +/* 17C558 8024DC78 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17C55C 8024DC7C 24020008 */ addiu $v0, $zero, 8 /* 17C560 8024DC80 3C01802A */ lui $at, %hi(D_8029F284) /* 17C564 8024DC84 A422F284 */ sh $v0, %lo(D_8029F284)($at) @@ -1046,13 +1046,13 @@ glabel use_cam_preset /* 17C838 8024DF58 00000000 */ nop /* 17C83C 8024DF5C 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C840 8024DF60 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) -/* 17C844 8024DF64 3C01C2BE */ lui $at, %hi(D_C2BDF280) +/* 17C844 8024DF64 3C01C2BE */ lui $at, 0xc2be /* 17C848 8024DF68 44810000 */ mtc1 $at, $f0 /* 17C84C 8024DF6C 3C0141B0 */ lui $at, 0x41b0 /* 17C850 8024DF70 44811000 */ mtc1 $at, $f2 /* 17C854 8024DF74 240200D2 */ addiu $v0, $zero, 0xd2 /* 17C858 8024DF78 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C85C 8024DF7C A422F280 */ sh $v0, %lo(D_C2BDF280)($at) +/* 17C85C 8024DF7C A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17C860 8024DF80 24020008 */ addiu $v0, $zero, 8 /* 17C864 8024DF84 3C01802A */ lui $at, %hi(D_8029F284) /* 17C868 8024DF88 A422F284 */ sh $v0, %lo(D_8029F284)($at) diff --git a/asm/nonmatchings/code_18C790/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s index c7f6cca229..981aa4c399 100644 --- a/asm/nonmatchings/code_18C790/func_8025E190.s +++ b/asm/nonmatchings/code_18C790/func_8025E190.s @@ -125,14 +125,14 @@ glabel func_8025E190 .L8025E364: /* 18CC44 8025E364 2401FFFF */ addiu $at, $zero, -1 /* 18CC48 8025E368 14610004 */ bne $v1, $at, .L8025E37C -/* 18CC4C 8025E36C 3C018000 */ lui $at, %hi(D_7FFFFB78) +/* 18CC4C 8025E36C 3C018000 */ lui $at, 0x8000 /* 18CC50 8025E370 14810002 */ bne $a0, $at, .L8025E37C /* 18CC54 8025E374 00000000 */ nop /* 18CC58 8025E378 0006000D */ break 6 .L8025E37C: /* 18CC5C 8025E37C 00002012 */ mflo $a0 /* 18CC60 8025E380 3C01802A */ lui $at, %hi(D_8029FB78) -/* 18CC64 8025E384 AC20FB78 */ sw $zero, %lo(D_7FFFFB78)($at) +/* 18CC64 8025E384 AC20FB78 */ sw $zero, %lo(D_8029FB78)($at) /* 18CC68 8025E388 3C01802A */ lui $at, %hi(D_8029FB54) /* 18CC6C 8025E38C AC23FB54 */ sw $v1, %lo(D_8029FB54)($at) /* 18CC70 8025E390 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s index 7192171a4f..5a3d1080cf 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s @@ -164,7 +164,7 @@ glabel func_8004AB00 /* 2616C 8004AD6C 27A50018 */ addiu $a1, $sp, 0x18 /* 26170 8004AD70 8FA40020 */ lw $a0, 0x20($sp) /* 26174 8004AD74 0C014B97 */ jal func_80052E5C -/* 26178 8004AD78 00000000 */ nop +/* 26178 8004AD78 00000000 */ nop /* 2617C 8004AD7C 3C10800A */ lui $s0, %hi(D_800A0F58) /* 26180 8004AD80 26100F58 */ addiu $s0, $s0, %lo(D_800A0F58) /* 26184 8004AD84 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s b/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s index a6917987a5..b8fc042bf6 100644 --- a/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s +++ b/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s @@ -14,8 +14,8 @@ glabel nuAuCleanDMABuffers /* 2668C 8004B28C 0040902D */ daddu $s2, $v0, $zero .L8004B290: /* 26690 8004B290 8E02000C */ lw $v0, 0xc($s0) -/* 26694 8004B294 3C038008 */ lui $v1, %hi(D_8007817C) -/* 26698 8004B298 8C63817C */ lw $v1, %lo(D_8007817C)($v1) +/* 26694 8004B294 3C038008 */ lui $v1, %hi(nuAuFrameCounter) +/* 26698 8004B298 8C63817C */ lw $v1, %lo(nuAuFrameCounter)($v1) /* 2669C 8004B29C 8E110000 */ lw $s1, ($s0) /* 266A0 8004B2A0 24420001 */ addiu $v0, $v0, 1 /* 266A4 8004B2A4 0043102B */ sltu $v0, $v0, $v1 @@ -40,10 +40,10 @@ glabel nuAuCleanDMABuffers /* 266E8 8004B2E8 0220802D */ daddu $s0, $s1, $zero .L8004B2EC: /* 266EC 8004B2EC 1600FFE8 */ bnez $s0, .L8004B290 -/* 266F0 8004B2F0 00000000 */ nop +/* 266F0 8004B2F0 00000000 */ nop .L8004B2F4: -/* 266F4 8004B2F4 3C038008 */ lui $v1, %hi(D_8007817C) -/* 266F8 8004B2F8 2463817C */ addiu $v1, $v1, %lo(D_8007817C) +/* 266F4 8004B2F4 3C038008 */ lui $v1, %hi(nuAuFrameCounter) +/* 266F8 8004B2F8 2463817C */ addiu $v1, $v1, %lo(nuAuFrameCounter) /* 266FC 8004B2FC 8C620000 */ lw $v0, ($v1) /* 26700 8004B300 3C018008 */ lui $at, %hi(nuAuDmaNext) /* 26704 8004B304 AC208178 */ sw $zero, %lo(nuAuDmaNext)($at) diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s index 54c4a256e3..d6f1a17d0d 100644 --- a/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s +++ b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s @@ -12,9 +12,9 @@ glabel nuAuDmaCallBack /* 26490 8004B090 14E00005 */ bnez $a3, .L8004B0A8 /* 26494 8004B094 AFB00010 */ sw $s0, 0x10($sp) /* 26498 8004B098 0C0187A4 */ jal osVirtualToPhysical -/* 2649C 8004B09C 00000000 */ nop +/* 2649C 8004B09C 00000000 */ nop /* 264A0 8004B0A0 08012C82 */ j .L8004B208 -/* 264A4 8004B0A4 00000000 */ nop +/* 264A4 8004B0A4 00000000 */ nop .L8004B0A8: /* 264A8 8004B0A8 0000802D */ daddu $s0, $zero, $zero /* 264AC 8004B0AC 3C11800A */ lui $s1, %hi(D_800A3BD4) @@ -31,7 +31,7 @@ glabel nuAuDmaCallBack /* 264D4 8004B0D4 0220802D */ daddu $s0, $s1, $zero /* 264D8 8004B0D8 8E310000 */ lw $s1, ($s1) /* 264DC 8004B0DC 1620FFF7 */ bnez $s1, .L8004B0BC -/* 264E0 8004B0E0 00000000 */ nop +/* 264E0 8004B0E0 00000000 */ nop .L8004B0E4: /* 264E4 8004B0E4 3C12800A */ lui $s2, %hi(nuAuDmaState) /* 264E8 8004B0E8 26523BD0 */ addiu $s2, $s2, %lo(nuAuDmaState) @@ -40,9 +40,9 @@ glabel nuAuDmaCallBack /* 264F4 8004B0F4 0220202D */ daddu $a0, $s1, $zero /* 264F8 8004B0F8 8E440004 */ lw $a0, 4($s2) /* 264FC 8004B0FC 0C0187A4 */ jal osVirtualToPhysical -/* 26500 8004B100 00000000 */ nop +/* 26500 8004B100 00000000 */ nop /* 26504 8004B104 08012C82 */ j .L8004B208 -/* 26508 8004B108 00000000 */ nop +/* 26508 8004B108 00000000 */ nop .L8004B10C: /* 2650C 8004B10C 8E220000 */ lw $v0, ($s1) /* 26510 8004B110 0C012D03 */ jal alUnlink @@ -52,7 +52,7 @@ glabel nuAuDmaCallBack /* 26520 8004B120 0C012CFB */ jal alLink /* 26524 8004B124 0200282D */ daddu $a1, $s0, $zero /* 26528 8004B128 08012C61 */ j .L8004B184 -/* 2652C 8004B12C 00000000 */ nop +/* 2652C 8004B12C 00000000 */ nop .L8004B130: /* 26530 8004B130 8E450004 */ lw $a1, 4($s2) /* 26534 8004B134 10A00010 */ beqz $a1, .L8004B178 @@ -65,14 +65,14 @@ glabel nuAuDmaCallBack .L8004B150: /* 26550 8004B150 8E240010 */ lw $a0, 0x10($s1) /* 26554 8004B154 8E220008 */ lw $v0, 8($s1) -/* 26558 8004B158 3C038008 */ lui $v1, %hi(D_8007817C) -/* 2655C 8004B15C 8C63817C */ lw $v1, %lo(D_8007817C)($v1) +/* 26558 8004B158 3C038008 */ lui $v1, %hi(nuAuFrameCounter) +/* 2655C 8004B15C 8C63817C */ lw $v1, %lo(nuAuFrameCounter)($v1) /* 26560 8004B160 00932021 */ addu $a0, $a0, $s3 /* 26564 8004B164 00822023 */ subu $a0, $a0, $v0 /* 26568 8004B168 0C0187A4 */ jal osVirtualToPhysical /* 2656C 8004B16C AE23000C */ sw $v1, 0xc($s1) /* 26570 8004B170 08012C82 */ j .L8004B208 -/* 26574 8004B174 00000000 */ nop +/* 26574 8004B174 00000000 */ nop .L8004B178: /* 26578 8004B178 AE510004 */ sw $s1, 4($s2) /* 2657C 8004B17C AE200000 */ sw $zero, ($s1) @@ -92,8 +92,8 @@ glabel nuAuDmaCallBack /* 265B0 8004B1B0 00A32821 */ addu $a1, $a1, $v1 /* 265B4 8004B1B4 000528C0 */ sll $a1, $a1, 3 /* 265B8 8004B1B8 00A22821 */ addu $a1, $a1, $v0 -/* 265BC 8004B1BC 3C028008 */ lui $v0, %hi(D_8007817C) -/* 265C0 8004B1C0 8C42817C */ lw $v0, %lo(D_8007817C)($v0) +/* 265BC 8004B1BC 3C028008 */ lui $v0, %hi(nuAuFrameCounter) +/* 265C0 8004B1C0 8C42817C */ lw $v0, %lo(nuAuFrameCounter)($v0) /* 265C4 8004B1C4 24630001 */ addiu $v1, $v1, 1 /* 265C8 8004B1C8 AE22000C */ sw $v0, 0xc($s1) /* 265CC 8004B1CC AC830000 */ sw $v1, ($a0) diff --git a/asm/nonmatchings/code_316a70/func_80200080.s b/asm/nonmatchings/code_316a70/func_80200080.s index 3c4e6da5b3..f02f703480 100644 --- a/asm/nonmatchings/code_316a70/func_80200080.s +++ b/asm/nonmatchings/code_316a70/func_80200080.s @@ -29,13 +29,13 @@ glabel func_80200080 /* 316AC8 802000D8 34427508 */ ori $v0, $v0, 0x7508 /* 316ACC 802000DC 0000482D */ daddu $t1, $zero, $zero /* 316AD0 802000E0 00821021 */ addu $v0, $a0, $v0 -/* 316AD4 802000E4 3C03A000 */ lui $v1, %hi(D_A0006A70) +/* 316AD4 802000E4 3C03A000 */ lui $v1, 0xa000 /* 316AD8 802000E8 00431025 */ or $v0, $v0, $v1 /* 316ADC 802000EC 8C420000 */ lw $v0, ($v0) /* 316AE0 802000F0 3C080031 */ lui $t0, 0x31 /* 316AE4 802000F4 250869F0 */ addiu $t0, $t0, 0x69f0 /* 316AE8 802000F8 3C030031 */ lui $v1, 0x31 -/* 316AEC 802000FC 24636A70 */ addiu $v1, $v1, %lo(D_A0006A70) +/* 316AEC 802000FC 24636A70 */ addiu $v1, $v1, 0x6a70 /* 316AF0 80200100 01625823 */ subu $t3, $t3, $v0 /* 316AF4 80200104 0103102B */ sltu $v0, $t0, $v1 /* 316AF8 80200108 10400034 */ beqz $v0, .L802001DC diff --git a/asm/nonmatchings/code_333EC0/func_E00205D0.s b/asm/nonmatchings/code_333EC0/func_E00205D0.s index 02cdf417fc..bc117a8f12 100644 --- a/asm/nonmatchings/code_333EC0/func_E00205D0.s +++ b/asm/nonmatchings/code_333EC0/func_E00205D0.s @@ -419,7 +419,7 @@ glabel func_E00205D0 /* 334ADC E0020C1C ACA30004 */ sw $v1, 4($a1) /* 334AE0 E0020C20 24C20008 */ addiu $v0, $a2, 8 /* 334AE4 E0020C24 ACE20000 */ sw $v0, ($a3) -/* 334AE8 E0020C28 3C02DE00 */ lui $v0, %hi(D_DE000008) +/* 334AE8 E0020C28 3C02DE00 */ lui $v0, 0xde00 /* 334AEC E0020C2C ACC20000 */ sw $v0, ($a2) /* 334AF0 E0020C30 ACC80004 */ sw $t0, 4($a2) .LE0020C34: @@ -427,7 +427,7 @@ glabel func_E00205D0 /* 334AF8 E0020C38 8CE20000 */ lw $v0, ($a3) /* 334AFC E0020C3C 34840002 */ ori $a0, $a0, 2 /* 334B00 E0020C40 0040182D */ daddu $v1, $v0, $zero -/* 334B04 E0020C44 24420008 */ addiu $v0, $v0, %lo(D_DE000008) +/* 334B04 E0020C44 24420008 */ addiu $v0, $v0, 8 /* 334B08 E0020C48 ACE20000 */ sw $v0, ($a3) /* 334B0C E0020C4C 24020040 */ addiu $v0, $zero, 0x40 /* 334B10 E0020C50 AC640000 */ sw $a0, ($v1) diff --git a/asm/nonmatchings/code_337240/func_E0022998.s b/asm/nonmatchings/code_337240/func_E0022998.s index f2a3dd956e..997c82647c 100644 --- a/asm/nonmatchings/code_337240/func_E0022998.s +++ b/asm/nonmatchings/code_337240/func_E0022998.s @@ -40,14 +40,14 @@ glabel func_E0022998 /* 337C64 E0022A24 3C020900 */ lui $v0, 0x900 /* 337C68 E0022A28 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) /* 337C6C E0022A2C AC62000C */ sw $v0, 0xc($v1) -/* 337C70 E0022A30 3C028000 */ lui $v0, %hi(D_7FFFFFFF) +/* 337C70 E0022A30 3C028000 */ lui $v0, 0x8000 /* 337C74 E0022A34 00A22821 */ addu $a1, $a1, $v0 /* 337C78 E0022A38 AC650004 */ sw $a1, 4($v1) /* 337C7C E0022A3C 8E050004 */ lw $a1, 4($s0) /* 337C80 E0022A40 8E060008 */ lw $a2, 8($s0) /* 337C84 E0022A44 8E020020 */ lw $v0, 0x20($s0) /* 337C88 E0022A48 8E07000C */ lw $a3, 0xc($s0) -/* 337C8C E0022A4C 2442FFFF */ addiu $v0, $v0, %lo(D_7FFFFFFF) +/* 337C8C E0022A4C 2442FFFF */ addiu $v0, $v0, -1 /* 337C90 E0022A50 00021840 */ sll $v1, $v0, 1 /* 337C94 E0022A54 0C080108 */ jal func_E0200420 /* 337C98 E0022A58 00628821 */ addu $s1, $v1, $v0 @@ -158,13 +158,13 @@ glabel func_E0022998 /* 337E38 E0022BF8 00651825 */ or $v1, $v1, $a1 /* 337E3C E0022BFC 346300FF */ ori $v1, $v1, 0xff /* 337E40 E0022C00 AE420000 */ sw $v0, ($s2) -/* 337E44 E0022C04 3C02DA38 */ lui $v0, %hi(D_DA37A674) +/* 337E44 E0022C04 3C02DA38 */ lui $v0, 0xda38 /* 337E48 E0022C08 3084FFFF */ andi $a0, $a0, 0xffff /* 337E4C E0022C0C 00042180 */ sll $a0, $a0, 6 /* 337E50 E0022C10 AD030004 */ sw $v1, 4($t0) /* 337E54 E0022C14 ACE20000 */ sw $v0, ($a3) /* 337E58 E0022C18 3C02800A */ lui $v0, %hi(D_8009A674) -/* 337E5C E0022C1C 8C42A674 */ lw $v0, %lo(D_DA37A674)($v0) +/* 337E5C E0022C1C 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) /* 337E60 E0022C20 00952021 */ addu $a0, $a0, $s5 /* 337E64 E0022C24 00441021 */ addu $v0, $v0, $a0 /* 337E68 E0022C28 ACE20004 */ sw $v0, 4($a3) diff --git a/asm/nonmatchings/code_339250/func_E0024454.s b/asm/nonmatchings/code_339250/func_E0024454.s index d04ba6b873..5a8a084000 100644 --- a/asm/nonmatchings/code_339250/func_E0024454.s +++ b/asm/nonmatchings/code_339250/func_E0024454.s @@ -293,14 +293,14 @@ glabel func_E0024454 /* 339B0C E00248BC AFA50068 */ sw $a1, 0x68($sp) .LE00248C0: /* 339B10 E00248C0 8EB20000 */ lw $s2, ($s5) -/* 339B14 E00248C4 3C02DA38 */ lui $v0, %hi(D_DA380060) +/* 339B14 E00248C4 3C02DA38 */ lui $v0, 0xda38 /* 339B18 E00248C8 0240202D */ daddu $a0, $s2, $zero /* 339B1C E00248CC 26520008 */ addiu $s2, $s2, 8 /* 339B20 E00248D0 AEB20000 */ sw $s2, ($s5) /* 339B24 E00248D4 AC820000 */ sw $v0, ($a0) /* 339B28 E00248D8 00141080 */ sll $v0, $s4, 2 /* 339B2C E00248DC 03A21021 */ addu $v0, $sp, $v0 -/* 339B30 E00248E0 8C430060 */ lw $v1, %lo(D_DA380060)($v0) +/* 339B30 E00248E0 8C430060 */ lw $v1, 0x60($v0) /* 339B34 E00248E4 26420008 */ addiu $v0, $s2, 8 /* 339B38 E00248E8 AEA20000 */ sw $v0, ($s5) /* 339B3C E00248EC 3C02FA00 */ lui $v0, 0xfa00 diff --git a/asm/nonmatchings/code_33FE80/func_E002C414.s b/asm/nonmatchings/code_33FE80/func_E002C414.s index 07c466c4b5..dfe44c2d04 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C414.s +++ b/asm/nonmatchings/code_33FE80/func_E002C414.s @@ -288,14 +288,14 @@ glabel func_E002C414 /* 3406F8 E002C878 24840008 */ addiu $a0, $a0, 8 /* 3406FC E002C87C AE840000 */ sw $a0, ($s4) /* 340700 E002C880 97C20000 */ lhu $v0, ($fp) -/* 340704 E002C884 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 340704 E002C884 3C03DA38 */ lui $v1, 0xda38 /* 340708 E002C888 ACA30000 */ sw $v1, ($a1) /* 34070C E002C88C 24430001 */ addiu $v1, $v0, 1 /* 340710 E002C890 3042FFFF */ andi $v0, $v0, 0xffff /* 340714 E002C894 00021180 */ sll $v0, $v0, 6 /* 340718 E002C898 A7C30000 */ sh $v1, ($fp) /* 34071C E002C89C 3C03800A */ lui $v1, %hi(D_8009A674) -/* 340720 E002C8A0 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 340720 E002C8A0 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 340724 E002C8A4 00571021 */ addu $v0, $v0, $s7 /* 340728 E002C8A8 00621821 */ addu $v1, $v1, $v0 /* 34072C E002C8AC 24820008 */ addiu $v0, $a0, 8 diff --git a/asm/nonmatchings/code_342140/func_E0030A68.s b/asm/nonmatchings/code_342140/func_E0030A68.s index a245607f40..a27d418ab7 100644 --- a/asm/nonmatchings/code_342140/func_E0030A68.s +++ b/asm/nonmatchings/code_342140/func_E0030A68.s @@ -38,13 +38,13 @@ glabel func_E0030A68 /* 342C2C E0030AEC 3C020900 */ lui $v0, 0x900 /* 342C30 E0030AF0 244204C0 */ addiu $v0, $v0, %lo(D_DE0004C0) /* 342C34 E0030AF4 AC82000C */ sw $v0, 0xc($a0) -/* 342C38 E0030AF8 3C028000 */ lui $v0, %hi(D_7FFFFFFF) +/* 342C38 E0030AF8 3C028000 */ lui $v0, 0x8000 /* 342C3C E0030AFC 00621821 */ addu $v1, $v1, $v0 /* 342C40 E0030B00 AC830004 */ sw $v1, 4($a0) /* 342C44 E0030B04 8CE2002C */ lw $v0, 0x2c($a3) /* 342C48 E0030B08 0000A82D */ daddu $s5, $zero, $zero /* 342C4C E0030B0C AD240000 */ sw $a0, ($t1) -/* 342C50 E0030B10 2442FFFF */ addiu $v0, $v0, %lo(D_7FFFFFFF) +/* 342C50 E0030B10 2442FFFF */ addiu $v0, $v0, -1 /* 342C54 E0030B14 00021840 */ sll $v1, $v0, 1 /* 342C58 E0030B18 0062A021 */ addu $s4, $v1, $v0 /* 342C5C E0030B1C 24820008 */ addiu $v0, $a0, 8 diff --git a/asm/nonmatchings/code_343680/func_E003245C.s b/asm/nonmatchings/code_343680/func_E003245C.s index b3282cea1e..dc40ab54ff 100644 --- a/asm/nonmatchings/code_343680/func_E003245C.s +++ b/asm/nonmatchings/code_343680/func_E003245C.s @@ -236,14 +236,14 @@ glabel func_E003245C /* 343E64 E00327E4 ACE30004 */ sw $v1, 4($a3) /* 343E68 E00327E8 ACC20000 */ sw $v0, ($a2) /* 343E6C E00327EC 94820000 */ lhu $v0, ($a0) -/* 343E70 E00327F0 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 343E70 E00327F0 3C03DA38 */ lui $v1, 0xda38 /* 343E74 E00327F4 ACA30000 */ sw $v1, ($a1) /* 343E78 E00327F8 24430001 */ addiu $v1, $v0, 1 /* 343E7C E00327FC 3042FFFF */ andi $v0, $v0, 0xffff /* 343E80 E0032800 00021180 */ sll $v0, $v0, 6 /* 343E84 E0032804 A4830000 */ sh $v1, ($a0) /* 343E88 E0032808 3C03800A */ lui $v1, %hi(D_8009A674) -/* 343E8C E003280C 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 343E8C E003280C 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 343E90 E0032810 00481021 */ addu $v0, $v0, $t0 /* 343E94 E0032814 00621821 */ addu $v1, $v1, $v0 /* 343E98 E0032818 24A20010 */ addiu $v0, $a1, 0x10 diff --git a/asm/nonmatchings/code_354F60/func_E004491C.s b/asm/nonmatchings/code_354F60/func_E004491C.s index 4dc95fa9cd..4d897f22b9 100644 --- a/asm/nonmatchings/code_354F60/func_E004491C.s +++ b/asm/nonmatchings/code_354F60/func_E004491C.s @@ -44,14 +44,14 @@ glabel func_E004491C /* 355918 E00449B8 3C020900 */ lui $v0, 0x900 /* 35591C E00449BC 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) /* 355920 E00449C0 AC62000C */ sw $v0, 0xc($v1) -/* 355924 E00449C4 3C028000 */ lui $v0, %hi(D_7FFFFFFF) +/* 355924 E00449C4 3C028000 */ lui $v0, 0x8000 /* 355928 E00449C8 00A22821 */ addu $a1, $a1, $v0 /* 35592C E00449CC AC650004 */ sw $a1, 4($v1) /* 355930 E00449D0 8E250004 */ lw $a1, 4($s1) /* 355934 E00449D4 8E260008 */ lw $a2, 8($s1) /* 355938 E00449D8 8E220020 */ lw $v0, 0x20($s1) /* 35593C E00449DC 8E27000C */ lw $a3, 0xc($s1) -/* 355940 E00449E0 2442FFFF */ addiu $v0, $v0, %lo(D_7FFFFFFF) +/* 355940 E00449E0 2442FFFF */ addiu $v0, $v0, -1 /* 355944 E00449E4 00021840 */ sll $v1, $v0, 1 /* 355948 E00449E8 0C080108 */ jal func_E0200420 /* 35594C E00449EC 0062A021 */ addu $s4, $v1, $v0 @@ -246,14 +246,14 @@ glabel func_E004491C /* 355C24 E0044CC4 ACA30004 */ sw $v1, 4($a1) /* 355C28 E0044CC8 AE620000 */ sw $v0, ($s3) /* 355C2C E0044CCC 96E20000 */ lhu $v0, ($s7) -/* 355C30 E0044CD0 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 355C30 E0044CD0 3C03DA38 */ lui $v1, 0xda38 /* 355C34 E0044CD4 AC830000 */ sw $v1, ($a0) /* 355C38 E0044CD8 24430001 */ addiu $v1, $v0, 1 /* 355C3C E0044CDC 3042FFFF */ andi $v0, $v0, 0xffff /* 355C40 E0044CE0 00021180 */ sll $v0, $v0, 6 /* 355C44 E0044CE4 A6E30000 */ sh $v1, ($s7) /* 355C48 E0044CE8 3C03800A */ lui $v1, %hi(D_8009A674) -/* 355C4C E0044CEC 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 355C4C E0044CEC 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 355C50 E0044CF0 00551021 */ addu $v0, $v0, $s5 /* 355C54 E0044CF4 00621821 */ addu $v1, $v1, $v0 /* 355C58 E0044CF8 24820010 */ addiu $v0, $a0, 0x10 diff --git a/asm/nonmatchings/code_3584C0/func_E004A78C.s b/asm/nonmatchings/code_3584C0/func_E004A78C.s index 7419029908..6eed4bbe45 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A78C.s +++ b/asm/nonmatchings/code_3584C0/func_E004A78C.s @@ -288,14 +288,14 @@ glabel func_E004A78C /* 3590B0 E004ABF0 AC670018 */ sw $a3, 0x18($v1) /* 3590B4 E004ABF4 00441021 */ addu $v0, $v0, $a0 /* 3590B8 E004ABF8 AC62000C */ sw $v0, 0xc($v1) -/* 3590BC E004ABFC 3C02DE00 */ lui $v0, %hi(D_DE00007C) +/* 3590BC E004ABFC 3C02DE00 */ lui $v0, 0xde00 /* 3590C0 E004AC00 AC620010 */ sw $v0, 0x10($v1) /* 3590C4 E004AC04 24020040 */ addiu $v0, $zero, 0x40 /* 3590C8 E004AC08 AC62001C */ sw $v0, 0x1c($v1) /* 3590CC E004AC0C 4600018D */ trunc.w.s $f6, $f0 /* 3590D0 E004AC10 44023000 */ mfc1 $v0, $f6 /* 3590D4 E004AC14 00000000 */ nop -/* 3590D8 E004AC18 2442007C */ addiu $v0, $v0, %lo(D_DE00007C) +/* 3590D8 E004AC18 2442007C */ addiu $v0, $v0, 0x7c /* 3590DC E004AC1C 30420FFF */ andi $v0, $v0, 0xfff /* 3590E0 E004AC20 00481025 */ or $v0, $v0, $t0 /* 3590E4 E004AC24 AC620004 */ sw $v0, 4($v1) diff --git a/asm/nonmatchings/code_36A8D0/func_E0068234.s b/asm/nonmatchings/code_36A8D0/func_E0068234.s index da01535fbd..80b1b6168e 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068234.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068234.s @@ -32,13 +32,13 @@ glabel func_E0068234 /* 36AB70 E00682A0 3C17E007 */ lui $s7, %hi(D_E00685F4) /* 36AB74 E00682A4 02E2B821 */ addu $s7, $s7, $v0 /* 36AB78 E00682A8 8EF785F4 */ lw $s7, %lo(D_E00685F4)($s7) -/* 36AB7C E00682AC 3C02E700 */ lui $v0, %hi(D_E700001C) +/* 36AB7C E00682AC 3C02E700 */ lui $v0, 0xe700 /* 36AB80 E00682B0 AC620000 */ sw $v0, ($v1) /* 36AB84 E00682B4 AC600004 */ sw $zero, 4($v1) /* 36AB88 E00682B8 ACC70000 */ sw $a3, ($a2) /* 36AB8C E00682BC 8C820010 */ lw $v0, 0x10($a0) /* 36AB90 E00682C0 3C048000 */ lui $a0, 0x8000 -/* 36AB94 E00682C4 8C42001C */ lw $v0, %lo(D_E700001C)($v0) +/* 36AB94 E00682C4 8C42001C */ lw $v0, 0x1c($v0) /* 36AB98 E00682C8 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 36AB9C E00682CC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 36ABA0 E00682D0 00441021 */ addu $v0, $v0, $a0 diff --git a/asm/nonmatchings/code_372790/func_E006E35C.s b/asm/nonmatchings/code_372790/func_E006E35C.s index 4e7371ce52..a4c442a501 100644 --- a/asm/nonmatchings/code_372790/func_E006E35C.s +++ b/asm/nonmatchings/code_372790/func_E006E35C.s @@ -185,7 +185,7 @@ glabel func_E006E35C .LE006E618: /* 372DA8 E006E618 2401FFFF */ addiu $at, $zero, -1 /* 372DAC E006E61C 16410004 */ bne $s2, $at, .LE006E630 -/* 372DB0 E006E620 3C018000 */ lui $at, %hi(D_7FFFEC40) +/* 372DB0 E006E620 3C018000 */ lui $at, 0x8000 /* 372DB4 E006E624 14410002 */ bne $v0, $at, .LE006E630 /* 372DB8 E006E628 00000000 */ nop /* 372DBC E006E62C 0006000D */ break 6 @@ -193,7 +193,7 @@ glabel func_E006E35C /* 372DC0 E006E630 00001012 */ mflo $v0 /* 372DC4 E006E634 C6000038 */ lwc1 $f0, 0x38($s0) /* 372DC8 E006E638 3C01E007 */ lui $at, %hi(D_E006EC40) -/* 372DCC E006E63C D422EC40 */ ldc1 $f2, %lo(D_7FFFEC40)($at) +/* 372DCC E006E63C D422EC40 */ ldc1 $f2, %lo(D_E006EC40)($at) /* 372DD0 E006E640 46000021 */ cvt.d.s $f0, $f0 /* 372DD4 E006E644 46201081 */ sub.d $f2, $f2, $f0 /* 372DD8 E006E648 3C01E007 */ lui $at, %hi(D_E006EC48) diff --git a/asm/nonmatchings/code_389850/func_E00863B4.s b/asm/nonmatchings/code_389850/func_E00863B4.s index 173775412e..cb8d8b8ef6 100644 --- a/asm/nonmatchings/code_389850/func_E00863B4.s +++ b/asm/nonmatchings/code_389850/func_E00863B4.s @@ -290,14 +290,14 @@ glabel func_E00863B4 /* 38A05C E008680C 24840008 */ addiu $a0, $a0, 8 /* 38A060 E0086810 AEA40000 */ sw $a0, ($s5) /* 38A064 E0086814 96E20000 */ lhu $v0, ($s7) -/* 38A068 E0086818 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 38A068 E0086818 3C03DA38 */ lui $v1, 0xda38 /* 38A06C E008681C ACA30000 */ sw $v1, ($a1) /* 38A070 E0086820 24430001 */ addiu $v1, $v0, 1 /* 38A074 E0086824 3042FFFF */ andi $v0, $v0, 0xffff /* 38A078 E0086828 00021180 */ sll $v0, $v0, 6 /* 38A07C E008682C A6E30000 */ sh $v1, ($s7) /* 38A080 E0086830 3C03800A */ lui $v1, %hi(D_8009A674) -/* 38A084 E0086834 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 38A084 E0086834 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 38A088 E0086838 00561021 */ addu $v0, $v0, $s6 /* 38A08C E008683C 00621821 */ addu $v1, $v1, $v0 /* 38A090 E0086840 ACA30004 */ sw $v1, 4($a1) diff --git a/asm/nonmatchings/code_38ADF0/func_E00887E0.s b/asm/nonmatchings/code_38ADF0/func_E00887E0.s index 1136a7e2db..0a237044a3 100644 --- a/asm/nonmatchings/code_38ADF0/func_E00887E0.s +++ b/asm/nonmatchings/code_38ADF0/func_E00887E0.s @@ -253,14 +253,14 @@ glabel func_E00887E0 /* 38B990 E0088BA0 24A541F0 */ addiu $a1, $a1, %lo(D_800741F0) /* 38B994 E0088BA4 AE220000 */ sw $v0, ($s1) /* 38B998 E0088BA8 94A20000 */ lhu $v0, ($a1) -/* 38B99C E0088BAC 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 38B99C E0088BAC 3C03DA38 */ lui $v1, 0xda38 /* 38B9A0 E0088BB0 AC830000 */ sw $v1, ($a0) /* 38B9A4 E0088BB4 24430001 */ addiu $v1, $v0, 1 /* 38B9A8 E0088BB8 3042FFFF */ andi $v0, $v0, 0xffff /* 38B9AC E0088BBC 00021180 */ sll $v0, $v0, 6 /* 38B9B0 E0088BC0 A4A30000 */ sh $v1, ($a1) /* 38B9B4 E0088BC4 3C03800A */ lui $v1, %hi(D_8009A674) -/* 38B9B8 E0088BC8 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 38B9B8 E0088BC8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 38B9BC E0088BCC 00571021 */ addu $v0, $v0, $s7 /* 38B9C0 E0088BD0 00621821 */ addu $v1, $v1, $v0 /* 38B9C4 E0088BD4 24820010 */ addiu $v0, $a0, 0x10 diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s b/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s index 8c59d9ae1e..7be0770c4b 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s @@ -293,13 +293,13 @@ glabel func_E00AC2A4 /* 3AF530 E00AC710 2484A66C */ addiu $a0, $a0, %lo(D_8009A66C) /* 3AF534 E00AC714 34C60002 */ ori $a2, $a2, 2 /* 3AF538 E00AC718 8C830000 */ lw $v1, ($a0) -/* 3AF53C E00AC71C 3C02DE00 */ lui $v0, %hi(D_DE0028A0) +/* 3AF53C E00AC71C 3C02DE00 */ lui $v0, 0xde00 /* 3AF540 E00AC720 0060282D */ daddu $a1, $v1, $zero /* 3AF544 E00AC724 24630008 */ addiu $v1, $v1, 8 /* 3AF548 E00AC728 AC830000 */ sw $v1, ($a0) /* 3AF54C E00AC72C ACA20000 */ sw $v0, ($a1) /* 3AF550 E00AC730 3C020900 */ lui $v0, 0x900 -/* 3AF554 E00AC734 244228A0 */ addiu $v0, $v0, %lo(D_DE0028A0) +/* 3AF554 E00AC734 244228A0 */ addiu $v0, $v0, 0x28a0 /* 3AF558 E00AC738 ACA20004 */ sw $v0, 4($a1) /* 3AF55C E00AC73C 24620008 */ addiu $v0, $v1, 8 /* 3AF560 E00AC740 24050040 */ addiu $a1, $zero, 0x40 diff --git a/asm/nonmatchings/code_3B2350/func_E00AE54C.s b/asm/nonmatchings/code_3B2350/func_E00AE54C.s index 19b868f64d..03eb3b199d 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE54C.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE54C.s @@ -234,14 +234,14 @@ glabel func_E00AE54C /* 3B2C2C E00AE8DC 24840008 */ addiu $a0, $a0, 8 /* 3B2C30 E00AE8E0 AE240000 */ sw $a0, ($s1) /* 3B2C34 E00AE8E4 96E20000 */ lhu $v0, ($s7) -/* 3B2C38 E00AE8E8 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 3B2C38 E00AE8E8 3C03DA38 */ lui $v1, 0xda38 /* 3B2C3C E00AE8EC ACA30000 */ sw $v1, ($a1) /* 3B2C40 E00AE8F0 24430001 */ addiu $v1, $v0, 1 /* 3B2C44 E00AE8F4 3042FFFF */ andi $v0, $v0, 0xffff /* 3B2C48 E00AE8F8 00021180 */ sll $v0, $v0, 6 /* 3B2C4C E00AE8FC A6E30000 */ sh $v1, ($s7) /* 3B2C50 E00AE900 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3B2C54 E00AE904 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 3B2C54 E00AE904 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 3B2C58 E00AE908 00541021 */ addu $v0, $v0, $s4 /* 3B2C5C E00AE90C 00621821 */ addu $v1, $v1, $v0 /* 3B2C60 E00AE910 24820008 */ addiu $v0, $a0, 8 diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s index 22b674d671..293bd31b62 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s @@ -171,14 +171,14 @@ glabel func_E00B0234 /* 3B4378 E00B04C8 24840008 */ addiu $a0, $a0, 8 /* 3B437C E00B04CC AE440000 */ sw $a0, ($s2) /* 3B4380 E00B04D0 96A20000 */ lhu $v0, ($s5) -/* 3B4384 E00B04D4 3C03DA38 */ lui $v1, %hi(D_DA37A674) +/* 3B4384 E00B04D4 3C03DA38 */ lui $v1, 0xda38 /* 3B4388 E00B04D8 ACA30000 */ sw $v1, ($a1) /* 3B438C E00B04DC 24430001 */ addiu $v1, $v0, 1 /* 3B4390 E00B04E0 3042FFFF */ andi $v0, $v0, 0xffff /* 3B4394 E00B04E4 00021180 */ sll $v0, $v0, 6 /* 3B4398 E00B04E8 A6A30000 */ sh $v1, ($s5) /* 3B439C E00B04EC 3C03800A */ lui $v1, %hi(D_8009A674) -/* 3B43A0 E00B04F0 8C63A674 */ lw $v1, %lo(D_DA37A674)($v1) +/* 3B43A0 E00B04F0 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 3B43A4 E00B04F4 005E1021 */ addu $v0, $v0, $fp /* 3B43A8 E00B04F8 00621821 */ addu $v1, $v1, $v0 /* 3B43AC E00B04FC 24820008 */ addiu $v0, $a0, 8 diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s b/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s index c98a690ce5..4c9c4a6faa 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s +++ b/asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s @@ -220,7 +220,7 @@ glabel update_player_shadow /* 7B3C0 800E1F10 A0830000 */ sb $v1, ($a0) .L800E1F14: /* 7B3C4 800E1F14 46220001 */ sub.d $f0, $f0, $f2 -/* 7B3C8 800E1F18 3C028000 */ lui $v0, %hi(D_8000419C) +/* 7B3C8 800E1F18 3C028000 */ lui $v0, 0x8000 /* 7B3CC 800E1F1C 4620028D */ trunc.w.d $f10, $f0 /* 7B3D0 800E1F20 44035000 */ mfc1 $v1, $f10 /* 7B3D4 800E1F24 00000000 */ nop @@ -228,7 +228,7 @@ glabel update_player_shadow /* 7B3DC 800E1F2C A0830000 */ sb $v1, ($a0) .L800E1F30: /* 7B3E0 800E1F30 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7B3E4 800E1F34 8C42419C */ lw $v0, %lo(D_8000419C)($v0) +/* 7B3E4 800E1F34 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 7B3E8 800E1F38 9042007E */ lbu $v0, 0x7e($v0) /* 7B3EC 800E1F3C 30420001 */ andi $v0, $v0, 1 /* 7B3F0 800E1F40 14400006 */ bnez $v0, .L800E1F5C diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s index 9d0c238cef..4708295c6d 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s @@ -93,13 +93,13 @@ glabel func_800F0490 /* 89A90 800F05E0 46800020 */ cvt.s.w $f0, $f0 /* 89A94 800F05E4 46006307 */ neg.s $f12, $f12 /* 89A98 800F05E8 46006300 */ add.s $f12, $f12, $f0 -/* 89A9C 800F05EC 3C01C000 */ lui $at, %hi(D_BFFF949C) +/* 89A9C 800F05EC 3C01C000 */ lui $at, 0xc000 /* 89AA0 800F05F0 4481A000 */ mtc1 $at, $f20 /* 89AA4 800F05F4 3C0140A0 */ lui $at, 0x40a0 /* 89AA8 800F05F8 44810000 */ mtc1 $at, $f0 /* 89AAC 800F05FC 46041080 */ add.s $f2, $f2, $f4 /* 89AB0 800F0600 3C018011 */ lui $at, %hi(D_8010949C) -/* 89AB4 800F0604 A420949C */ sh $zero, %lo(D_BFFF949C)($at) +/* 89AB4 800F0604 A420949C */ sh $zero, %lo(D_8010949C)($at) /* 89AB8 800F0608 46001083 */ div.s $f2, $f2, $f0 /* 89ABC 800F060C 0C00A6C9 */ jal clamp_angle /* 89AC0 800F0610 4602A501 */ sub.s $f20, $f20, $f2 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s index c72dc58235..ec77206650 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s @@ -59,14 +59,14 @@ glabel func_800F102C /* 8A5B4 800F1104 24620010 */ addiu $v0, $v1, 0x10 /* 8A5B8 800F1108 AC600004 */ sw $zero, 4($v1) /* 8A5BC 800F110C AE020000 */ sw $v0, ($s0) -/* 8A5C0 800F1110 3C02ED00 */ lui $v0, %hi(D_ECFF96B0) +/* 8A5C0 800F1110 3C02ED00 */ lui $v0, 0xed00 /* 8A5C4 800F1114 AC620008 */ sw $v0, 8($v1) /* 8A5C8 800F1118 24620018 */ addiu $v0, $v1, 0x18 /* 8A5CC 800F111C AC69000C */ sw $t1, 0xc($v1) /* 8A5D0 800F1120 AE020000 */ sw $v0, ($s0) /* 8A5D4 800F1124 4485B000 */ mtc1 $a1, $f22 /* 8A5D8 800F1128 3C028011 */ lui $v0, %hi(D_801096B0) -/* 8A5DC 800F112C 244296B0 */ addiu $v0, $v0, %lo(D_ECFF96B0) +/* 8A5DC 800F112C 244296B0 */ addiu $v0, $v0, %lo(D_801096B0) /* 8A5E0 800F1130 AC6A0010 */ sw $t2, 0x10($v1) /* 8A5E4 800F1134 AC620014 */ sw $v0, 0x14($v1) /* 8A5E8 800F1138 E7A20018 */ swc1 $f2, 0x18($sp) diff --git a/asm/nonmatchings/code_8e790_len_2850/draw_box.s b/asm/nonmatchings/code_8e790_len_2850/draw_box.s index 7406e4de20..7551a24add 100644 --- a/asm/nonmatchings/code_8e790_len_2850/draw_box.s +++ b/asm/nonmatchings/code_8e790_len_2850/draw_box.s @@ -2002,14 +2002,14 @@ glabel draw_box /* 90508 800F7058 0040182D */ daddu $v1, $v0, $zero /* 9050C 800F705C 24420008 */ addiu $v0, $v0, 8 /* 90510 800F7060 AD820000 */ sw $v0, ($t4) -/* 90514 800F7064 3C02F100 */ lui $v0, %hi(D_F1000008) +/* 90514 800F7064 3C02F100 */ lui $v0, 0xf100 /* 90518 800F7068 AC620000 */ sw $v0, ($v1) /* 9051C 800F706C AC640004 */ sw $a0, 4($v1) .L800F7070: /* 90520 800F7070 8D820000 */ lw $v0, ($t4) /* 90524 800F7074 25AD0001 */ addiu $t5, $t5, 1 /* 90528 800F7078 0040182D */ daddu $v1, $v0, $zero -/* 9052C 800F707C 24420008 */ addiu $v0, $v0, %lo(D_F1000008) +/* 9052C 800F707C 24420008 */ addiu $v0, $v0, 8 /* 90530 800F7080 3C19E700 */ lui $t9, 0xe700 /* 90534 800F7084 AD820000 */ sw $v0, ($t4) /* 90538 800F7088 29A20004 */ slti $v0, $t5, 4 @@ -2174,7 +2174,7 @@ glabel draw_box /* 90780 800F72D0 0040202D */ daddu $a0, $v0, $zero /* 90784 800F72D4 24420008 */ addiu $v0, $v0, 8 /* 90788 800F72D8 AC620000 */ sw $v0, ($v1) -/* 9078C 800F72DC 3C02F100 */ lui $v0, %hi(D_F1000008) +/* 9078C 800F72DC 3C02F100 */ lui $v0, 0xf100 /* 90790 800F72E0 AC820000 */ sw $v0, ($a0) /* 90794 800F72E4 AC850004 */ sw $a1, 4($a0) .L800F72E8: @@ -2182,7 +2182,7 @@ glabel draw_box /* 9079C 800F72EC 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) /* 907A0 800F72F0 8C620000 */ lw $v0, ($v1) /* 907A4 800F72F4 0040202D */ daddu $a0, $v0, $zero -/* 907A8 800F72F8 24420008 */ addiu $v0, $v0, %lo(D_F1000008) +/* 907A8 800F72F8 24420008 */ addiu $v0, $v0, 8 /* 907AC 800F72FC AC620000 */ sw $v0, ($v1) /* 907B0 800F7300 3C02E700 */ lui $v0, 0xe700 /* 907B4 800F7304 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s index 73c6a1d1cb..5505f0c3d6 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s @@ -240,21 +240,21 @@ glabel func_801180E8 /* AEB3C 8011843C 0040182D */ daddu $v1, $v0, $zero /* AEB40 80118440 24420008 */ addiu $v0, $v0, 8 /* AEB44 80118444 AF020000 */ sw $v0, ($t8) -/* AEB48 80118448 3C02FD10 */ lui $v0, %hi(D_FD100008) +/* AEB48 80118448 3C02FD10 */ lui $v0, 0xfd10 /* AEB4C 8011844C AC620000 */ sw $v0, ($v1) /* AEB50 80118450 AC670004 */ sw $a3, 4($v1) /* AEB54 80118454 8F020000 */ lw $v0, ($t8) /* AEB58 80118458 3C04F500 */ lui $a0, 0xf500 /* AEB5C 8011845C 0040182D */ daddu $v1, $v0, $zero -/* AEB60 80118460 24420008 */ addiu $v0, $v0, %lo(D_FD100008) +/* AEB60 80118460 24420008 */ addiu $v0, $v0, 8 /* AEB64 80118464 AF020000 */ sw $v0, ($t8) -/* AEB68 80118468 3C02E800 */ lui $v0, %hi(D_E8000008) +/* AEB68 80118468 3C02E800 */ lui $v0, 0xe800 /* AEB6C 8011846C AC620000 */ sw $v0, ($v1) /* AEB70 80118470 AC600004 */ sw $zero, 4($v1) /* AEB74 80118474 8F020000 */ lw $v0, ($t8) /* AEB78 80118478 34840100 */ ori $a0, $a0, 0x100 /* AEB7C 8011847C 0040182D */ daddu $v1, $v0, $zero -/* AEB80 80118480 24420008 */ addiu $v0, $v0, %lo(D_E8000008) +/* AEB80 80118480 24420008 */ addiu $v0, $v0, 8 /* AEB84 80118484 AF020000 */ sw $v0, ($t8) /* AEB88 80118488 3C020700 */ lui $v0, 0x700 /* AEB8C 8011848C AC640000 */ sw $a0, ($v1) @@ -276,13 +276,13 @@ glabel func_801180E8 /* AEBC8 801184C8 0040182D */ daddu $v1, $v0, $zero /* AEBCC 801184CC 24420008 */ addiu $v0, $v0, %lo(D_FD100008) /* AEBD0 801184D0 AF020000 */ sw $v0, ($t8) -/* AEBD4 801184D4 3C02E800 */ lui $v0, %hi(D_E8000008) +/* AEBD4 801184D4 3C02E800 */ lui $v0, 0xe800 /* AEBD8 801184D8 AC620000 */ sw $v0, ($v1) /* AEBDC 801184DC AC600004 */ sw $zero, 4($v1) /* AEBE0 801184E0 8F020000 */ lw $v0, ($t8) /* AEBE4 801184E4 34840100 */ ori $a0, $a0, 0x100 /* AEBE8 801184E8 0040182D */ daddu $v1, $v0, $zero -/* AEBEC 801184EC 24420008 */ addiu $v0, $v0, %lo(D_E8000008) +/* AEBEC 801184EC 24420008 */ addiu $v0, $v0, 8 /* AEBF0 801184F0 AF020000 */ sw $v0, ($t8) /* AEBF4 801184F4 3C020700 */ lui $v0, 0x700 /* AEBF8 801184F8 AC640000 */ sw $a0, ($v1) @@ -293,13 +293,13 @@ glabel func_801180E8 /* AEC08 80118508 0040182D */ daddu $v1, $v0, $zero /* AEC0C 8011850C 24420008 */ addiu $v0, $v0, 8 /* AEC10 80118510 AF020000 */ sw $v0, ($t8) -/* AEC14 80118514 3C02E600 */ lui $v0, %hi(D_E6000008) +/* AEC14 80118514 3C02E600 */ lui $v0, 0xe600 /* AEC18 80118518 AC620000 */ sw $v0, ($v1) /* AEC1C 8011851C AC600004 */ sw $zero, 4($v1) /* AEC20 80118520 8F020000 */ lw $v0, ($t8) /* AEC24 80118524 3484C000 */ ori $a0, $a0, 0xc000 /* AEC28 80118528 0040182D */ daddu $v1, $v0, $zero -/* AEC2C 8011852C 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* AEC2C 8011852C 24420008 */ addiu $v0, $v0, 8 /* AEC30 80118530 AF020000 */ sw $v0, ($t8) /* AEC34 80118534 3C02F000 */ lui $v0, %hi(D_F0000008) /* AEC38 80118538 AC620000 */ sw $v0, ($v1) @@ -362,13 +362,13 @@ glabel func_801180E8 /* AED14 80118614 0040182D */ daddu $v1, $v0, $zero /* AED18 80118618 24420008 */ addiu $v0, $v0, %lo(D_FD100008) /* AED1C 8011861C AF020000 */ sw $v0, ($t8) -/* AED20 80118620 3C02E800 */ lui $v0, %hi(D_E8000008) +/* AED20 80118620 3C02E800 */ lui $v0, 0xe800 /* AED24 80118624 AC620000 */ sw $v0, ($v1) /* AED28 80118628 AC600004 */ sw $zero, 4($v1) /* AED2C 8011862C 8F020000 */ lw $v0, ($t8) /* AED30 80118630 34840100 */ ori $a0, $a0, 0x100 /* AED34 80118634 0040182D */ daddu $v1, $v0, $zero -/* AED38 80118638 24420008 */ addiu $v0, $v0, %lo(D_E8000008) +/* AED38 80118638 24420008 */ addiu $v0, $v0, 8 /* AED3C 8011863C AF020000 */ sw $v0, ($t8) /* AED40 80118640 3C020700 */ lui $v0, 0x700 /* AED44 80118644 AC640000 */ sw $a0, ($v1) @@ -379,13 +379,13 @@ glabel func_801180E8 /* AED54 80118654 0040182D */ daddu $v1, $v0, $zero /* AED58 80118658 24420008 */ addiu $v0, $v0, 8 /* AED5C 8011865C AF020000 */ sw $v0, ($t8) -/* AED60 80118660 3C02E600 */ lui $v0, %hi(D_E6000008) +/* AED60 80118660 3C02E600 */ lui $v0, 0xe600 /* AED64 80118664 AC620000 */ sw $v0, ($v1) /* AED68 80118668 AC600004 */ sw $zero, 4($v1) /* AED6C 8011866C 8F020000 */ lw $v0, ($t8) /* AED70 80118670 3484C000 */ ori $a0, $a0, 0xc000 /* AED74 80118674 0040182D */ daddu $v1, $v0, $zero -/* AED78 80118678 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* AED78 80118678 24420008 */ addiu $v0, $v0, 8 /* AED7C 8011867C AF020000 */ sw $v0, ($t8) /* AED80 80118680 3C02F000 */ lui $v0, %hi(D_F0000008) /* AED84 80118684 AC620000 */ sw $v0, ($v1) @@ -473,14 +473,14 @@ glabel func_801180E8 /* AEEB4 801187B4 0040202D */ daddu $a0, $v0, $zero /* AEEB8 801187B8 24420008 */ addiu $v0, $v0, 8 /* AEEBC 801187BC AF020000 */ sw $v0, ($t8) -/* AEEC0 801187C0 3C02FD10 */ lui $v0, %hi(D_FD100008) +/* AEEC0 801187C0 3C02FD10 */ lui $v0, 0xfd10 /* AEEC4 801187C4 00621025 */ or $v0, $v1, $v0 /* AEEC8 801187C8 AC820000 */ sw $v0, ($a0) /* AEECC 801187CC AC9E0004 */ sw $fp, 4($a0) /* AEED0 801187D0 8F020000 */ lw $v0, ($t8) /* AEED4 801187D4 3C070700 */ lui $a3, 0x700 /* AEED8 801187D8 0040202D */ daddu $a0, $v0, $zero -/* AEEDC 801187DC 24420008 */ addiu $v0, $v0, %lo(D_FD100008) +/* AEEDC 801187DC 24420008 */ addiu $v0, $v0, 8 /* AEEE0 801187E0 AF020000 */ sw $v0, ($t8) /* AEEE4 801187E4 3C02F510 */ lui $v0, 0xf510 /* AEEE8 801187E8 00621825 */ or $v1, $v1, $v0 @@ -502,13 +502,13 @@ glabel func_801180E8 /* AEF28 80118828 0040182D */ daddu $v1, $v0, $zero /* AEF2C 8011882C 24420008 */ addiu $v0, $v0, 8 /* AEF30 80118830 AF020000 */ sw $v0, ($t8) -/* AEF34 80118834 3C02E600 */ lui $v0, %hi(D_E6000008) +/* AEF34 80118834 3C02E600 */ lui $v0, 0xe600 /* AEF38 80118838 AC620000 */ sw $v0, ($v1) /* AEF3C 8011883C AC600004 */ sw $zero, 4($v1) /* AEF40 80118840 8F020000 */ lw $v0, ($t8) /* AEF44 80118844 0320202D */ daddu $a0, $t9, $zero /* AEF48 80118848 0040302D */ daddu $a2, $v0, $zero -/* AEF4C 8011884C 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* AEF4C 8011884C 24420008 */ addiu $v0, $v0, 8 /* AEF50 80118850 AF020000 */ sw $v0, ($t8) /* AEF54 80118854 3C02F300 */ lui $v0, 0xf300 /* AEF58 80118858 07210002 */ bgez $t9, .L80118864 @@ -558,13 +558,13 @@ glabel func_801180E8 /* AEFEC 801188EC 0040182D */ daddu $v1, $v0, $zero /* AEFF0 801188F0 24420008 */ addiu $v0, $v0, 8 /* AEFF4 801188F4 AF020000 */ sw $v0, ($t8) -/* AEFF8 801188F8 3C02E700 */ lui $v0, %hi(D_E7000008) +/* AEFF8 801188F8 3C02E700 */ lui $v0, 0xe700 /* AEFFC 801188FC AC620000 */ sw $v0, ($v1) /* AF000 80118900 AC600004 */ sw $zero, 4($v1) /* AF004 80118904 8F020000 */ lw $v0, ($t8) /* AF008 80118908 3C03F500 */ lui $v1, 0xf500 /* AF00C 8011890C 0040282D */ daddu $a1, $v0, $zero -/* AF010 80118910 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* AF010 80118910 24420008 */ addiu $v0, $v0, 8 /* AF014 80118914 AF020000 */ sw $v0, ($t8) /* AF018 80118918 08046356 */ j .L80118D58 /* AF01C 8011891C 00191043 */ sra $v0, $t9, 1 @@ -575,14 +575,14 @@ glabel func_801180E8 /* AF02C 8011892C 0040202D */ daddu $a0, $v0, $zero /* AF030 80118930 24420008 */ addiu $v0, $v0, 8 /* AF034 80118934 AF020000 */ sw $v0, ($t8) -/* AF038 80118938 3C02FD10 */ lui $v0, %hi(D_FD100008) +/* AF038 80118938 3C02FD10 */ lui $v0, 0xfd10 /* AF03C 8011893C 00621025 */ or $v0, $v1, $v0 /* AF040 80118940 AC820000 */ sw $v0, ($a0) /* AF044 80118944 AC9E0004 */ sw $fp, 4($a0) /* AF048 80118948 8F020000 */ lw $v0, ($t8) /* AF04C 8011894C 3C070700 */ lui $a3, 0x700 /* AF050 80118950 0040202D */ daddu $a0, $v0, $zero -/* AF054 80118954 24420008 */ addiu $v0, $v0, %lo(D_FD100008) +/* AF054 80118954 24420008 */ addiu $v0, $v0, 8 /* AF058 80118958 AF020000 */ sw $v0, ($t8) /* AF05C 8011895C 3C02F510 */ lui $v0, 0xf510 /* AF060 80118960 00621825 */ or $v1, $v1, $v0 @@ -604,13 +604,13 @@ glabel func_801180E8 /* AF0A0 801189A0 0040182D */ daddu $v1, $v0, $zero /* AF0A4 801189A4 24420008 */ addiu $v0, $v0, 8 /* AF0A8 801189A8 AF020000 */ sw $v0, ($t8) -/* AF0AC 801189AC 3C02E600 */ lui $v0, %hi(D_E6000008) +/* AF0AC 801189AC 3C02E600 */ lui $v0, 0xe600 /* AF0B0 801189B0 AC620000 */ sw $v0, ($v1) /* AF0B4 801189B4 AC600004 */ sw $zero, 4($v1) /* AF0B8 801189B8 8F020000 */ lw $v0, ($t8) /* AF0BC 801189BC 0320202D */ daddu $a0, $t9, $zero /* AF0C0 801189C0 0040302D */ daddu $a2, $v0, $zero -/* AF0C4 801189C4 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* AF0C4 801189C4 24420008 */ addiu $v0, $v0, 8 /* AF0C8 801189C8 AF020000 */ sw $v0, ($t8) /* AF0CC 801189CC 3C02F300 */ lui $v0, 0xf300 /* AF0D0 801189D0 07210002 */ bgez $t9, .L801189DC @@ -660,13 +660,13 @@ glabel func_801180E8 /* AF164 80118A64 0040182D */ daddu $v1, $v0, $zero /* AF168 80118A68 24420008 */ addiu $v0, $v0, 8 /* AF16C 80118A6C AF020000 */ sw $v0, ($t8) -/* AF170 80118A70 3C02E700 */ lui $v0, %hi(D_E7000008) +/* AF170 80118A70 3C02E700 */ lui $v0, 0xe700 /* AF174 80118A74 AC620000 */ sw $v0, ($v1) /* AF178 80118A78 AC600004 */ sw $zero, 4($v1) /* AF17C 80118A7C 8F020000 */ lw $v0, ($t8) /* AF180 80118A80 3C03F508 */ lui $v1, 0xf508 /* AF184 80118A84 0040282D */ daddu $a1, $v0, $zero -/* AF188 80118A88 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* AF188 80118A88 24420008 */ addiu $v0, $v0, 8 /* AF18C 80118A8C AF020000 */ sw $v0, ($t8) /* AF190 80118A90 08046357 */ j .L80118D5C /* AF194 80118A94 27220007 */ addiu $v0, $t9, 7 @@ -677,14 +677,14 @@ glabel func_801180E8 /* AF1A4 80118AA4 0040202D */ daddu $a0, $v0, $zero /* AF1A8 80118AA8 24420008 */ addiu $v0, $v0, 8 /* AF1AC 80118AAC AF020000 */ sw $v0, ($t8) -/* AF1B0 80118AB0 3C02FD10 */ lui $v0, %hi(D_FD100008) +/* AF1B0 80118AB0 3C02FD10 */ lui $v0, 0xfd10 /* AF1B4 80118AB4 00621025 */ or $v0, $v1, $v0 /* AF1B8 80118AB8 AC820000 */ sw $v0, ($a0) /* AF1BC 80118ABC AC9E0004 */ sw $fp, 4($a0) /* AF1C0 80118AC0 8F020000 */ lw $v0, ($t8) /* AF1C4 80118AC4 3C070700 */ lui $a3, 0x700 /* AF1C8 80118AC8 0040202D */ daddu $a0, $v0, $zero -/* AF1CC 80118ACC 24420008 */ addiu $v0, $v0, %lo(D_FD100008) +/* AF1CC 80118ACC 24420008 */ addiu $v0, $v0, 8 /* AF1D0 80118AD0 AF020000 */ sw $v0, ($t8) /* AF1D4 80118AD4 3C02F510 */ lui $v0, 0xf510 /* AF1D8 80118AD8 00621825 */ or $v1, $v1, $v0 @@ -706,13 +706,13 @@ glabel func_801180E8 /* AF218 80118B18 0040182D */ daddu $v1, $v0, $zero /* AF21C 80118B1C 24420008 */ addiu $v0, $v0, 8 /* AF220 80118B20 AF020000 */ sw $v0, ($t8) -/* AF224 80118B24 3C02E600 */ lui $v0, %hi(D_E6000008) +/* AF224 80118B24 3C02E600 */ lui $v0, 0xe600 /* AF228 80118B28 AC620000 */ sw $v0, ($v1) /* AF22C 80118B2C AC600004 */ sw $zero, 4($v1) /* AF230 80118B30 8F020000 */ lw $v0, ($t8) /* AF234 80118B34 0320202D */ daddu $a0, $t9, $zero /* AF238 80118B38 0040302D */ daddu $a2, $v0, $zero -/* AF23C 80118B3C 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* AF23C 80118B3C 24420008 */ addiu $v0, $v0, 8 /* AF240 80118B40 AF020000 */ sw $v0, ($t8) /* AF244 80118B44 3C02F300 */ lui $v0, 0xf300 /* AF248 80118B48 07210002 */ bgez $t9, .L80118B54 @@ -773,14 +773,14 @@ glabel func_801180E8 /* AF304 80118C04 0040202D */ daddu $a0, $v0, $zero /* AF308 80118C08 24420008 */ addiu $v0, $v0, 8 /* AF30C 80118C0C AF020000 */ sw $v0, ($t8) -/* AF310 80118C10 3C02FD18 */ lui $v0, %hi(D_FD180008) +/* AF310 80118C10 3C02FD18 */ lui $v0, 0xfd18 /* AF314 80118C14 00621025 */ or $v0, $v1, $v0 /* AF318 80118C18 AC820000 */ sw $v0, ($a0) /* AF31C 80118C1C AC9E0004 */ sw $fp, 4($a0) /* AF320 80118C20 8F020000 */ lw $v0, ($t8) /* AF324 80118C24 3C070700 */ lui $a3, 0x700 /* AF328 80118C28 0040202D */ daddu $a0, $v0, $zero -/* AF32C 80118C2C 24420008 */ addiu $v0, $v0, %lo(D_FD180008) +/* AF32C 80118C2C 24420008 */ addiu $v0, $v0, 8 /* AF330 80118C30 AF020000 */ sw $v0, ($t8) /* AF334 80118C34 3C02F518 */ lui $v0, 0xf518 /* AF338 80118C38 00621825 */ or $v1, $v1, $v0 @@ -803,13 +803,13 @@ glabel func_801180E8 /* AF37C 80118C7C 0040182D */ daddu $v1, $v0, $zero /* AF380 80118C80 24420008 */ addiu $v0, $v0, 8 /* AF384 80118C84 AF020000 */ sw $v0, ($t8) -/* AF388 80118C88 3C02E600 */ lui $v0, %hi(D_E6000008) +/* AF388 80118C88 3C02E600 */ lui $v0, 0xe600 /* AF38C 80118C8C AC620000 */ sw $v0, ($v1) /* AF390 80118C90 AC600004 */ sw $zero, 4($v1) /* AF394 80118C94 8F020000 */ lw $v0, ($t8) /* AF398 80118C98 24030800 */ addiu $v1, $zero, 0x800 /* AF39C 80118C9C 0040302D */ daddu $a2, $v0, $zero -/* AF3A0 80118CA0 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* AF3A0 80118CA0 24420008 */ addiu $v0, $v0, 8 /* AF3A4 80118CA4 AF020000 */ sw $v0, ($t8) /* AF3A8 80118CA8 3C02F300 */ lui $v0, 0xf300 /* AF3AC 80118CAC 18A00002 */ blez $a1, .L80118CB8 @@ -852,14 +852,14 @@ glabel func_801180E8 /* AF428 80118D28 0040182D */ daddu $v1, $v0, $zero /* AF42C 80118D2C 24420008 */ addiu $v0, $v0, 8 /* AF430 80118D30 AF020000 */ sw $v0, ($t8) -/* AF434 80118D34 3C02E700 */ lui $v0, %hi(D_E7000008) +/* AF434 80118D34 3C02E700 */ lui $v0, 0xe700 /* AF438 80118D38 AC620000 */ sw $v0, ($v1) /* AF43C 80118D3C AC600004 */ sw $zero, 4($v1) /* AF440 80118D40 8F020000 */ lw $v0, ($t8) /* AF444 80118D44 3C03F518 */ lui $v1, 0xf518 .L80118D48: /* AF448 80118D48 0040282D */ daddu $a1, $v0, $zero -/* AF44C 80118D4C 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* AF44C 80118D4C 24420008 */ addiu $v0, $v0, 8 /* AF450 80118D50 AF020000 */ sw $v0, ($t8) /* AF454 80118D54 00191040 */ sll $v0, $t9, 1 .L80118D58: @@ -1023,13 +1023,13 @@ glabel func_801180E8 /* AF6A0 80118FA0 0040182D */ daddu $v1, $v0, $zero /* AF6A4 80118FA4 24420008 */ addiu $v0, $v0, 8 /* AF6A8 80118FA8 AF020000 */ sw $v0, ($t8) -/* AF6AC 80118FAC 3C02E600 */ lui $v0, %hi(D_E6000008) +/* AF6AC 80118FAC 3C02E600 */ lui $v0, 0xe600 /* AF6B0 80118FB0 AC620000 */ sw $v0, ($v1) /* AF6B4 80118FB4 AC600004 */ sw $zero, 4($v1) /* AF6B8 80118FB8 8F020000 */ lw $v0, ($t8) /* AF6BC 80118FBC 24C6FFFF */ addiu $a2, $a2, -1 /* AF6C0 80118FC0 0040382D */ daddu $a3, $v0, $zero -/* AF6C4 80118FC4 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* AF6C4 80118FC4 24420008 */ addiu $v0, $v0, 8 /* AF6C8 80118FC8 AF020000 */ sw $v0, ($t8) /* AF6CC 80118FCC 3C02F400 */ lui $v0, 0xf400 /* AF6D0 80118FD0 ACE20000 */ sw $v0, ($a3) @@ -1236,14 +1236,14 @@ glabel func_801180E8 /* AF9C4 801192C4 0040182D */ daddu $v1, $v0, $zero /* AF9C8 801192C8 24420008 */ addiu $v0, $v0, 8 /* AF9CC 801192CC AF020000 */ sw $v0, ($t8) -/* AF9D0 801192D0 3C02F400 */ lui $v0, %hi(D_F4000008) +/* AF9D0 801192D0 3C02F400 */ lui $v0, 0xf400 /* AF9D4 801192D4 AC620000 */ sw $v0, ($v1) /* AF9D8 801192D8 00B71025 */ or $v0, $a1, $s7 /* AF9DC 801192DC 00E21025 */ or $v0, $a3, $v0 /* AF9E0 801192E0 AC620004 */ sw $v0, 4($v1) /* AF9E4 801192E4 8F020000 */ lw $v0, ($t8) /* AF9E8 801192E8 0040182D */ daddu $v1, $v0, $zero -/* AF9EC 801192EC 24420008 */ addiu $v0, $v0, %lo(D_F4000008) +/* AF9EC 801192EC 24420008 */ addiu $v0, $v0, 8 /* AF9F0 801192F0 AF020000 */ sw $v0, ($t8) /* AF9F4 801192F4 3C02E700 */ lui $v0, 0xe700 /* AF9F8 801192F8 AC620000 */ sw $v0, ($v1) @@ -1412,14 +1412,14 @@ glabel func_801180E8 /* AFC5C 8011955C 0040202D */ daddu $a0, $v0, $zero /* AFC60 80119560 24420008 */ addiu $v0, $v0, 8 /* AFC64 80119564 AF020000 */ sw $v0, ($t8) -/* AFC68 80119568 3C02F400 */ lui $v0, %hi(D_F4000008) +/* AFC68 80119568 3C02F400 */ lui $v0, 0xf400 /* AFC6C 8011956C AC820000 */ sw $v0, ($a0) /* AFC70 80119570 00B71025 */ or $v0, $a1, $s7 /* AFC74 80119574 00C21025 */ or $v0, $a2, $v0 /* AFC78 80119578 AC820004 */ sw $v0, 4($a0) /* AFC7C 8011957C 8F020000 */ lw $v0, ($t8) /* AFC80 80119580 0040202D */ daddu $a0, $v0, $zero -/* AFC84 80119584 24420008 */ addiu $v0, $v0, %lo(D_F4000008) +/* AFC84 80119584 24420008 */ addiu $v0, $v0, 8 /* AFC88 80119588 AF020000 */ sw $v0, ($t8) /* AFC8C 8011958C 3C02E700 */ lui $v0, %hi(D_E7000008) /* AFC90 80119590 AC820000 */ sw $v0, ($a0) @@ -1589,14 +1589,14 @@ glabel func_801180E8 /* AFEF8 801197F8 0040202D */ daddu $a0, $v0, $zero /* AFEFC 801197FC 24420008 */ addiu $v0, $v0, 8 /* AFF00 80119800 AF020000 */ sw $v0, ($t8) -/* AFF04 80119804 3C02F400 */ lui $v0, %hi(D_F4000008) +/* AFF04 80119804 3C02F400 */ lui $v0, 0xf400 /* AFF08 80119808 AC820000 */ sw $v0, ($a0) /* AFF0C 8011980C 00B71025 */ or $v0, $a1, $s7 /* AFF10 80119810 00C21025 */ or $v0, $a2, $v0 /* AFF14 80119814 AC820004 */ sw $v0, 4($a0) /* AFF18 80119818 8F020000 */ lw $v0, ($t8) /* AFF1C 8011981C 0040202D */ daddu $a0, $v0, $zero -/* AFF20 80119820 24420008 */ addiu $v0, $v0, %lo(D_F4000008) +/* AFF20 80119820 24420008 */ addiu $v0, $v0, 8 /* AFF24 80119824 AF020000 */ sw $v0, ($t8) /* AFF28 80119828 3C02E700 */ lui $v0, %hi(D_E7000008) /* AFF2C 8011982C AC820000 */ sw $v0, ($a0) @@ -1684,14 +1684,14 @@ glabel func_801180E8 /* B0060 80119960 0040202D */ daddu $a0, $v0, $zero /* B0064 80119964 24420008 */ addiu $v0, $v0, 8 /* B0068 80119968 AF020000 */ sw $v0, ($t8) -/* B006C 8011996C 3C02FD10 */ lui $v0, %hi(D_FD100008) +/* B006C 8011996C 3C02FD10 */ lui $v0, 0xfd10 /* B0070 80119970 00621025 */ or $v0, $v1, $v0 /* B0074 80119974 AC820000 */ sw $v0, ($a0) /* B0078 80119978 AC9E0004 */ sw $fp, 4($a0) /* B007C 8011997C 8F020000 */ lw $v0, ($t8) /* B0080 80119980 3C070700 */ lui $a3, 0x700 /* B0084 80119984 0040202D */ daddu $a0, $v0, $zero -/* B0088 80119988 24420008 */ addiu $v0, $v0, %lo(D_FD100008) +/* B0088 80119988 24420008 */ addiu $v0, $v0, 8 /* B008C 8011998C AF020000 */ sw $v0, ($t8) /* B0090 80119990 3C02F510 */ lui $v0, 0xf510 /* B0094 80119994 00621825 */ or $v1, $v1, $v0 @@ -1713,13 +1713,13 @@ glabel func_801180E8 /* B00D4 801199D4 0040182D */ daddu $v1, $v0, $zero /* B00D8 801199D8 24420008 */ addiu $v0, $v0, 8 /* B00DC 801199DC AF020000 */ sw $v0, ($t8) -/* B00E0 801199E0 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B00E0 801199E0 3C02E600 */ lui $v0, 0xe600 /* B00E4 801199E4 AC620000 */ sw $v0, ($v1) /* B00E8 801199E8 AC600004 */ sw $zero, 4($v1) /* B00EC 801199EC 8F020000 */ lw $v0, ($t8) /* B00F0 801199F0 0320202D */ daddu $a0, $t9, $zero /* B00F4 801199F4 0040302D */ daddu $a2, $v0, $zero -/* B00F8 801199F8 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B00F8 801199F8 24420008 */ addiu $v0, $v0, 8 /* B00FC 801199FC AF020000 */ sw $v0, ($t8) /* B0100 80119A00 3C02F300 */ lui $v0, 0xf300 /* B0104 80119A04 07210002 */ bgez $t9, .L80119A10 @@ -1778,13 +1778,13 @@ glabel func_801180E8 /* B01BC 80119ABC 0040182D */ daddu $v1, $v0, $zero /* B01C0 80119AC0 24420008 */ addiu $v0, $v0, 8 /* B01C4 80119AC4 AF020000 */ sw $v0, ($t8) -/* B01C8 80119AC8 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B01C8 80119AC8 3C02E700 */ lui $v0, 0xe700 /* B01CC 80119ACC AC620000 */ sw $v0, ($v1) /* B01D0 80119AD0 AC600004 */ sw $zero, 4($v1) /* B01D4 80119AD4 8F020000 */ lw $v0, ($t8) /* B01D8 80119AD8 3C03F500 */ lui $v1, 0xf500 /* B01DC 80119ADC 0040282D */ daddu $a1, $v0, $zero -/* B01E0 80119AE0 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B01E0 80119AE0 24420008 */ addiu $v0, $v0, 8 /* B01E4 80119AE4 AF020000 */ sw $v0, ($t8) /* B01E8 80119AE8 00191043 */ sra $v0, $t9, 1 /* B01EC 80119AEC 24420007 */ addiu $v0, $v0, 7 @@ -1830,14 +1830,14 @@ glabel func_801180E8 /* B0288 80119B88 0040202D */ daddu $a0, $v0, $zero /* B028C 80119B8C 24420008 */ addiu $v0, $v0, 8 /* B0290 80119B90 AF020000 */ sw $v0, ($t8) -/* B0294 80119B94 3C02FD10 */ lui $v0, %hi(D_FD100008) +/* B0294 80119B94 3C02FD10 */ lui $v0, 0xfd10 /* B0298 80119B98 00621025 */ or $v0, $v1, $v0 /* B029C 80119B9C AC820000 */ sw $v0, ($a0) /* B02A0 80119BA0 AC9E0004 */ sw $fp, 4($a0) /* B02A4 80119BA4 8F020000 */ lw $v0, ($t8) /* B02A8 80119BA8 3C070700 */ lui $a3, 0x700 /* B02AC 80119BAC 0040202D */ daddu $a0, $v0, $zero -/* B02B0 80119BB0 24420008 */ addiu $v0, $v0, %lo(D_FD100008) +/* B02B0 80119BB0 24420008 */ addiu $v0, $v0, 8 /* B02B4 80119BB4 AF020000 */ sw $v0, ($t8) /* B02B8 80119BB8 3C02F510 */ lui $v0, 0xf510 /* B02BC 80119BBC 00621825 */ or $v1, $v1, $v0 @@ -1859,13 +1859,13 @@ glabel func_801180E8 /* B02FC 80119BFC 0040182D */ daddu $v1, $v0, $zero /* B0300 80119C00 24420008 */ addiu $v0, $v0, 8 /* B0304 80119C04 AF020000 */ sw $v0, ($t8) -/* B0308 80119C08 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B0308 80119C08 3C02E600 */ lui $v0, 0xe600 /* B030C 80119C0C AC620000 */ sw $v0, ($v1) /* B0310 80119C10 AC600004 */ sw $zero, 4($v1) /* B0314 80119C14 8F020000 */ lw $v0, ($t8) /* B0318 80119C18 0320202D */ daddu $a0, $t9, $zero /* B031C 80119C1C 0040302D */ daddu $a2, $v0, $zero -/* B0320 80119C20 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B0320 80119C20 24420008 */ addiu $v0, $v0, 8 /* B0324 80119C24 AF020000 */ sw $v0, ($t8) /* B0328 80119C28 3C02F300 */ lui $v0, 0xf300 /* B032C 80119C2C 07210002 */ bgez $t9, .L80119C38 @@ -1924,13 +1924,13 @@ glabel func_801180E8 /* B03E4 80119CE4 0040182D */ daddu $v1, $v0, $zero /* B03E8 80119CE8 24420008 */ addiu $v0, $v0, 8 /* B03EC 80119CEC AF020000 */ sw $v0, ($t8) -/* B03F0 80119CF0 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B03F0 80119CF0 3C02E700 */ lui $v0, 0xe700 /* B03F4 80119CF4 AC620000 */ sw $v0, ($v1) /* B03F8 80119CF8 AC600004 */ sw $zero, 4($v1) /* B03FC 80119CFC 8F020000 */ lw $v0, ($t8) /* B0400 80119D00 3C03F508 */ lui $v1, 0xf508 /* B0404 80119D04 0040282D */ daddu $a1, $v0, $zero -/* B0408 80119D08 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B0408 80119D08 24420008 */ addiu $v0, $v0, 8 /* B040C 80119D0C AF020000 */ sw $v0, ($t8) /* B0410 80119D10 27220007 */ addiu $v0, $t9, 7 /* B0414 80119D14 000210C3 */ sra $v0, $v0, 3 @@ -1975,14 +1975,14 @@ glabel func_801180E8 /* B04AC 80119DAC 0040202D */ daddu $a0, $v0, $zero /* B04B0 80119DB0 24420008 */ addiu $v0, $v0, 8 /* B04B4 80119DB4 AF020000 */ sw $v0, ($t8) -/* B04B8 80119DB8 3C02FD10 */ lui $v0, %hi(D_FD100008) +/* B04B8 80119DB8 3C02FD10 */ lui $v0, 0xfd10 /* B04BC 80119DBC 00621025 */ or $v0, $v1, $v0 /* B04C0 80119DC0 AC820000 */ sw $v0, ($a0) /* B04C4 80119DC4 AC9E0004 */ sw $fp, 4($a0) /* B04C8 80119DC8 8F020000 */ lw $v0, ($t8) /* B04CC 80119DCC 3C070700 */ lui $a3, 0x700 /* B04D0 80119DD0 0040202D */ daddu $a0, $v0, $zero -/* B04D4 80119DD4 24420008 */ addiu $v0, $v0, %lo(D_FD100008) +/* B04D4 80119DD4 24420008 */ addiu $v0, $v0, 8 /* B04D8 80119DD8 AF020000 */ sw $v0, ($t8) /* B04DC 80119DDC 3C02F510 */ lui $v0, 0xf510 /* B04E0 80119DE0 00621825 */ or $v1, $v1, $v0 @@ -2004,13 +2004,13 @@ glabel func_801180E8 /* B0520 80119E20 0040182D */ daddu $v1, $v0, $zero /* B0524 80119E24 24420008 */ addiu $v0, $v0, 8 /* B0528 80119E28 AF020000 */ sw $v0, ($t8) -/* B052C 80119E2C 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B052C 80119E2C 3C02E600 */ lui $v0, 0xe600 /* B0530 80119E30 AC620000 */ sw $v0, ($v1) /* B0534 80119E34 AC600004 */ sw $zero, 4($v1) /* B0538 80119E38 8F020000 */ lw $v0, ($t8) /* B053C 80119E3C 0320202D */ daddu $a0, $t9, $zero /* B0540 80119E40 0040302D */ daddu $a2, $v0, $zero -/* B0544 80119E44 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B0544 80119E44 24420008 */ addiu $v0, $v0, 8 /* B0548 80119E48 AF020000 */ sw $v0, ($t8) /* B054C 80119E4C 3C02F300 */ lui $v0, 0xf300 /* B0550 80119E50 07210002 */ bgez $t9, .L80119E5C @@ -2080,14 +2080,14 @@ glabel func_801180E8 /* B0630 80119F30 0040202D */ daddu $a0, $v0, $zero /* B0634 80119F34 24420008 */ addiu $v0, $v0, 8 /* B0638 80119F38 AF020000 */ sw $v0, ($t8) -/* B063C 80119F3C 3C02FD18 */ lui $v0, %hi(D_FD180008) +/* B063C 80119F3C 3C02FD18 */ lui $v0, 0xfd18 /* B0640 80119F40 00621025 */ or $v0, $v1, $v0 /* B0644 80119F44 AC820000 */ sw $v0, ($a0) /* B0648 80119F48 AC9E0004 */ sw $fp, 4($a0) /* B064C 80119F4C 8F020000 */ lw $v0, ($t8) /* B0650 80119F50 3C070700 */ lui $a3, 0x700 /* B0654 80119F54 0040202D */ daddu $a0, $v0, $zero -/* B0658 80119F58 24420008 */ addiu $v0, $v0, %lo(D_FD180008) +/* B0658 80119F58 24420008 */ addiu $v0, $v0, 8 /* B065C 80119F5C AF020000 */ sw $v0, ($t8) /* B0660 80119F60 3C02F518 */ lui $v0, 0xf518 /* B0664 80119F64 00621825 */ or $v1, $v1, $v0 @@ -2110,13 +2110,13 @@ glabel func_801180E8 /* B06A8 80119FA8 0040182D */ daddu $v1, $v0, $zero /* B06AC 80119FAC 24420008 */ addiu $v0, $v0, 8 /* B06B0 80119FB0 AF020000 */ sw $v0, ($t8) -/* B06B4 80119FB4 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B06B4 80119FB4 3C02E600 */ lui $v0, 0xe600 /* B06B8 80119FB8 AC620000 */ sw $v0, ($v1) /* B06BC 80119FBC AC600004 */ sw $zero, 4($v1) /* B06C0 80119FC0 8F020000 */ lw $v0, ($t8) /* B06C4 80119FC4 24030800 */ addiu $v1, $zero, 0x800 /* B06C8 80119FC8 0040302D */ daddu $a2, $v0, $zero -/* B06CC 80119FCC 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B06CC 80119FCC 24420008 */ addiu $v0, $v0, 8 /* B06D0 80119FD0 AF020000 */ sw $v0, ($t8) /* B06D4 80119FD4 3C02F300 */ lui $v0, 0xf300 /* B06D8 80119FD8 18A00002 */ blez $a1, .L80119FE4 @@ -2168,14 +2168,14 @@ glabel func_801180E8 /* B0778 8011A078 0040182D */ daddu $v1, $v0, $zero /* B077C 8011A07C 24420008 */ addiu $v0, $v0, 8 /* B0780 8011A080 AF020000 */ sw $v0, ($t8) -/* B0784 8011A084 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B0784 8011A084 3C02E700 */ lui $v0, 0xe700 /* B0788 8011A088 AC620000 */ sw $v0, ($v1) /* B078C 8011A08C AC600004 */ sw $zero, 4($v1) /* B0790 8011A090 8F020000 */ lw $v0, ($t8) /* B0794 8011A094 3C03F518 */ lui $v1, 0xf518 .L8011A098: /* B0798 8011A098 0040282D */ daddu $a1, $v0, $zero -/* B079C 8011A09C 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B079C 8011A09C 24420008 */ addiu $v0, $v0, 8 /* B07A0 8011A0A0 AF020000 */ sw $v0, ($t8) /* B07A4 8011A0A4 00191040 */ sll $v0, $t9, 1 /* B07A8 8011A0A8 24420007 */ addiu $v0, $v0, 7 @@ -2332,14 +2332,14 @@ glabel func_801180E8 /* B09F0 8011A2F0 0040202D */ daddu $a0, $v0, $zero /* B09F4 8011A2F4 24420008 */ addiu $v0, $v0, 8 /* B09F8 8011A2F8 AF020000 */ sw $v0, ($t8) -/* B09FC 8011A2FC 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B09FC 8011A2FC 3C02E600 */ lui $v0, 0xe600 /* B0A00 8011A300 AC820000 */ sw $v0, ($a0) /* B0A04 8011A304 AC800004 */ sw $zero, 4($a0) /* B0A08 8011A308 2724FFFF */ addiu $a0, $t9, -1 /* B0A0C 8011A30C 8F020000 */ lw $v0, ($t8) /* B0A10 8011A310 00008012 */ mflo $s0 /* B0A14 8011A314 0040502D */ daddu $t2, $v0, $zero -/* B0A18 8011A318 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B0A18 8011A318 24420008 */ addiu $v0, $v0, 8 /* B0A1C 8011A31C AF020000 */ sw $v0, ($t8) /* B0A20 8011A320 3C02F400 */ lui $v0, 0xf400 /* B0A24 8011A324 AD420000 */ sw $v0, ($t2) @@ -2355,13 +2355,13 @@ glabel func_801180E8 /* B0A4C 8011A34C 0040302D */ daddu $a2, $v0, $zero /* B0A50 8011A350 24420008 */ addiu $v0, $v0, 8 /* B0A54 8011A354 AF020000 */ sw $v0, ($t8) -/* B0A58 8011A358 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B0A58 8011A358 3C02E700 */ lui $v0, 0xe700 /* B0A5C 8011A35C ACC20000 */ sw $v0, ($a2) /* B0A60 8011A360 ACC00004 */ sw $zero, 4($a2) /* B0A64 8011A364 8F020000 */ lw $v0, ($t8) /* B0A68 8011A368 00872025 */ or $a0, $a0, $a3 /* B0A6C 8011A36C 0040302D */ daddu $a2, $v0, $zero -/* B0A70 8011A370 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B0A70 8011A370 24420008 */ addiu $v0, $v0, 8 /* B0A74 8011A374 AF020000 */ sw $v0, ($t8) /* B0A78 8011A378 3C02F500 */ lui $v0, %hi(D_F5000007) /* B0A7C 8011A37C 00A22825 */ or $a1, $a1, $v0 @@ -2434,29 +2434,29 @@ glabel func_801180E8 /* B0B84 8011A484 0040202D */ daddu $a0, $v0, $zero /* B0B88 8011A488 24420008 */ addiu $v0, $v0, 8 /* B0B8C 8011A48C AF020000 */ sw $v0, ($t8) -/* B0B90 8011A490 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B0B90 8011A490 3C02E600 */ lui $v0, 0xe600 /* B0B94 8011A494 AC820000 */ sw $v0, ($a0) /* B0B98 8011A498 AC800004 */ sw $zero, 4($a0) /* B0B9C 8011A49C 8F020000 */ lw $v0, ($t8) /* B0BA0 8011A4A0 006A1825 */ or $v1, $v1, $t2 /* B0BA4 8011A4A4 0040202D */ daddu $a0, $v0, $zero -/* B0BA8 8011A4A8 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B0BA8 8011A4A8 24420008 */ addiu $v0, $v0, 8 /* B0BAC 8011A4AC AF020000 */ sw $v0, ($t8) -/* B0BB0 8011A4B0 3C02F400 */ lui $v0, %hi(D_F4000008) +/* B0BB0 8011A4B0 3C02F400 */ lui $v0, 0xf400 /* B0BB4 8011A4B4 AC820000 */ sw $v0, ($a0) /* B0BB8 8011A4B8 AC850004 */ sw $a1, 4($a0) /* B0BBC 8011A4BC 8F020000 */ lw $v0, ($t8) /* B0BC0 8011A4C0 00C73025 */ or $a2, $a2, $a3 /* B0BC4 8011A4C4 0040202D */ daddu $a0, $v0, $zero -/* B0BC8 8011A4C8 24420008 */ addiu $v0, $v0, %lo(D_F4000008) +/* B0BC8 8011A4C8 24420008 */ addiu $v0, $v0, 8 /* B0BCC 8011A4CC AF020000 */ sw $v0, ($t8) -/* B0BD0 8011A4D0 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B0BD0 8011A4D0 3C02E700 */ lui $v0, 0xe700 /* B0BD4 8011A4D4 AC820000 */ sw $v0, ($a0) /* B0BD8 8011A4D8 AC800004 */ sw $zero, 4($a0) /* B0BDC 8011A4DC 8F020000 */ lw $v0, ($t8) /* B0BE0 8011A4E0 00008012 */ mflo $s0 /* B0BE4 8011A4E4 0040202D */ daddu $a0, $v0, $zero -/* B0BE8 8011A4E8 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B0BE8 8011A4E8 24420008 */ addiu $v0, $v0, 8 /* B0BEC 8011A4EC AF020000 */ sw $v0, ($t8) /* B0BF0 8011A4F0 AC830004 */ sw $v1, 4($a0) /* B0BF4 8011A4F4 26030007 */ addiu $v1, $s0, 7 @@ -2523,29 +2523,29 @@ glabel func_801180E8 /* B0CE4 8011A5E4 0040202D */ daddu $a0, $v0, $zero /* B0CE8 8011A5E8 24420008 */ addiu $v0, $v0, 8 /* B0CEC 8011A5EC AF020000 */ sw $v0, ($t8) -/* B0CF0 8011A5F0 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B0CF0 8011A5F0 3C02E600 */ lui $v0, 0xe600 /* B0CF4 8011A5F4 AC820000 */ sw $v0, ($a0) /* B0CF8 8011A5F8 AC800004 */ sw $zero, 4($a0) /* B0CFC 8011A5FC 8F020000 */ lw $v0, ($t8) /* B0D00 8011A600 006A1825 */ or $v1, $v1, $t2 /* B0D04 8011A604 0040202D */ daddu $a0, $v0, $zero -/* B0D08 8011A608 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B0D08 8011A608 24420008 */ addiu $v0, $v0, 8 /* B0D0C 8011A60C AF020000 */ sw $v0, ($t8) -/* B0D10 8011A610 3C02F400 */ lui $v0, %hi(D_F4000008) +/* B0D10 8011A610 3C02F400 */ lui $v0, 0xf400 /* B0D14 8011A614 AC820000 */ sw $v0, ($a0) /* B0D18 8011A618 AC850004 */ sw $a1, 4($a0) /* B0D1C 8011A61C 8F020000 */ lw $v0, ($t8) /* B0D20 8011A620 00C73025 */ or $a2, $a2, $a3 /* B0D24 8011A624 0040202D */ daddu $a0, $v0, $zero -/* B0D28 8011A628 24420008 */ addiu $v0, $v0, %lo(D_F4000008) +/* B0D28 8011A628 24420008 */ addiu $v0, $v0, 8 /* B0D2C 8011A62C AF020000 */ sw $v0, ($t8) -/* B0D30 8011A630 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B0D30 8011A630 3C02E700 */ lui $v0, 0xe700 /* B0D34 8011A634 AC820000 */ sw $v0, ($a0) /* B0D38 8011A638 AC800004 */ sw $zero, 4($a0) /* B0D3C 8011A63C 8F020000 */ lw $v0, ($t8) /* B0D40 8011A640 00008012 */ mflo $s0 /* B0D44 8011A644 0040202D */ daddu $a0, $v0, $zero -/* B0D48 8011A648 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B0D48 8011A648 24420008 */ addiu $v0, $v0, 8 /* B0D4C 8011A64C AF020000 */ sw $v0, ($t8) /* B0D50 8011A650 00101040 */ sll $v0, $s0, 1 /* B0D54 8011A654 24420007 */ addiu $v0, $v0, 7 @@ -2613,29 +2613,29 @@ glabel func_801180E8 /* B0E48 8011A748 0040202D */ daddu $a0, $v0, $zero /* B0E4C 8011A74C 24420008 */ addiu $v0, $v0, 8 /* B0E50 8011A750 AF020000 */ sw $v0, ($t8) -/* B0E54 8011A754 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B0E54 8011A754 3C02E600 */ lui $v0, 0xe600 /* B0E58 8011A758 AC820000 */ sw $v0, ($a0) /* B0E5C 8011A75C AC800004 */ sw $zero, 4($a0) /* B0E60 8011A760 8F020000 */ lw $v0, ($t8) /* B0E64 8011A764 00691825 */ or $v1, $v1, $t1 /* B0E68 8011A768 0040202D */ daddu $a0, $v0, $zero -/* B0E6C 8011A76C 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B0E6C 8011A76C 24420008 */ addiu $v0, $v0, 8 /* B0E70 8011A770 AF020000 */ sw $v0, ($t8) -/* B0E74 8011A774 3C02F400 */ lui $v0, %hi(D_F4000008) +/* B0E74 8011A774 3C02F400 */ lui $v0, 0xf400 /* B0E78 8011A778 AC820000 */ sw $v0, ($a0) /* B0E7C 8011A77C AC850004 */ sw $a1, 4($a0) /* B0E80 8011A780 8F020000 */ lw $v0, ($t8) /* B0E84 8011A784 006A1825 */ or $v1, $v1, $t2 /* B0E88 8011A788 0040202D */ daddu $a0, $v0, $zero -/* B0E8C 8011A78C 24420008 */ addiu $v0, $v0, %lo(D_F4000008) +/* B0E8C 8011A78C 24420008 */ addiu $v0, $v0, 8 /* B0E90 8011A790 AF020000 */ sw $v0, ($t8) -/* B0E94 8011A794 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B0E94 8011A794 3C02E700 */ lui $v0, 0xe700 /* B0E98 8011A798 AC820000 */ sw $v0, ($a0) /* B0E9C 8011A79C AC800004 */ sw $zero, 4($a0) /* B0EA0 8011A7A0 8F020000 */ lw $v0, ($t8) /* B0EA4 8011A7A4 00C73025 */ or $a2, $a2, $a3 /* B0EA8 8011A7A8 0040202D */ daddu $a0, $v0, $zero -/* B0EAC 8011A7AC 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B0EAC 8011A7AC 24420008 */ addiu $v0, $v0, 8 /* B0EB0 8011A7B0 AF020000 */ sw $v0, ($t8) /* B0EB4 8011A7B4 00001012 */ mflo $v0 /* B0EB8 8011A7B8 AC830004 */ sw $v1, 4($a0) @@ -2757,13 +2757,13 @@ glabel func_801180E8 /* B1078 8011A978 0040182D */ daddu $v1, $v0, $zero /* B107C 8011A97C 24420008 */ addiu $v0, $v0, 8 /* B1080 8011A980 AF020000 */ sw $v0, ($t8) -/* B1084 8011A984 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B1084 8011A984 3C02E700 */ lui $v0, 0xe700 /* B1088 8011A988 AC620000 */ sw $v0, ($v1) /* B108C 8011A98C AC600004 */ sw $zero, 4($v1) /* B1090 8011A990 8F020000 */ lw $v0, ($t8) /* B1094 8011A994 010C4025 */ or $t0, $t0, $t4 /* B1098 8011A998 0040182D */ daddu $v1, $v0, $zero -/* B109C 8011A99C 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B109C 8011A99C 24420008 */ addiu $v0, $v0, 8 /* B10A0 8011A9A0 AF020000 */ sw $v0, ($t8) /* B10A4 8011A9A4 3C02F500 */ lui $v0, 0xf500 /* B10A8 8011A9A8 00822025 */ or $a0, $a0, $v0 @@ -2908,13 +2908,13 @@ glabel func_801180E8 /* B12C0 8011ABC0 0040182D */ daddu $v1, $v0, $zero /* B12C4 8011ABC4 24420008 */ addiu $v0, $v0, 8 /* B12C8 8011ABC8 AF020000 */ sw $v0, ($t8) -/* B12CC 8011ABCC 3C02E600 */ lui $v0, %hi(D_E6000008) +/* B12CC 8011ABCC 3C02E600 */ lui $v0, 0xe600 /* B12D0 8011ABD0 AC620000 */ sw $v0, ($v1) /* B12D4 8011ABD4 AC600004 */ sw $zero, 4($v1) /* B12D8 8011ABD8 8F020000 */ lw $v0, ($t8) /* B12DC 8011ABDC 30C30FFF */ andi $v1, $a2, 0xfff /* B12E0 8011ABE0 0040402D */ daddu $t0, $v0, $zero -/* B12E4 8011ABE4 24420008 */ addiu $v0, $v0, %lo(D_E6000008) +/* B12E4 8011ABE4 24420008 */ addiu $v0, $v0, 8 /* B12E8 8011ABE8 AF020000 */ sw $v0, ($t8) /* B12EC 8011ABEC 3C02F400 */ lui $v0, 0xf400 /* B12F0 8011ABF0 AD020000 */ sw $v0, ($t0) @@ -2930,13 +2930,13 @@ glabel func_801180E8 /* B1318 8011AC18 0040182D */ daddu $v1, $v0, $zero /* B131C 8011AC1C 24420008 */ addiu $v0, $v0, 8 /* B1320 8011AC20 AF020000 */ sw $v0, ($t8) -/* B1324 8011AC24 3C02E700 */ lui $v0, %hi(D_E7000008) +/* B1324 8011AC24 3C02E700 */ lui $v0, 0xe700 /* B1328 8011AC28 AC620000 */ sw $v0, ($v1) /* B132C 8011AC2C AC600004 */ sw $zero, 4($v1) /* B1330 8011AC30 8F020000 */ lw $v0, ($t8) /* B1334 8011AC34 3C0B0100 */ lui $t3, 0x100 /* B1338 8011AC38 0040182D */ daddu $v1, $v0, $zero -/* B133C 8011AC3C 24420008 */ addiu $v0, $v0, %lo(D_E7000008) +/* B133C 8011AC3C 24420008 */ addiu $v0, $v0, 8 /* B1340 8011AC40 AF020000 */ sw $v0, ($t8) /* B1344 8011AC44 AC640000 */ sw $a0, ($v1) /* B1348 8011AC48 8FB50030 */ lw $s5, 0x30($sp) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s index 339f9f8685..be22b8f2c0 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s @@ -668,14 +668,14 @@ glabel func_80121184 /* B8298 80121B98 AD850010 */ sw $a1, 0x10($t4) /* B829C 80121B9C AD840014 */ sw $a0, 0x14($t4) /* B82A0 80121BA0 ADA20000 */ sw $v0, ($t5) -/* B82A4 80121BA4 3C02DB02 */ lui $v0, %hi(D_DB01C270) +/* B82A4 80121BA4 3C02DB02 */ lui $v0, 0xdb02 /* B82A8 80121BA8 AD820018 */ sw $v0, 0x18($t4) /* B82AC 80121BAC 24020018 */ addiu $v0, $zero, 0x18 /* B82B0 80121BB0 AD82001C */ sw $v0, 0x1c($t4) /* B82B4 80121BB4 25820028 */ addiu $v0, $t4, 0x28 /* B82B8 80121BB8 ADA20000 */ sw $v0, ($t5) /* B82BC 80121BBC 3C028015 */ lui $v0, %hi(D_8014C270) -/* B82C0 80121BC0 2442C270 */ addiu $v0, $v0, %lo(D_DB01C270) +/* B82C0 80121BC0 2442C270 */ addiu $v0, $v0, %lo(D_8014C270) /* B82C4 80121BC4 AD820024 */ sw $v0, 0x24($t4) /* B82C8 80121BC8 2442FFF8 */ addiu $v0, $v0, -8 /* B82CC 80121BCC AD82002C */ sw $v0, 0x2c($t4) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s index 2b41f3c5f4..61c1a0797a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s @@ -640,14 +640,14 @@ glabel func_80122288 /* B932C 80122C2C AD850010 */ sw $a1, 0x10($t4) /* B9330 80122C30 AD840014 */ sw $a0, 0x14($t4) /* B9334 80122C34 ADA20000 */ sw $v0, ($t5) -/* B9338 80122C38 3C02DB02 */ lui $v0, %hi(D_DB01C270) +/* B9338 80122C38 3C02DB02 */ lui $v0, 0xdb02 /* B933C 80122C3C AD820018 */ sw $v0, 0x18($t4) /* B9340 80122C40 24020018 */ addiu $v0, $zero, 0x18 /* B9344 80122C44 AD82001C */ sw $v0, 0x1c($t4) /* B9348 80122C48 25820028 */ addiu $v0, $t4, 0x28 /* B934C 80122C4C ADA20000 */ sw $v0, ($t5) /* B9350 80122C50 3C028015 */ lui $v0, %hi(D_8014C270) -/* B9354 80122C54 2442C270 */ addiu $v0, $v0, %lo(D_DB01C270) +/* B9354 80122C54 2442C270 */ addiu $v0, $v0, %lo(D_8014C270) /* B9358 80122C58 AD820024 */ sw $v0, 0x24($t4) /* B935C 80122C5C 2442FFF8 */ addiu $v0, $v0, -8 /* B9360 80122C60 AD82002C */ sw $v0, 0x2c($t4) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s index 833763d078..565441a2e2 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s @@ -377,13 +377,13 @@ glabel func_80126790 /* BD42C 80126D2C 8E240000 */ lw $a0, ($s1) /* BD430 80126D30 00721821 */ addu $v1, $v1, $s2 /* BD434 80126D34 00832021 */ addu $a0, $a0, $v1 -/* BD438 80126D38 3C038000 */ lui $v1, %hi(D_7FFFD690) +/* BD438 80126D38 3C038000 */ lui $v1, 0x8000 /* BD43C 80126D3C 00832021 */ addu $a0, $a0, $v1 /* BD440 80126D40 24430008 */ addiu $v1, $v0, 8 /* BD444 80126D44 ACC40004 */ sw $a0, 4($a2) /* BD448 80126D48 ACA30000 */ sw $v1, ($a1) /* BD44C 80126D4C 3C03802F */ lui $v1, %hi(D_802ED690) -/* BD450 80126D50 2463D690 */ addiu $v1, $v1, %lo(D_7FFFD690) +/* BD450 80126D50 2463D690 */ addiu $v1, $v1, %lo(D_802ED690) /* BD454 80126D54 AC430004 */ sw $v1, 4($v0) /* BD458 80126D58 24430010 */ addiu $v1, $v0, 0x10 /* BD45C 80126D5C AC470000 */ sw $a3, ($v0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s index 75b9331d35..c7e218614a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s @@ -2790,14 +2790,14 @@ glabel func_80127D90 /* C0ECC 8012A7CC 00A0382D */ daddu $a3, $a1, $zero /* C0ED0 8012A7D0 00431025 */ or $v0, $v0, $v1 /* C0ED4 8012A7D4 ACC20038 */ sw $v0, 0x38($a2) -/* C0ED8 8012A7D8 3C02FB00 */ lui $v0, %hi(D_FB000002) +/* C0ED8 8012A7D8 3C02FB00 */ lui $v0, 0xfb00 /* C0EDC 8012A7DC ACE20000 */ sw $v0, ($a3) /* C0EE0 8012A7E0 8CC20020 */ lw $v0, 0x20($a2) /* C0EE4 8012A7E4 8CC3004C */ lw $v1, 0x4c($a2) /* C0EE8 8012A7E8 24A50008 */ addiu $a1, $a1, 8 /* C0EEC 8012A7EC AEE50000 */ sw $a1, ($s7) /* C0EF0 8012A7F0 00431021 */ addu $v0, $v0, $v1 -/* C0EF4 8012A7F4 90440002 */ lbu $a0, %lo(D_FB000002)($v0) +/* C0EF4 8012A7F4 90440002 */ lbu $a0, 2($v0) /* C0EF8 8012A7F8 3508F279 */ ori $t0, $t0, 0xf279 /* C0EFC 8012A7FC 00041E00 */ sll $v1, $a0, 0x18 /* C0F00 8012A800 00041400 */ sll $v0, $a0, 0x10 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s index b4e04045ce..882ab9ff4f 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s @@ -249,13 +249,13 @@ glabel func_8012DB58 /* C45F0 8012DEF0 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) /* C45F4 8012DEF4 3508C0FC */ ori $t0, $t0, 0xc0fc /* C45F8 8012DEF8 8D490000 */ lw $t1, ($t2) -/* C45FC 8012DEFC 3C02FD90 */ lui $v0, %hi(D_FD8FCD50) +/* C45FC 8012DEFC 3C02FD90 */ lui $v0, 0xfd90 /* C4600 8012DF00 0120182D */ daddu $v1, $t1, $zero /* C4604 8012DF04 25290008 */ addiu $t1, $t1, 8 /* C4608 8012DF08 AD490000 */ sw $t1, ($t2) /* C460C 8012DF0C AC620000 */ sw $v0, ($v1) /* C4610 8012DF10 3C02802F */ lui $v0, %hi(D_802ECD50) -/* C4614 8012DF14 2442CD50 */ addiu $v0, $v0, %lo(D_FD8FCD50) +/* C4614 8012DF14 2442CD50 */ addiu $v0, $v0, %lo(D_802ECD50) /* C4618 8012DF18 AC620004 */ sw $v0, 4($v1) /* C461C 8012DF1C 25220008 */ addiu $v0, $t1, 8 /* C4620 8012DF20 AD420000 */ sw $v0, ($t2) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s index 1a8c024bf1..cfd8617f7e 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s @@ -97,14 +97,14 @@ glabel func_8012E9A0 .L8012EB08: /* C5208 8012EB08 24020002 */ addiu $v0, $zero, 2 /* C520C 8012EB0C 16020034 */ bne $s0, $v0, .L8012EBE0 -/* C5210 8012EB10 3C05E300 */ lui $a1, %hi(D_E3000008) +/* C5210 8012EB10 3C05E300 */ lui $a1, 0xe300 /* C5214 8012EB14 3C02E300 */ lui $v0, 0xe300 /* C5218 8012EB18 3C06800A */ lui $a2, %hi(D_8009A66C) /* C521C 8012EB1C 24C6A66C */ addiu $a2, $a2, %lo(D_8009A66C) /* C5220 8012EB20 8CC50000 */ lw $a1, ($a2) /* C5224 8012EB24 34421001 */ ori $v0, $v0, 0x1001 /* C5228 8012EB28 00A0182D */ daddu $v1, $a1, $zero -/* C522C 8012EB2C 24A50008 */ addiu $a1, $a1, %lo(D_E3000008) +/* C522C 8012EB2C 24A50008 */ addiu $a1, $a1, 8 /* C5230 8012EB30 ACC50000 */ sw $a1, ($a2) /* C5234 8012EB34 AC620000 */ sw $v0, ($v1) /* C5238 8012EB38 34028000 */ ori $v0, $zero, 0x8000 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s index fbf308f449..1ef48de5d4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s @@ -530,14 +530,14 @@ glabel func_8012EC94 /* C5B78 8012F478 00151140 */ sll $v0, $s5, 5 /* C5B7C 8012F47C 3042FFE0 */ andi $v0, $v0, 0xffe0 /* C5B80 8012F480 00621825 */ or $v1, $v1, $v0 -/* C5B84 8012F484 3C02F100 */ lui $v0, %hi(D_F1000040) +/* C5B84 8012F484 3C02F100 */ lui $v0, 0xf100 /* C5B88 8012F488 ACA20008 */ sw $v0, 8($a1) /* C5B8C 8012F48C 31A200FF */ andi $v0, $t5, 0xff /* C5B90 8012F490 14400007 */ bnez $v0, .L8012F4B0 /* C5B94 8012F494 ACA30004 */ sw $v1, 4($a1) /* C5B98 8012F498 97A20000 */ lhu $v0, ($sp) /* C5B9C 8012F49C 97A3000C */ lhu $v1, 0xc($sp) -/* C5BA0 8012F4A0 24420040 */ addiu $v0, $v0, %lo(D_F1000040) +/* C5BA0 8012F4A0 24420040 */ addiu $v0, $v0, 0x40 /* C5BA4 8012F4A4 A7A20000 */ sh $v0, ($sp) /* C5BA8 8012F4A8 0804BBCD */ j .L8012EF34 /* C5BAC 8012F4AC A7A30008 */ sh $v1, 8($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s index 4b665520af..4f9a6f8fe6 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s @@ -954,13 +954,13 @@ glabel func_80136A80 /* CE010 80137910 8C830000 */ lw $v1, ($a0) /* CE014 80137914 30E200FF */ andi $v0, $a3, 0xff /* CE018 80137918 ACA20000 */ sw $v0, ($a1) -/* CE01C 8013791C 3C02DE00 */ lui $v0, %hi(D_DDFFE9A8) +/* CE01C 8013791C 3C02DE00 */ lui $v0, 0xde00 /* CE020 80137920 0060282D */ daddu $a1, $v1, $zero /* CE024 80137924 24630008 */ addiu $v1, $v1, 8 /* CE028 80137928 AC830000 */ sw $v1, ($a0) /* CE02C 8013792C ACA20000 */ sw $v0, ($a1) /* CE030 80137930 3C028015 */ lui $v0, %hi(D_8014E9A8) -/* CE034 80137934 2442E9A8 */ addiu $v0, $v0, %lo(D_DDFFE9A8) +/* CE034 80137934 2442E9A8 */ addiu $v0, $v0, %lo(D_8014E9A8) /* CE038 80137938 ACA20004 */ sw $v0, 4($a1) /* CE03C 8013793C 24620008 */ addiu $v0, $v1, 8 /* CE040 80137940 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index 3b71bdf0e0..486486f279 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s @@ -215,14 +215,14 @@ glabel func_80138E54 /* CF894 80139194 00042180 */ sll $a0, $a0, 6 /* CF898 80139198 00912021 */ addu $a0, $a0, $s1 /* CF89C 8013919C 00442021 */ addu $a0, $v0, $a0 -/* CF8A0 801391A0 3C02ED00 */ lui $v0, %hi(D_ECFFED98) +/* CF8A0 801391A0 3C02ED00 */ lui $v0, 0xed00 /* CF8A4 801391A4 AE430000 */ sw $v1, ($s2) /* CF8A8 801391A8 AD020000 */ sw $v0, ($t0) /* CF8AC 801391AC 24620008 */ addiu $v0, $v1, 8 /* CF8B0 801391B0 AD090004 */ sw $t1, 4($t0) /* CF8B4 801391B4 AE420000 */ sw $v0, ($s2) /* CF8B8 801391B8 3C028015 */ lui $v0, %hi(D_8014ED98) -/* CF8BC 801391BC 2442ED98 */ addiu $v0, $v0, %lo(D_ECFFED98) +/* CF8BC 801391BC 2442ED98 */ addiu $v0, $v0, %lo(D_8014ED98) /* CF8C0 801391C0 AC620004 */ sw $v0, 4($v1) /* CF8C4 801391C4 24620010 */ addiu $v0, $v1, 0x10 /* CF8C8 801391C8 AC6A0000 */ sw $t2, ($v1) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s index f7b445b25a..9a0c2724db 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s @@ -278,7 +278,7 @@ glabel func_8013E2F0 /* D4E20 8013E720 0C052071 */ jal func_801481C4 /* D4E24 8013E724 AFA20018 */ sw $v0, 0x18($sp) /* D4E28 8013E728 0804FA25 */ j .L8013E894 -/* D4E2C 8013E72C 3C07D838 */ lui $a3, %hi(D_D837A66C) +/* D4E2C 8013E72C 3C07D838 */ lui $a3, 0xd838 .L8013E730: /* D4E30 8013E730 3C08070A */ lui $t0, 0x70a .L8013E734: @@ -287,7 +287,7 @@ glabel func_8013E2F0 /* D4E3C 8013E73C 354A0280 */ ori $t2, $t2, 0x280 /* D4E40 8013E740 3C09F240 */ lui $t1, 0xf240 /* D4E44 8013E744 3C07800A */ lui $a3, %hi(D_8009A66C) -/* D4E48 8013E748 24E7A66C */ addiu $a3, $a3, %lo(D_D837A66C) +/* D4E48 8013E748 24E7A66C */ addiu $a3, $a3, %lo(D_8009A66C) /* D4E4C 8013E74C 8CE50000 */ lw $a1, ($a3) /* D4E50 8013E750 35290400 */ ori $t1, $t1, 0x400 /* D4E54 8013E754 00A0202D */ daddu $a0, $a1, $zero diff --git a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s index d289800305..c2f2a68af2 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s +++ b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s @@ -598,13 +598,13 @@ glabel func_80145EC0 /* DCE9C 8014679C 254AA66C */ addiu $t2, $t2, %lo(D_8009A66C) /* DCEA0 801467A0 2642FFFF */ addiu $v0, $s2, -1 /* DCEA4 801467A4 30420FFF */ andi $v0, $v0, 0xfff -/* DCEA8 801467A8 3C03FD48 */ lui $v1, %hi(D_FD47FFFF) +/* DCEA8 801467A8 3C03FD48 */ lui $v1, 0xfd48 /* DCEAC 801467AC 00431025 */ or $v0, $v0, $v1 /* DCEB0 801467B0 3C14F548 */ lui $s4, 0xf548 /* DCEB4 801467B4 36944A00 */ ori $s4, $s4, 0x4a00 /* DCEB8 801467B8 03191821 */ addu $v1, $t8, $t9 /* DCEBC 801467BC AFA2003C */ sw $v0, 0x3c($sp) -/* DCEC0 801467C0 2462FFFF */ addiu $v0, $v1, %lo(D_FD47FFFF) +/* DCEC0 801467C0 2462FFFF */ addiu $v0, $v1, -1 /* DCEC4 801467C4 00021080 */ sll $v0, $v0, 2 /* DCEC8 801467C8 30420FFF */ andi $v0, $v0, 0xfff /* DCECC 801467CC 00021300 */ sll $v0, $v0, 0xc diff --git a/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s b/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s index 2255bd92b8..97e7a81070 100644 --- a/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s +++ b/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s @@ -41,13 +41,13 @@ glabel osInvalDCache /* 3CBA4 800617A4 03E00008 */ jr $ra /* 3CBA8 800617A8 00000000 */ nop .L800617AC: -/* 3CBAC 800617AC 3C088000 */ lui $t0, %hi(D_80000010) +/* 3CBAC 800617AC 3C088000 */ lui $t0, 0x8000 /* 3CBB0 800617B0 010B4821 */ addu $t1, $t0, $t3 /* 3CBB4 800617B4 2529FFF0 */ addiu $t1, $t1, -0x10 .L800617B8: /* 3CBB8 800617B8 BD010000 */ cache 1, ($t0) /* 3CBBC 800617BC 0109082B */ sltu $at, $t0, $t1 /* 3CBC0 800617C0 1420FFFD */ bnez $at, .L800617B8 -/* 3CBC4 800617C4 25080010 */ addiu $t0, $t0, %lo(D_80000010) +/* 3CBC4 800617C4 25080010 */ addiu $t0, $t0, 0x10 /* 3CBC8 800617C8 03E00008 */ jr $ra /* 3CBCC 800617CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s b/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s index 7f0e5de8c5..c4e923ee5a 100644 --- a/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s +++ b/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s @@ -25,14 +25,14 @@ glabel osInvalICache /* 3CC18 80061818 03E00008 */ jr $ra /* 3CC1C 8006181C 00000000 */ nop .L80061820: -/* 3CC20 80061820 3C088000 */ lui $t0, %hi(D_80000020) +/* 3CC20 80061820 3C088000 */ lui $t0, 0x8000 /* 3CC24 80061824 010B4821 */ addu $t1, $t0, $t3 /* 3CC28 80061828 2529FFE0 */ addiu $t1, $t1, -0x20 .L8006182C: /* 3CC2C 8006182C BD000000 */ cache 0, ($t0) /* 3CC30 80061830 0109082B */ sltu $at, $t0, $t1 /* 3CC34 80061834 1420FFFD */ bnez $at, .L8006182C -/* 3CC38 80061838 25080020 */ addiu $t0, $t0, %lo(D_80000020) +/* 3CC38 80061838 25080020 */ addiu $t0, $t0, 0x20 /* 3CC3C 8006183C 03E00008 */ jr $ra /* 3CC40 80061840 00000000 */ nop /* 3CC44 80061844 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s b/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s index 24c996de1d..8f246c07cb 100644 --- a/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s +++ b/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s @@ -25,14 +25,14 @@ glabel osWritebackDCache /* 3CC98 80061898 03E00008 */ jr $ra /* 3CC9C 8006189C 00000000 */ nop .L800618A0: -/* 3CCA0 800618A0 3C088000 */ lui $t0, %hi(D_80000010) +/* 3CCA0 800618A0 3C088000 */ lui $t0, 0x8000 /* 3CCA4 800618A4 010B4821 */ addu $t1, $t0, $t3 /* 3CCA8 800618A8 2529FFF0 */ addiu $t1, $t1, -0x10 .L800618AC: /* 3CCAC 800618AC BD010000 */ cache 1, ($t0) /* 3CCB0 800618B0 0109082B */ sltu $at, $t0, $t1 /* 3CCB4 800618B4 1420FFFD */ bnez $at, .L800618AC -/* 3CCB8 800618B8 25080010 */ addiu $t0, $t0, %lo(D_80000010) +/* 3CCB8 800618B8 25080010 */ addiu $t0, $t0, 0x10 /* 3CCBC 800618BC 03E00008 */ jr $ra /* 3CCC0 800618C0 00000000 */ nop /* 3CCC4 800618C4 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s b/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s index 0a2d68d378..0aa68dcb2c 100644 --- a/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s +++ b/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel osWritebackDCacheAll -/* 3CCD0 800618D0 3C088000 */ lui $t0, %hi(D_80000010) +/* 3CCD0 800618D0 3C088000 */ lui $t0, 0x8000 /* 3CCD4 800618D4 240A2000 */ addiu $t2, $zero, 0x2000 /* 3CCD8 800618D8 010A4821 */ addu $t1, $t0, $t2 /* 3CCDC 800618DC 2529FFF0 */ addiu $t1, $t1, -0x10 @@ -10,7 +10,7 @@ glabel osWritebackDCacheAll /* 3CCE0 800618E0 BD010000 */ cache 1, ($t0) /* 3CCE4 800618E4 0109082B */ sltu $at, $t0, $t1 /* 3CCE8 800618E8 1420FFFD */ bnez $at, .L800618E0 -/* 3CCEC 800618EC 25080010 */ addiu $t0, $t0, %lo(D_80000010) +/* 3CCEC 800618EC 25080010 */ addiu $t0, $t0, 0x10 /* 3CCF0 800618F0 03E00008 */ jr $ra /* 3CCF4 800618F4 00000000 */ nop /* 3CCF8 800618F8 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s b/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s index e52196abca..ee2ea144b9 100644 --- a/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s +++ b/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s @@ -74,7 +74,7 @@ glabel osViSwapContext .L80067178: /* 42578 80067178 4600008D */ trunc.w.s $f2, $f0 /* 4257C 8006717C 44041000 */ mfc1 $a0, $f2 -/* 42580 80067180 3C028000 */ lui $v0, %hi(D_8000002C) +/* 42580 80067180 3C028000 */ lui $v0, 0x8000 /* 42584 80067184 00822025 */ or $a0, $a0, $v0 /* 42588 80067188 00111080 */ sll $v0, $s1, 2 .L8006718C: @@ -82,7 +82,7 @@ glabel osViSwapContext /* 42590 80067190 00021080 */ sll $v0, $v0, 2 /* 42594 80067194 02421021 */ addu $v0, $s2, $v0 /* 42598 80067198 AE04002C */ sw $a0, 0x2c($s0) -/* 4259C 8006719C 8C42002C */ lw $v0, %lo(D_8000002C)($v0) +/* 4259C 8006719C 8C42002C */ lw $v0, 0x2c($v0) /* 425A0 800671A0 2403F000 */ addiu $v1, $zero, -0x1000 /* 425A4 800671A4 00431024 */ and $v0, $v0, $v1 /* 425A8 800671A8 08019C70 */ j .L800671C0 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s index 3b8f0febb8..b87b699205 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s @@ -350,7 +350,7 @@ glabel func_80243758_A2D998 /* A2DEA4 80243C64 0040202D */ daddu $a0, $v0, $zero /* A2DEA8 80243C68 24420008 */ addiu $v0, $v0, 8 /* A2DEAC 80243C6C AC620000 */ sw $v0, ($v1) -/* A2DEB0 80243C70 3C02F100 */ lui $v0, %hi(D_F1000008) +/* A2DEB0 80243C70 3C02F100 */ lui $v0, 0xf100 /* A2DEB4 80243C74 AC820000 */ sw $v0, ($a0) /* A2DEB8 80243C78 AC850004 */ sw $a1, 4($a0) .L80243C7C: @@ -358,7 +358,7 @@ glabel func_80243758_A2D998 /* A2DEC0 80243C80 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C) /* A2DEC4 80243C84 8C620000 */ lw $v0, ($v1) /* A2DEC8 80243C88 0040202D */ daddu $a0, $v0, $zero -/* A2DECC 80243C8C 24420008 */ addiu $v0, $v0, %lo(D_F1000008) +/* A2DECC 80243C8C 24420008 */ addiu $v0, $v0, 8 /* A2DED0 80243C90 AC620000 */ sw $v0, ($v1) /* A2DED4 80243C94 3C02E700 */ lui $v0, 0xe700 /* A2DED8 80243C98 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s index e5e925f9df..942629e282 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s @@ -30,13 +30,13 @@ glabel func_80240010_8FEE90 /* 8FEEF4 80240074 25EF0334 */ addiu $t7, $t7, %lo(D_80240334) /* 8FEEF8 80240078 0120502D */ daddu $t2, $t1, $zero /* 8FEEFC 8024007C 8D030000 */ lw $v1, ($t0) -/* 8FEF00 80240080 3C02DE00 */ lui $v0, %hi(D_DE000338) +/* 8FEF00 80240080 3C02DE00 */ lui $v0, 0xde00 /* 8FEF04 80240084 0060202D */ daddu $a0, $v1, $zero /* 8FEF08 80240088 24630008 */ addiu $v1, $v1, 8 /* 8FEF0C 8024008C AD030000 */ sw $v1, ($t0) /* 8FEF10 80240090 AC820000 */ sw $v0, ($a0) /* 8FEF14 80240094 3C028024 */ lui $v0, %hi(D_80240338) -/* 8FEF18 80240098 24420338 */ addiu $v0, $v0, %lo(D_DE000338) +/* 8FEF18 80240098 24420338 */ addiu $v0, $v0, %lo(D_80240338) /* 8FEF1C 8024009C AC820004 */ sw $v0, 4($a0) /* 8FEF20 802400A0 24620008 */ addiu $v0, $v1, 8 /* 8FEF24 802400A4 AD020000 */ sw $v0, ($t0) diff --git a/tools/n64splat b/tools/n64splat index 5c39b85f81..900f9e0166 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 5c39b85f817ad174f0c562811c183c88bf565f8f +Subproject commit 900f9e0166f8fa5501bbbc4ef6478ed97f975acd diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 651cbac792..1472a9edd3 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -1,21 +1,10 @@ D_7FFF8918 = 0x7FFF8918; -D_7FFFD690 = 0x7FFFD690; -D_7FFFEC40 = 0x7FFFEC40; -D_7FFFF264 = 0x7FFFF264; -D_7FFFFB78 = 0x7FFFFB78; -D_7FFFFFFF = 0x7FFFFFFF; D_80000000 = 0x80000000; -D_80000010 = 0x80000010; -D_80000020 = 0x80000020; -D_8000002C = 0x8000002C; D_80000308 = 0x80000308; D_8000030C = 0x8000030C; D_80000318 = 0x80000318; D_8000031C = 0x8000031C; -D_800006A4 = 0x800006A4; -D_800006A8 = 0x800006A8; D_80001D80 = 0x80001D80; -D_8000419C = 0x8000419C; D_80007410 = 0x80007410; D_80025D74 = 0x80025D74; D_80026AC7 = 0x80026AC7; @@ -117,8 +106,6 @@ D_80078160 = 0x80078160; D_80078164 = 0x80078164; D_80078168 = 0x80078168; D_80078170 = 0x80078170; -D_80078178 = 0x80078178; -D_8007817C = 0x8007817C; D_80078180 = 0x80078180; D_80078181 = 0x80078181; D_80078190 = 0x80078190; @@ -663,9 +650,7 @@ D_800A3638 = 0x800A3638; D_800A3640 = 0x800A3640; D_800A3658 = 0x800A3658; D_800A3720 = 0x800A3720; -D_800A3BD0 = 0x800A3BD0; D_800A3BD4 = 0x800A3BD4; -D_800A3BE0 = 0x800A3BE0; D_800A3BF0 = 0x800A3BF0; D_800A3FD0 = 0x800A3FD0; D_800A3FE0 = 0x800A3FE0; @@ -4750,7 +4735,6 @@ D_802F4560 = 0x802F4560; D_8034F800 = 0x8034F800; D_A0000000 = 0xA0000000; D_A0000C7C = 0xA0000C7C; -D_A0006A70 = 0xA0006A70; D_A4000000 = 0xA4000000; D_A40004C0 = 0xA40004C0; D_A4000768 = 0xA4000768; @@ -4774,24 +4758,17 @@ D_B0000008 = 0xB0000008; D_B0000010 = 0xB0000010; D_BF804254 = 0xBF804254; D_BF806900 = 0xBF806900; -D_BFDFB110 = 0xBFDFB110; D_BFFF949C = 0xBFFF949C; D_C0007C28 = 0xC0007C28; D_C1F06370 = 0xC1F06370; D_C247F280 = 0xC247F280; -D_C281F280 = 0xC281F280; D_C28BF280 = 0xC28BF280; -D_C295F280 = 0xC295F280; D_C29FF280 = 0xC29FF280; -D_C2BDF280 = 0xC2BDF280; D_C2BE35B8 = 0xC2BE35B8; D_C479EFB0 = 0xC479EFB0; D_C479EFF4 = 0xC479EFF4; -D_D837A66C = 0xD837A66C; D_D9FCFFFF = 0xD9FCFFFF; D_DA37A674 = 0xDA37A674; -D_DA380060 = 0xDA380060; -D_DB01C270 = 0xDB01C270; D_DDFF8100 = 0xDDFF8100; D_DDFF9710 = 0xDDFF9710; D_DDFF97D8 = 0xDDFF97D8; @@ -4834,7 +4811,6 @@ D_DDFFE670 = 0xDDFFE670; D_DDFFE6C0 = 0xDDFFE6C0; D_DDFFE718 = 0xDDFFE718; D_DDFFE8F0 = 0xDDFFE8F0; -D_DDFFE9A8 = 0xDDFFE9A8; D_DDFFEDE8 = 0xDDFFEDE8; D_DDFFEE68 = 0xDDFFEE68; D_DDFFF078 = 0xDDFFF078; @@ -4848,15 +4824,11 @@ D_DDFFF428 = 0xDDFFF428; D_DDFFF460 = 0xDDFFF460; D_DDFFF490 = 0xDDFFF490; D_DDFFF5A0 = 0xDDFFF5A0; -D_DDFFF750 = 0xDDFFF750; D_DE000000 = 0xDE000000; -D_DE000008 = 0xDE000008; -D_DE00007C = 0xDE00007C; D_DE000080 = 0xDE000080; D_DE0000C8 = 0xDE0000C8; D_DE0002C0 = 0xDE0002C0; D_DE000328 = 0xDE000328; -D_DE000338 = 0xDE000338; D_DE000440 = 0xDE000440; D_DE0004C0 = 0xDE0004C0; D_DE0005E0 = 0xDE0005E0; @@ -4874,7 +4846,6 @@ D_DE001230 = 0xDE001230; D_DE001F00 = 0xDE001F00; D_DE002170 = 0xDE002170; D_DE002578 = 0xDE002578; -D_DE0028A0 = 0xDE0028A0; D_DE002950 = 0xDE002950; D_DE003110 = 0xDE003110; D_DE003970 = 0xDE003970; @@ -4887,7 +4858,6 @@ D_DE007908 = 0xDE007908; D_DE007930 = 0xDE007930; D_DE0079B8 = 0xDE0079B8; D_DE007A38 = 0xDE007A38; -D_DE007A50 = 0xDE007A50; D_DE007CA0 = 0xDE007CA0; D_E00021B4 = 0xE00021B4; D_E00021BC = 0xE00021BC; @@ -5460,21 +5430,13 @@ D_E0200730 = 0xE0200730; D_E0200734 = 0xE0200734; D_E1000010 = 0xE1000010; D_E2FFD6B0 = 0xE2FFD6B0; -D_E3000008 = 0xE3000008; -D_E6000008 = 0xE6000008; D_E7000001 = 0xE7000001; D_E7000008 = 0xE7000008; -D_E700001C = 0xE700001C; D_E70013F8 = 0xE70013F8; D_E8000008 = 0xE8000008; -D_ECFF96B0 = 0xECFF96B0; -D_ECFFED98 = 0xECFFED98; D_F0000008 = 0xF0000008; D_F0001328 = 0xF0001328; -D_F1000008 = 0xF1000008; -D_F1000040 = 0xF1000040; D_F1FFFFFF = 0xF1FFFFFF; -D_F4000008 = 0xF4000008; D_F5000007 = 0xF5000007; D_F79DDD0F = 0xF79DDD0F; D_F7FEC070 = 0xF7FEC070; @@ -5483,7 +5445,6 @@ D_F7FFB754 = 0xF7FFB754; D_F8003A4B = 0xF8003A4B; D_F800437F = 0xF800437F; D_F8FFB74D = 0xF8FFB74D; -D_F9003E10 = 0xF9003E10; D_F9FFB750 = 0xF9FFB750; D_F9FFB760 = 0xF9FFB760; D_F9FFBF70 = 0xF9FFBF70; @@ -5492,13 +5453,7 @@ D_FA000A78 = 0xFA000A78; D_FA0015A8 = 0xFA0015A8; D_FA006078 = 0xFA006078; D_FAFFB763 = 0xFAFFB763; -D_FB000002 = 0xFB000002; D_FD0F93A0 = 0xFD0F93A0; D_FD0FF038 = 0xFD0FF038; D_FD100008 = 0xFD100008; -D_FD180008 = 0xFD180008; -D_FD47FFFF = 0xFD47FFFF; -D_FD8FCD50 = 0xFD8FCD50; -D_FFDF0001 = 0xFFDF0001; -D_FFF00768 = 0xFFF00768; D_FFFF41F0 = 0xFFFF41F0;