diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s index 812902839a..34a55a5dba 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s @@ -70,10 +70,10 @@ glabel func_802E6ED8 /* 10885C 802E6FDC 00621821 */ addu $v1, $v1, $v0 /* 108860 802E6FE0 AC830004 */ sw $v1, 4($a0) /* 108864 802E6FE4 8E430044 */ lw $v1, 0x44($s2) -/* 108868 802E6FE8 3C02DE00 */ lui $v0, %hi(D_DE000DC0) +/* 108868 802E6FE8 3C02DE00 */ lui $v0, 0xde00 /* 10886C 802E6FEC ACA20000 */ sw $v0, ($a1) /* 108870 802E6FF0 3C020A00 */ lui $v0, 0xa00 -/* 108874 802E6FF4 24420DC0 */ addiu $v0, $v0, %lo(D_DE000DC0) +/* 108874 802E6FF4 24420DC0 */ addiu $v0, $v0, 0xdc0 /* 108878 802E6FF8 3042FFFF */ andi $v0, $v0, 0xffff /* 10887C 802E6FFC 00621821 */ addu $v1, $v1, $v0 /* 108880 802E7000 24020040 */ addiu $v0, $zero, 0x40 diff --git a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s index 3ae401a095..e2962b7bf4 100644 --- a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s +++ b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s @@ -67,11 +67,11 @@ glabel push_entity_matrix /* 10A7C4 802E8F44 8E430000 */ lw $v1, ($s2) /* 10A7C8 802E8F48 00541021 */ addu $v0, $v0, $s4 /* 10A7CC 802E8F4C 00621821 */ addu $v1, $v1, $v0 -/* 10A7D0 802E8F50 3C02DE00 */ lui $v0, %hi(D_DE000680) +/* 10A7D0 802E8F50 3C02DE00 */ lui $v0, 0xde00 /* 10A7D4 802E8F54 AC830004 */ sw $v1, 4($a0) /* 10A7D8 802E8F58 ACA20000 */ sw $v0, ($a1) /* 10A7DC 802E8F5C 3C020A00 */ lui $v0, 0xa00 -/* 10A7E0 802E8F60 24420680 */ addiu $v0, $v0, %lo(D_DE000680) +/* 10A7E0 802E8F60 24420680 */ addiu $v0, $v0, 0x680 /* 10A7E4 802E8F64 ACA20004 */ sw $v0, 4($a1) /* 10A7E8 802E8F68 24020040 */ addiu $v0, $zero, 0x40 /* 10A7EC 802E8F6C ACC70000 */ sw $a3, ($a2) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s index 91312d186c..f650295ebe 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s @@ -151,11 +151,11 @@ glabel func_8003DC38 /* 19278 8003DE78 4616B082 */ mul.s $f2, $f22, $f22 /* 1927C 8003DE7C 00000000 */ nop /* 19280 8003DE80 C62C000C */ lwc1 $f12, 0xc($s1) -/* 19284 8003DE84 3C01C000 */ lui $at, %hi(D_C0007C28) +/* 19284 8003DE84 3C01C000 */ lui $at, 0xc000 /* 19288 8003DE88 4481A000 */ mtc1 $at, $f20 /* 1928C 8003DE8C 46020000 */ add.s $f0, $f0, $f2 /* 19290 8003DE90 3C018007 */ lui $at, %hi(D_80077C28) -/* 19294 8003DE94 A4207C28 */ sh $zero, %lo(D_C0007C28)($at) +/* 19294 8003DE94 A4207C28 */ sh $zero, %lo(D_80077C28)($at) /* 19298 8003DE98 3C0140A0 */ lui $at, 0x40a0 /* 1929C 8003DE9C 44811000 */ mtc1 $at, $f2 /* 192A0 8003DEA0 46006307 */ neg.s $f12, $f12 diff --git a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index 9db4aa85d0..96a938c9b3 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s @@ -616,12 +616,12 @@ glabel pause_badges_draw_contents /* 13B150 80247E10 34841201 */ ori $a0, $a0, 0x1201 /* 13B154 80247E14 3C05800A */ lui $a1, %hi(D_8009A66C) /* 13B158 80247E18 8CA5A66C */ lw $a1, %lo(D_8009A66C)($a1) -/* 13B15C 80247E1C 3C02DE00 */ lui $v0, %hi(D_DDFFF348) +/* 13B15C 80247E1C 3C02DE00 */ lui $v0, 0xde00 /* 13B160 80247E20 00A0182D */ daddu $v1, $a1, $zero /* 13B164 80247E24 24A50008 */ addiu $a1, $a1, 8 /* 13B168 80247E28 AC620000 */ sw $v0, ($v1) /* 13B16C 80247E2C 3C028027 */ lui $v0, %hi(D_8026F348) -/* 13B170 80247E30 2442F348 */ addiu $v0, $v0, %lo(D_DDFFF348) +/* 13B170 80247E30 2442F348 */ addiu $v0, $v0, %lo(D_8026F348) /* 13B174 80247E34 AC620004 */ sw $v0, 4($v1) /* 13B178 80247E38 24A20008 */ addiu $v0, $a1, 8 /* 13B17C 80247E3C 3C01800A */ lui $at, %hi(D_8009A66C) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s index 23e1969a89..c8eef96f24 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s @@ -52,10 +52,10 @@ glabel pause_spirits_draw_contents /* 13FDFC 8024CABC 00761021 */ addu $v0, $v1, $s6 /* 13FE00 8024CAC0 AC650000 */ sw $a1, ($v1) /* 13FE04 8024CAC4 AE220000 */ sw $v0, ($s1) -/* 13FE08 8024CAC8 3C02DE00 */ lui $v0, %hi(D_DDFFF5A0) +/* 13FE08 8024CAC8 3C02DE00 */ lui $v0, 0xde00 /* 13FE0C 8024CACC AC620008 */ sw $v0, 8($v1) /* 13FE10 8024CAD0 3C028027 */ lui $v0, %hi(D_8026F5A0) -/* 13FE14 8024CAD4 2442F5A0 */ addiu $v0, $v0, %lo(D_DDFFF5A0) +/* 13FE14 8024CAD4 2442F5A0 */ addiu $v0, $v0, %lo(D_8026F5A0) /* 13FE18 8024CAD8 AC62000C */ sw $v0, 0xc($v1) .L8024CADC: /* 13FE1C 8024CADC 3C02FD48 */ lui $v0, 0xfd48 diff --git a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s index 600e3b40a7..d60a70dec4 100644 --- a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s +++ b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s @@ -45,10 +45,10 @@ glabel pause_map_draw_contents /* 140EFC 8024DBBC 00031940 */ sll $v1, $v1, 5 /* 140F00 8024DBC0 AFA30058 */ sw $v1, 0x58($sp) /* 140F04 8024DBC4 AE220000 */ sw $v0, ($s1) -/* 140F08 8024DBC8 3C02DE00 */ lui $v0, %hi(D_DDFFF118) +/* 140F08 8024DBC8 3C02DE00 */ lui $v0, 0xde00 /* 140F0C 8024DBCC AC820000 */ sw $v0, ($a0) /* 140F10 8024DBD0 3C028027 */ lui $v0, %hi(D_8026F118) -/* 140F14 8024DBD4 2442F118 */ addiu $v0, $v0, %lo(D_DDFFF118) +/* 140F14 8024DBD4 2442F118 */ addiu $v0, $v0, %lo(D_8026F118) /* 140F18 8024DBD8 AC820004 */ sw $v0, 4($a0) .L8024DBDC: /* 140F1C 8024DBDC 2A42006F */ slti $v0, $s2, 0x6f @@ -153,10 +153,10 @@ glabel pause_map_draw_contents /* 1410A0 8024DD60 8FAF00A8 */ lw $t7, 0xa8($sp) /* 1410A4 8024DD64 24A20008 */ addiu $v0, $a1, 8 /* 1410A8 8024DD68 AE220000 */ sw $v0, ($s1) -/* 1410AC 8024DD6C 3C02DE00 */ lui $v0, %hi(D_DDFFF1B8) +/* 1410AC 8024DD6C 3C02DE00 */ lui $v0, 0xde00 /* 1410B0 8024DD70 ACA20000 */ sw $v0, ($a1) /* 1410B4 8024DD74 3C028027 */ lui $v0, %hi(D_8026F1B8) -/* 1410B8 8024DD78 2442F1B8 */ addiu $v0, $v0, %lo(D_DDFFF1B8) +/* 1410B8 8024DD78 2442F1B8 */ addiu $v0, $v0, %lo(D_8026F1B8) /* 1410BC 8024DD7C ACA20004 */ sw $v0, 4($a1) /* 1410C0 8024DD80 25E30016 */ addiu $v1, $t7, 0x16 /* 1410C4 8024DD84 1C800002 */ bgtz $a0, .L8024DD90 @@ -473,10 +473,10 @@ glabel pause_map_draw_contents /* 141578 8024E238 3C118025 */ lui $s1, %hi(D_80250560) /* 14157C 8024E23C 02238821 */ addu $s1, $s1, $v1 /* 141580 8024E240 8E310560 */ lw $s1, %lo(D_80250560)($s1) -/* 141584 8024E244 3C02DE00 */ lui $v0, %hi(D_DDFFF2A0) +/* 141584 8024E244 3C02DE00 */ lui $v0, 0xde00 /* 141588 8024E248 ACE20000 */ sw $v0, ($a3) /* 14158C 8024E24C 3C028027 */ lui $v0, %hi(D_8026F2A0) -/* 141590 8024E250 2442F2A0 */ addiu $v0, $v0, %lo(D_DDFFF2A0) +/* 141590 8024E250 2442F2A0 */ addiu $v0, $v0, %lo(D_8026F2A0) /* 141594 8024E254 ACE20004 */ sw $v0, 4($a3) /* 141598 8024E258 0220282D */ daddu $a1, $s1, $zero /* 14159C 8024E25C 0220902D */ daddu $s2, $s1, $zero diff --git a/asm/nonmatchings/code_163400/func_802440BC.s b/asm/nonmatchings/code_163400/func_802440BC.s index ef25be9f71..3470f1eca7 100644 --- a/asm/nonmatchings/code_163400/func_802440BC.s +++ b/asm/nonmatchings/code_163400/func_802440BC.s @@ -264,10 +264,10 @@ glabel func_802440BC /* 164CF0 80244490 00531021 */ addu $v0, $v0, $s3 /* 164CF4 80244494 00621821 */ addu $v1, $v1, $v0 /* 164CF8 80244498 AD230004 */ sw $v1, 4($t1) -/* 164CFC 8024449C 3C0BDE00 */ lui $t3, %hi(D_DDFFB6F0) +/* 164CFC 8024449C 3C0BDE00 */ lui $t3, 0xde00 /* 164D00 802444A0 AD0B0000 */ sw $t3, ($t0) /* 164D04 802444A4 3C0B8025 */ lui $t3, %hi(D_8024B6F0) -/* 164D08 802444A8 256BB6F0 */ addiu $t3, $t3, %lo(D_DDFFB6F0) +/* 164D08 802444A8 256BB6F0 */ addiu $t3, $t3, %lo(D_8024B6F0) /* 164D0C 802444AC AD0B0004 */ sw $t3, 4($t0) /* 164D10 802444B0 AD160008 */ sw $s6, 8($t0) /* 164D14 802444B4 8FC20000 */ lw $v0, ($fp) @@ -359,11 +359,11 @@ glabel func_802440BC /* 164E64 80244604 004B1025 */ or $v0, $v0, $t3 /* 164E68 80244608 AD220004 */ sw $v0, 4($t1) /* 164E6C 8024460C 25220010 */ addiu $v0, $t1, 0x10 -/* 164E70 80244610 3C0BDE00 */ lui $t3, %hi(D_DDFFB708) +/* 164E70 80244610 3C0BDE00 */ lui $t3, 0xde00 /* 164E74 80244614 AE220000 */ sw $v0, ($s1) /* 164E78 80244618 AD2B0008 */ sw $t3, 8($t1) /* 164E7C 8024461C 3C0B8025 */ lui $t3, %hi(D_8024B708) -/* 164E80 80244620 256BB708 */ addiu $t3, $t3, %lo(D_DDFFB708) +/* 164E80 80244620 256BB708 */ addiu $t3, $t3, %lo(D_8024B708) /* 164E84 80244624 4405C000 */ mfc1 $a1, $f24 /* 164E88 80244628 4406B000 */ mfc1 $a2, $f22 /* 164E8C 8024462C 4407A000 */ mfc1 $a3, $f20 @@ -425,10 +425,10 @@ glabel func_802440BC /* 164F6C 8024470C 8FC90000 */ lw $t1, ($fp) /* 164F70 80244710 00431021 */ addu $v0, $v0, $v1 /* 164F74 80244714 AC820004 */ sw $v0, 4($a0) -/* 164F78 80244718 3C0BDE00 */ lui $t3, %hi(D_DDFFB6F0) +/* 164F78 80244718 3C0BDE00 */ lui $t3, 0xde00 /* 164F7C 8024471C AD0B0000 */ sw $t3, ($t0) /* 164F80 80244720 3C0B8025 */ lui $t3, %hi(D_8024B6F0) -/* 164F84 80244724 256BB6F0 */ addiu $t3, $t3, %lo(D_DDFFB6F0) +/* 164F84 80244724 256BB6F0 */ addiu $t3, $t3, %lo(D_8024B6F0) /* 164F88 80244728 AD0B0004 */ sw $t3, 4($t0) /* 164F8C 8024472C 240B0040 */ addiu $t3, $zero, 0x40 /* 164F90 80244730 0200202D */ daddu $a0, $s0, $zero @@ -512,11 +512,11 @@ glabel func_802440BC /* 1650C0 80244860 004B1025 */ or $v0, $v0, $t3 /* 1650C4 80244864 ACA20004 */ sw $v0, 4($a1) /* 1650C8 80244868 24A20010 */ addiu $v0, $a1, 0x10 -/* 1650CC 8024486C 3C0BDE00 */ lui $t3, %hi(D_DDFFB708) +/* 1650CC 8024486C 3C0BDE00 */ lui $t3, 0xde00 /* 1650D0 80244870 AE220000 */ sw $v0, ($s1) /* 1650D4 80244874 ACAB0008 */ sw $t3, 8($a1) /* 1650D8 80244878 3C0B8025 */ lui $t3, %hi(D_8024B708) -/* 1650DC 8024487C 256BB708 */ addiu $t3, $t3, %lo(D_DDFFB708) +/* 1650DC 8024487C 256BB708 */ addiu $t3, $t3, %lo(D_8024B708) /* 1650E0 80244880 24A20018 */ addiu $v0, $a1, 0x18 /* 1650E4 80244884 ACAB000C */ sw $t3, 0xc($a1) /* 1650E8 80244888 240B0040 */ addiu $t3, $zero, 0x40 diff --git a/asm/nonmatchings/code_169BE0/func_80249380.s b/asm/nonmatchings/code_169BE0/func_80249380.s index 5a56452675..d3bff62028 100644 --- a/asm/nonmatchings/code_169BE0/func_80249380.s +++ b/asm/nonmatchings/code_169BE0/func_80249380.s @@ -56,10 +56,10 @@ glabel func_80249380 /* 169CA8 80249448 1083000A */ beq $a0, $v1, .L80249474 /* 169CAC 8024944C 24820008 */ addiu $v0, $a0, 8 /* 169CB0 80249450 AD020000 */ sw $v0, ($t0) -/* 169CB4 80249454 3C02DE00 */ lui $v0, %hi(D_DDFFB760) +/* 169CB4 80249454 3C02DE00 */ lui $v0, 0xde00 /* 169CB8 80249458 AC820000 */ sw $v0, ($a0) /* 169CBC 8024945C 3C028025 */ lui $v0, %hi(D_8024B760) -/* 169CC0 80249460 2442B760 */ addiu $v0, $v0, %lo(D_DDFFB760) +/* 169CC0 80249460 2442B760 */ addiu $v0, $v0, %lo(D_8024B760) /* 169CC4 80249464 AC820004 */ sw $v0, 4($a0) /* 169CC8 80249468 2402FFFF */ addiu $v0, $zero, -1 /* 169CCC 8024946C 3C018025 */ lui $at, %hi(D_8024B7D4) diff --git a/asm/nonmatchings/code_16F740/func_80242FE0.s b/asm/nonmatchings/code_16F740/func_80242FE0.s index 8935339e8a..d2af5b48a3 100644 --- a/asm/nonmatchings/code_16F740/func_80242FE0.s +++ b/asm/nonmatchings/code_16F740/func_80242FE0.s @@ -492,9 +492,9 @@ glabel func_80242FE0 /* 171FD4 802436F4 82C3008A */ lb $v1, 0x8a($s6) /* 171FD8 802436F8 24020002 */ addiu $v0, $zero, 2 /* 171FDC 802436FC 14620011 */ bne $v1, $v0, .L80243744 -/* 171FE0 80243700 3C04F7FF */ lui $a0, %hi(D_F7FF4EBC) +/* 171FE0 80243700 3C04F7FF */ lui $a0, 0xf7ff /* 171FE4 80243704 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) -/* 171FE8 80243708 24844EBC */ addiu $a0, $a0, %lo(D_F7FF4EBC) +/* 171FE8 80243708 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 171FEC 8024370C 2405000A */ addiu $a1, $zero, 0xa /* 171FF0 80243710 0000302D */ daddu $a2, $zero, $zero /* 171FF4 80243714 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s index cc1774b5c7..1c3fe23e1c 100644 --- a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s +++ b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s @@ -332,12 +332,12 @@ glabel update_heroes_start_turn /* 170DC8 802424E8 82230210 */ lb $v1, 0x210($s1) /* 170DCC 802424EC 24020009 */ addiu $v0, $zero, 9 /* 170DD0 802424F0 1462000C */ bne $v1, $v0, .L80242524 -/* 170DD4 802424F4 3C03F7FF */ lui $v1, %hi(D_F7FEC070) +/* 170DD4 802424F4 3C03F7FF */ lui $v1, 0xf7ff /* 170DD8 802424F8 82220214 */ lb $v0, 0x214($s1) /* 170DDC 802424FC 14400009 */ bnez $v0, .L80242524 /* 170DE0 80242500 24040001 */ addiu $a0, $zero, 1 /* 170DE4 80242504 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 170DE8 80242508 2463C070 */ addiu $v1, $v1, %lo(D_F7FEC070) +/* 170DE8 80242508 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 170DEC 8024250C 8C620000 */ lw $v0, ($v1) /* 170DF0 80242510 2405000A */ addiu $a1, $zero, 0xa /* 170DF4 80242514 34420020 */ ori $v0, $v0, 0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_8023F088.s b/asm/nonmatchings/code_16c8e0/func_8023F088.s index ef789faff8..22bce7f464 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023F088.s +++ b/asm/nonmatchings/code_16c8e0/func_8023F088.s @@ -260,10 +260,10 @@ glabel func_8023F088 /* 16DD50 8023F470 3484C000 */ ori $a0, $a0, 0xc000 /* 16DD54 8023F474 25420048 */ addiu $v0, $t2, 0x48 /* 16DD58 8023F478 AD620000 */ sw $v0, ($t3) -/* 16DD5C 8023F47C 3C02FD10 */ lui $v0, %hi(D_FD0FF038) +/* 16DD5C 8023F47C 3C02FD10 */ lui $v0, 0xfd10 /* 16DD60 8023F480 AD420040 */ sw $v0, 0x40($t2) /* 16DD64 8023F484 3C02802A */ lui $v0, %hi(D_8029F038) -/* 16DD68 8023F488 2442F038 */ addiu $v0, $v0, %lo(D_FD0FF038) +/* 16DD68 8023F488 2442F038 */ addiu $v0, $v0, %lo(D_8029F038) /* 16DD6C 8023F48C AD420044 */ sw $v0, 0x44($t2) /* 16DD70 8023F490 25420050 */ addiu $v0, $t2, 0x50 /* 16DD74 8023F494 AD620000 */ sw $v0, ($t3) diff --git a/asm/nonmatchings/code_16c8e0/func_802409F4.s b/asm/nonmatchings/code_16c8e0/func_802409F4.s index cd05f128dd..3a18358545 100644 --- a/asm/nonmatchings/code_16c8e0/func_802409F4.s +++ b/asm/nonmatchings/code_16c8e0/func_802409F4.s @@ -37,12 +37,12 @@ glabel func_802409F4 /* 16F34C 80240A6C C5000028 */ lwc1 $f0, 0x28($t0) /* 16F350 80240A70 C502002C */ lwc1 $f2, 0x2c($t0) /* 16F354 80240A74 C5040030 */ lwc1 $f4, 0x30($t0) -/* 16F358 80240A78 3C01C47A */ lui $at, %hi(D_C479EFB0) +/* 16F358 80240A78 3C01C47A */ lui $at, 0xc47a /* 16F35C 80240A7C 44813000 */ mtc1 $at, $f6 /* 16F360 80240A80 AD000028 */ sw $zero, 0x28($t0) /* 16F364 80240A84 AD000030 */ sw $zero, 0x30($t0) /* 16F368 80240A88 3C01802A */ lui $at, %hi(D_8029EFB0) -/* 16F36C 80240A8C E420EFB0 */ swc1 $f0, %lo(D_C479EFB0)($at) +/* 16F36C 80240A8C E420EFB0 */ swc1 $f0, %lo(D_8029EFB0)($at) /* 16F370 80240A90 3C01802A */ lui $at, %hi(D_8029EFB4) /* 16F374 80240A94 E422EFB4 */ swc1 $f2, %lo(D_8029EFB4)($at) /* 16F378 80240A98 3C01802A */ lui $at, %hi(D_8029EFB8) diff --git a/asm/nonmatchings/code_1776B0/use_cam_preset.s b/asm/nonmatchings/code_1776B0/use_cam_preset.s index a00adf398f..e9b5f3a95b 100644 --- a/asm/nonmatchings/code_1776B0/use_cam_preset.s +++ b/asm/nonmatchings/code_1776B0/use_cam_preset.s @@ -266,12 +266,12 @@ glabel use_cam_preset /* 17BC24 8024D344 00000000 */ nop /* 17BC28 8024D348 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BC2C 8024D34C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) -/* 17BC30 8024D350 3C01C2A0 */ lui $at, %hi(D_C29FF280) +/* 17BC30 8024D350 3C01C2A0 */ lui $at, 0xc2a0 /* 17BC34 8024D354 44816000 */ mtc1 $at, $f12 /* 17BC38 8024D358 44800000 */ mtc1 $zero, $f0 /* 17BC3C 8024D35C 2402010A */ addiu $v0, $zero, 0x10a /* 17BC40 8024D360 3C01802A */ lui $at, %hi(D_8029F280) -/* 17BC44 8024D364 A422F280 */ sh $v0, %lo(D_C29FF280)($at) +/* 17BC44 8024D364 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17BC48 8024D368 44060000 */ mfc1 $a2, $f0 /* 17BC4C 8024D36C 24020008 */ addiu $v0, $zero, 8 /* 17BC50 8024D370 3C01802A */ lui $at, %hi(D_8029F284) @@ -782,12 +782,12 @@ glabel use_cam_preset /* 17C424 8024DB44 00000000 */ nop /* 17C428 8024DB48 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C42C 8024DB4C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) -/* 17C430 8024DB50 3C01C28C */ lui $at, %hi(D_C28BF280) +/* 17C430 8024DB50 3C01C28C */ lui $at, 0xc28c /* 17C434 8024DB54 44816000 */ mtc1 $at, $f12 /* 17C438 8024DB58 44800000 */ mtc1 $zero, $f0 /* 17C43C 8024DB5C 24020186 */ addiu $v0, $zero, 0x186 /* 17C440 8024DB60 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C444 8024DB64 A422F280 */ sh $v0, %lo(D_C28BF280)($at) +/* 17C444 8024DB64 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17C448 8024DB68 44060000 */ mfc1 $a2, $f0 /* 17C44C 8024DB6C 24020008 */ addiu $v0, $zero, 8 /* 17C450 8024DB70 3C01802A */ lui $at, %hi(D_8029F284) @@ -823,12 +823,12 @@ glabel use_cam_preset /* 17C4C8 8024DBE8 24020028 */ addiu $v0, $zero, 0x28 /* 17C4CC 8024DBEC 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C4D0 8024DBF0 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) -/* 17C4D4 8024DBF4 3C01C248 */ lui $at, %hi(D_C247F280) +/* 17C4D4 8024DBF4 3C01C248 */ lui $at, 0xc248 /* 17C4D8 8024DBF8 44816000 */ mtc1 $at, $f12 /* 17C4DC 8024DBFC 44800000 */ mtc1 $zero, $f0 /* 17C4E0 8024DC00 2402012C */ addiu $v0, $zero, 0x12c /* 17C4E4 8024DC04 3C01802A */ lui $at, %hi(D_8029F280) -/* 17C4E8 8024DC08 A422F280 */ sh $v0, %lo(D_C247F280)($at) +/* 17C4E8 8024DC08 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17C4EC 8024DC0C 44060000 */ mfc1 $a2, $f0 /* 17C4F0 8024DC10 24020008 */ addiu $v0, $zero, 8 /* 17C4F4 8024DC14 3C01802A */ lui $at, %hi(D_8029F284) diff --git a/asm/nonmatchings/code_190B20/func_8026787C.s b/asm/nonmatchings/code_190B20/func_8026787C.s index 7b8f29e2d4..e8185a6e04 100644 --- a/asm/nonmatchings/code_190B20/func_8026787C.s +++ b/asm/nonmatchings/code_190B20/func_8026787C.s @@ -22,10 +22,10 @@ glabel func_8026787C /* 1961A0 802678C0 24E20008 */ addiu $v0, $a3, 8 /* 1961A4 802678C4 AC600004 */ sw $zero, 4($v1) /* 1961A8 802678C8 AD020000 */ sw $v0, ($t0) -/* 1961AC 802678CC 3C02DE00 */ lui $v0, %hi(D_DE003970) +/* 1961AC 802678CC 3C02DE00 */ lui $v0, 0xde00 /* 1961B0 802678D0 ACE20000 */ sw $v0, ($a3) /* 1961B4 802678D4 3C028029 */ lui $v0, %hi(D_80293970) -/* 1961B8 802678D8 24423970 */ addiu $v0, $v0, %lo(D_DE003970) +/* 1961B8 802678D8 24423970 */ addiu $v0, $v0, %lo(D_80293970) /* 1961BC 802678DC 316300FF */ andi $v1, $t3, 0xff /* 1961C0 802678E0 ACE20004 */ sw $v0, 4($a3) /* 1961C4 802678E4 240200FF */ addiu $v0, $zero, 0xff diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s b/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s index dd89b4351d..9487cda58b 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s @@ -6,7 +6,7 @@ glabel func_80053C58 /* 2F05C 80053C5C 8C63A5C0 */ lw $v1, %lo(D_8009A5C0)($v1) /* 2F060 80053C60 24020001 */ addiu $v0, $zero, 1 /* 2F064 80053C64 1082000B */ beq $a0, $v0, .L80053C94 -/* 2F068 80053C68 00000000 */ nop +/* 2F068 80053C68 00000000 */ nop /* 2F06C 80053C6C 10800003 */ beqz $a0, .L80053C7C /* 2F070 80053C70 24020002 */ addiu $v0, $zero, 2 /* 2F074 80053C74 5482000D */ bnel $a0, $v0, .L80053CAC diff --git a/asm/nonmatchings/code_333EC0/func_E00205D0.s b/asm/nonmatchings/code_333EC0/func_E00205D0.s index bc117a8f12..1caf40246d 100644 --- a/asm/nonmatchings/code_333EC0/func_E00205D0.s +++ b/asm/nonmatchings/code_333EC0/func_E00205D0.s @@ -136,10 +136,10 @@ glabel func_E00205D0 /* 33469C E00207DC 24820008 */ addiu $v0, $a0, 8 /* 3346A0 E00207E0 ACA30004 */ sw $v1, 4($a1) /* 3346A4 E00207E4 AEC20000 */ sw $v0, ($s6) -/* 3346A8 E00207E8 3C02DE00 */ lui $v0, %hi(D_DE002170) +/* 3346A8 E00207E8 3C02DE00 */ lui $v0, 0xde00 /* 3346AC E00207EC AC820000 */ sw $v0, ($a0) /* 3346B0 E00207F0 3C020900 */ lui $v0, 0x900 -/* 3346B4 E00207F4 24422170 */ addiu $v0, $v0, %lo(D_DE002170) +/* 3346B4 E00207F4 24422170 */ addiu $v0, $v0, 0x2170 /* 3346B8 E00207F8 AC820004 */ sw $v0, 4($a0) /* 3346BC E00207FC 24820010 */ addiu $v0, $a0, 0x10 /* 3346C0 E0020800 AEC20000 */ sw $v0, ($s6) @@ -248,10 +248,10 @@ glabel func_E00205D0 /* 334854 E0020994 AC820004 */ sw $v0, 4($a0) /* 334858 E0020998 24820010 */ addiu $v0, $a0, 0x10 /* 33485C E002099C AE420000 */ sw $v0, ($s2) -/* 334860 E00209A0 3C02DE00 */ lui $v0, %hi(D_DE002578) +/* 334860 E00209A0 3C02DE00 */ lui $v0, 0xde00 /* 334864 E00209A4 AC820008 */ sw $v0, 8($a0) /* 334868 E00209A8 3C020900 */ lui $v0, 0x900 -/* 33486C E00209AC 24422578 */ addiu $v0, $v0, %lo(D_DE002578) +/* 33486C E00209AC 24422578 */ addiu $v0, $v0, 0x2578 /* 334870 E00209B0 AC82000C */ sw $v0, 0xc($a0) /* 334874 E00209B4 24820018 */ addiu $v0, $a0, 0x18 /* 334878 E00209B8 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/code_337240/func_E0022998.s b/asm/nonmatchings/code_337240/func_E0022998.s index 997c82647c..e9d7673d75 100644 --- a/asm/nonmatchings/code_337240/func_E0022998.s +++ b/asm/nonmatchings/code_337240/func_E0022998.s @@ -35,10 +35,10 @@ glabel func_E0022998 /* 337C50 E0022A10 24620010 */ addiu $v0, $v1, 0x10 /* 337C54 E0022A14 AE620000 */ sw $v0, ($s3) /* 337C58 E0022A18 8CA5001C */ lw $a1, 0x1c($a1) -/* 337C5C E0022A1C 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 337C5C E0022A1C 3C02DE00 */ lui $v0, 0xde00 /* 337C60 E0022A20 AC620008 */ sw $v0, 8($v1) /* 337C64 E0022A24 3C020900 */ lui $v0, 0x900 -/* 337C68 E0022A28 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 337C68 E0022A28 24420F20 */ addiu $v0, $v0, 0xf20 /* 337C6C E0022A2C AC62000C */ sw $v0, 0xc($v1) /* 337C70 E0022A30 3C028000 */ lui $v0, 0x8000 /* 337C74 E0022A34 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_339250/func_E0024454.s b/asm/nonmatchings/code_339250/func_E0024454.s index 5a8a084000..3311c6be7a 100644 --- a/asm/nonmatchings/code_339250/func_E0024454.s +++ b/asm/nonmatchings/code_339250/func_E0024454.s @@ -42,10 +42,10 @@ glabel func_E0024454 /* 339738 E00244E8 24660018 */ addiu $a2, $v1, 0x18 /* 33973C E00244EC ACA60000 */ sw $a2, ($a1) /* 339740 E00244F0 8C44001C */ lw $a0, 0x1c($v0) -/* 339744 E00244F4 3C02DE00 */ lui $v0, %hi(D_DE001080) +/* 339744 E00244F4 3C02DE00 */ lui $v0, 0xde00 /* 339748 E00244F8 AC620008 */ sw $v0, 8($v1) /* 33974C E00244FC 3C020900 */ lui $v0, 0x900 -/* 339750 E0024500 24421080 */ addiu $v0, $v0, %lo(D_DE001080) +/* 339750 E0024500 24421080 */ addiu $v0, $v0, 0x1080 /* 339754 E0024504 AC62000C */ sw $v0, 0xc($v1) /* 339758 E0024508 3C028000 */ lui $v0, 0x8000 /* 33975C E002450C 00822021 */ addu $a0, $a0, $v0 diff --git a/asm/nonmatchings/code_33CDF0/func_E002852C.s b/asm/nonmatchings/code_33CDF0/func_E002852C.s index fa504e02d9..d8b0738bc2 100644 --- a/asm/nonmatchings/code_33CDF0/func_E002852C.s +++ b/asm/nonmatchings/code_33CDF0/func_E002852C.s @@ -36,10 +36,10 @@ glabel func_E002852C /* 33D398 E00285A8 3C038000 */ lui $v1, 0x8000 /* 33D39C E00285AC 00431021 */ addu $v0, $v0, $v1 /* 33D3A0 E00285B0 AC820004 */ sw $v0, 4($a0) -/* 33D3A4 E00285B4 3C02DE00 */ lui $v0, %hi(D_DE001180) +/* 33D3A4 E00285B4 3C02DE00 */ lui $v0, 0xde00 /* 33D3A8 E00285B8 ACA20000 */ sw $v0, ($a1) /* 33D3AC E00285BC 3C020900 */ lui $v0, 0x900 -/* 33D3B0 E00285C0 24421180 */ addiu $v0, $v0, %lo(D_DE001180) +/* 33D3B0 E00285C0 24421180 */ addiu $v0, $v0, 0x1180 /* 33D3B4 E00285C4 ACA20004 */ sw $v0, 4($a1) /* 33D3B8 E00285C8 3C02FA00 */ lui $v0, 0xfa00 /* 33D3BC E00285CC ACA20008 */ sw $v0, 8($a1) @@ -148,10 +148,10 @@ glabel func_E002852C /* 33D554 E0028764 24820008 */ addiu $v0, $a0, 8 /* 33D558 E0028768 ACA30004 */ sw $v1, 4($a1) /* 33D55C E002876C AE620000 */ sw $v0, ($s3) -/* 33D560 E0028770 3C02DE00 */ lui $v0, %hi(D_DE001230) +/* 33D560 E0028770 3C02DE00 */ lui $v0, 0xde00 /* 33D564 E0028774 AC820000 */ sw $v0, ($a0) /* 33D568 E0028778 3C020900 */ lui $v0, 0x900 -/* 33D56C E002877C 24421230 */ addiu $v0, $v0, %lo(D_DE001230) +/* 33D56C E002877C 24421230 */ addiu $v0, $v0, 0x1230 /* 33D570 E0028780 AC820004 */ sw $v0, 4($a0) /* 33D574 E0028784 24020040 */ addiu $v0, $zero, 0x40 /* 33D578 E0028788 AC860008 */ sw $a2, 8($a0) diff --git a/asm/nonmatchings/code_3419E0/func_E002E368.s b/asm/nonmatchings/code_3419E0/func_E002E368.s index 131123a011..6ddc52401c 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E368.s +++ b/asm/nonmatchings/code_3419E0/func_E002E368.s @@ -47,10 +47,10 @@ glabel func_E002E368 /* 341DEC E002E40C 24620008 */ addiu $v0, $v1, 8 /* 341DF0 E002E410 AE620000 */ sw $v0, ($s3) /* 341DF4 E002E414 8CA5001C */ lw $a1, 0x1c($a1) -/* 341DF8 E002E418 3C02DE00 */ lui $v0, %hi(D_DE002950) +/* 341DF8 E002E418 3C02DE00 */ lui $v0, 0xde00 /* 341DFC E002E41C AC620008 */ sw $v0, 8($v1) /* 341E00 E002E420 3C020900 */ lui $v0, 0x900 -/* 341E04 E002E424 24422950 */ addiu $v0, $v0, %lo(D_DE002950) +/* 341E04 E002E424 24422950 */ addiu $v0, $v0, 0x2950 /* 341E08 E002E428 AC62000C */ sw $v0, 0xc($v1) /* 341E0C E002E42C 3C028000 */ lui $v0, 0x8000 /* 341E10 E002E430 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_342140/func_E0030A68.s b/asm/nonmatchings/code_342140/func_E0030A68.s index a27d418ab7..e3c9c91550 100644 --- a/asm/nonmatchings/code_342140/func_E0030A68.s +++ b/asm/nonmatchings/code_342140/func_E0030A68.s @@ -33,10 +33,10 @@ glabel func_E0030A68 /* 342C18 E0030AD8 8D420010 */ lw $v0, 0x10($t2) /* 342C1C E0030ADC 34C68E39 */ ori $a2, $a2, 0x8e39 /* 342C20 E0030AE0 8C43001C */ lw $v1, 0x1c($v0) -/* 342C24 E0030AE4 3C02DE00 */ lui $v0, %hi(D_DE0004C0) +/* 342C24 E0030AE4 3C02DE00 */ lui $v0, 0xde00 /* 342C28 E0030AE8 AC820008 */ sw $v0, 8($a0) /* 342C2C E0030AEC 3C020900 */ lui $v0, 0x900 -/* 342C30 E0030AF0 244204C0 */ addiu $v0, $v0, %lo(D_DE0004C0) +/* 342C30 E0030AF0 244204C0 */ addiu $v0, $v0, 0x4c0 /* 342C34 E0030AF4 AC82000C */ sw $v0, 0xc($a0) /* 342C38 E0030AF8 3C028000 */ lui $v0, 0x8000 /* 342C3C E0030AFC 00621821 */ addu $v1, $v1, $v0 @@ -229,10 +229,10 @@ glabel func_E0030A68 /* 342F24 E0030DE4 ACA20004 */ sw $v0, 4($a1) /* 342F28 E0030DE8 24820008 */ addiu $v0, $a0, 8 /* 342F2C E0030DEC AE220000 */ sw $v0, ($s1) -/* 342F30 E0030DF0 3C02DE00 */ lui $v0, %hi(D_DE0005E0) +/* 342F30 E0030DF0 3C02DE00 */ lui $v0, 0xde00 /* 342F34 E0030DF4 AC820000 */ sw $v0, ($a0) /* 342F38 E0030DF8 3C020900 */ lui $v0, 0x900 -/* 342F3C E0030DFC 244205E0 */ addiu $v0, $v0, %lo(D_DE0005E0) +/* 342F3C E0030DFC 244205E0 */ addiu $v0, $v0, 0x5e0 /* 342F40 E0030E00 AC820004 */ sw $v0, 4($a0) /* 342F44 E0030E04 24820010 */ addiu $v0, $a0, 0x10 /* 342F48 E0030E08 AE220000 */ sw $v0, ($s1) diff --git a/asm/nonmatchings/code_343680/func_E003245C.s b/asm/nonmatchings/code_343680/func_E003245C.s index dc40ab54ff..b2af58b6c2 100644 --- a/asm/nonmatchings/code_343680/func_E003245C.s +++ b/asm/nonmatchings/code_343680/func_E003245C.s @@ -160,11 +160,11 @@ glabel func_E003245C /* 343D44 E00326C4 2631003C */ addiu $s1, $s1, 0x3c /* 343D48 E00326C8 27A40018 */ addiu $a0, $sp, 0x18 /* 343D4C E00326CC 8E430000 */ lw $v1, ($s2) -/* 343D50 E00326D0 3C02DE00 */ lui $v0, %hi(D_DE000910) +/* 343D50 E00326D0 3C02DE00 */ lui $v0, 0xde00 /* 343D54 E00326D4 0060282D */ daddu $a1, $v1, $zero /* 343D58 E00326D8 ACA20000 */ sw $v0, ($a1) /* 343D5C E00326DC 3C020900 */ lui $v0, 0x900 -/* 343D60 E00326E0 24420910 */ addiu $v0, $v0, %lo(D_DE000910) +/* 343D60 E00326E0 24420910 */ addiu $v0, $v0, 0x910 /* 343D64 E00326E4 ACA20004 */ sw $v0, 4($a1) /* 343D68 E00326E8 8E250020 */ lw $a1, 0x20($s1) /* 343D6C E00326EC 24630008 */ addiu $v1, $v1, 8 @@ -227,12 +227,12 @@ glabel func_E003245C /* 343E40 E00327C0 ACC50000 */ sw $a1, ($a2) /* 343E44 E00327C4 ACE20000 */ sw $v0, ($a3) /* 343E48 E00327C8 308200FF */ andi $v0, $a0, 0xff -/* 343E4C E00327CC 3C04FFFF */ lui $a0, %hi(D_FFFF41F0) +/* 343E4C E00327CC 3C04FFFF */ lui $a0, 0xffff /* 343E50 E00327D0 00441025 */ or $v0, $v0, $a0 /* 343E54 E00327D4 00621825 */ or $v1, $v1, $v0 /* 343E58 E00327D8 24A20008 */ addiu $v0, $a1, 8 /* 343E5C E00327DC 3C048007 */ lui $a0, %hi(D_800741F0) -/* 343E60 E00327E0 248441F0 */ addiu $a0, $a0, %lo(D_FFFF41F0) +/* 343E60 E00327E0 248441F0 */ addiu $a0, $a0, %lo(D_800741F0) /* 343E64 E00327E4 ACE30004 */ sw $v1, 4($a3) /* 343E68 E00327E8 ACC20000 */ sw $v0, ($a2) /* 343E6C E00327EC 94820000 */ lhu $v0, ($a0) diff --git a/asm/nonmatchings/code_3454E0/func_E0036224.s b/asm/nonmatchings/code_3454E0/func_E0036224.s index 49b7198da5..6079167f06 100644 --- a/asm/nonmatchings/code_3454E0/func_E0036224.s +++ b/asm/nonmatchings/code_3454E0/func_E0036224.s @@ -41,10 +41,10 @@ glabel func_E0036224 /* 345794 E00362B4 24A20010 */ addiu $v0, $a1, 0x10 /* 345798 E00362B8 ACC20000 */ sw $v0, ($a2) /* 34579C E00362BC 8C63001C */ lw $v1, 0x1c($v1) -/* 3457A0 E00362C0 3C02DE00 */ lui $v0, %hi(D_DDFF8100) +/* 3457A0 E00362C0 3C02DE00 */ lui $v0, 0xde00 /* 3457A4 E00362C4 ACA20008 */ sw $v0, 8($a1) /* 3457A8 E00362C8 3C020901 */ lui $v0, 0x901 -/* 3457AC E00362CC 24428100 */ addiu $v0, $v0, %lo(D_DDFF8100) +/* 3457AC E00362CC 24428100 */ addiu $v0, $v0, -0x7f00 /* 3457B0 E00362D0 ACA2000C */ sw $v0, 0xc($a1) /* 3457B4 E00362D4 3C028000 */ lui $v0, 0x8000 /* 3457B8 E00362D8 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_354F60/func_E004491C.s b/asm/nonmatchings/code_354F60/func_E004491C.s index 4d897f22b9..40f7115ea5 100644 --- a/asm/nonmatchings/code_354F60/func_E004491C.s +++ b/asm/nonmatchings/code_354F60/func_E004491C.s @@ -39,10 +39,10 @@ glabel func_E004491C /* 355904 E00449A4 24620010 */ addiu $v0, $v1, 0x10 /* 355908 E00449A8 ACA20000 */ sw $v0, ($a1) /* 35590C E00449AC 8CC5001C */ lw $a1, 0x1c($a2) -/* 355910 E00449B0 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 355910 E00449B0 3C02DE00 */ lui $v0, 0xde00 /* 355914 E00449B4 AC620008 */ sw $v0, 8($v1) /* 355918 E00449B8 3C020900 */ lui $v0, 0x900 -/* 35591C E00449BC 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 35591C E00449BC 24420F20 */ addiu $v0, $v0, 0xf20 /* 355920 E00449C0 AC62000C */ sw $v0, 0xc($v1) /* 355924 E00449C4 3C028000 */ lui $v0, 0x8000 /* 355928 E00449C8 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_3584C0/func_E004A78C.s b/asm/nonmatchings/code_3584C0/func_E004A78C.s index 6eed4bbe45..100a8fc76d 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A78C.s +++ b/asm/nonmatchings/code_3584C0/func_E004A78C.s @@ -278,10 +278,10 @@ glabel func_E004A78C /* 359088 E004ABC8 005E1025 */ or $v0, $v0, $fp /* 35908C E004ABCC AC620000 */ sw $v0, ($v1) /* 359090 E004ABD0 C6000000 */ lwc1 $f0, ($s0) -/* 359094 E004ABD4 3C02DA38 */ lui $v0, %hi(D_DA37A674) +/* 359094 E004ABD4 3C02DA38 */ lui $v0, 0xda38 /* 359098 E004ABD8 AC620008 */ sw $v0, 8($v1) /* 35909C E004ABDC 3C02800A */ lui $v0, %hi(D_8009A674) -/* 3590A0 E004ABE0 8C42A674 */ lw $v0, %lo(D_DA37A674)($v0) +/* 3590A0 E004ABE0 8C42A674 */ lw $v0, %lo(D_8009A674)($v0) /* 3590A4 E004ABE4 3C0F0900 */ lui $t7, 0x900 /* 3590A8 E004ABE8 25EF0940 */ addiu $t7, $t7, 0x940 /* 3590AC E004ABEC AC6F0014 */ sw $t7, 0x14($v1) diff --git a/asm/nonmatchings/code_3602C0/func_E005A3F4.s b/asm/nonmatchings/code_3602C0/func_E005A3F4.s index 141887e2da..059a227346 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A3F4.s +++ b/asm/nonmatchings/code_3602C0/func_E005A3F4.s @@ -39,10 +39,10 @@ glabel func_E005A3F4 /* 36073C E005A47C 24620010 */ addiu $v0, $v1, 0x10 /* 360740 E005A480 AE420000 */ sw $v0, ($s2) /* 360744 E005A484 8CA5001C */ lw $a1, 0x1c($a1) -/* 360748 E005A488 3C02DE00 */ lui $v0, %hi(D_DE000440) +/* 360748 E005A488 3C02DE00 */ lui $v0, 0xde00 /* 36074C E005A48C AC620008 */ sw $v0, 8($v1) /* 360750 E005A490 3C020900 */ lui $v0, 0x900 -/* 360754 E005A494 24420440 */ addiu $v0, $v0, %lo(D_DE000440) +/* 360754 E005A494 24420440 */ addiu $v0, $v0, 0x440 /* 360758 E005A498 AC62000C */ sw $v0, 0xc($v1) /* 36075C E005A49C 3C028000 */ lui $v0, 0x8000 /* 360760 E005A4A0 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s index 00afd55539..3462cc739e 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s @@ -64,12 +64,12 @@ glabel test_ray_entities /* 38924 8005D524 4480A000 */ mtc1 $zero, $f20 /* 38928 8005D528 3C013F80 */ lui $at, 0x3f80 /* 3892C 8005D52C 4481E000 */ mtc1 $at, $f28 -/* 38930 8005D530 3C01BF80 */ lui $at, %hi(D_BF804254) +/* 38930 8005D530 3C01BF80 */ lui $at, 0xbf80 /* 38934 8005D534 44810000 */ mtc1 $at, $f0 /* 38938 8005D538 24020001 */ addiu $v0, $zero, 1 /* 3893C 8005D53C A642003C */ sh $v0, 0x3c($s2) /* 38940 8005D540 3C01800A */ lui $at, %hi(D_800A4254) -/* 38944 8005D544 E4204254 */ swc1 $f0, %lo(D_BF804254)($at) +/* 38944 8005D544 E4204254 */ swc1 $f0, %lo(D_800A4254)($at) .L8005D548: /* 38948 8005D548 0C04417A */ jal get_entity_by_index /* 3894C 8005D54C 03C0202D */ daddu $a0, $fp, $zero diff --git a/asm/nonmatchings/code_366030/func_E0066770.s b/asm/nonmatchings/code_366030/func_E0066770.s index 4ff9b296a7..5ff4129c96 100644 --- a/asm/nonmatchings/code_366030/func_E0066770.s +++ b/asm/nonmatchings/code_366030/func_E0066770.s @@ -43,10 +43,10 @@ glabel func_E0066770 /* 366838 E0066808 24A20008 */ addiu $v0, $a1, 8 /* 36683C E006680C AEC20000 */ sw $v0, ($s6) /* 366840 E0066810 8C62001C */ lw $v0, 0x1c($v1) -/* 366844 E0066814 3C038000 */ lui $v1, %hi(D_80001D80) +/* 366844 E0066814 3C038000 */ lui $v1, 0x8000 /* 366848 E0066818 00431021 */ addu $v0, $v0, $v1 /* 36684C E006681C 3C03800B */ lui $v1, %hi(gCameras) -/* 366850 E0066820 24631D80 */ addiu $v1, $v1, %lo(D_80001D80) +/* 366850 E0066820 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 366854 E0066824 ACA20004 */ sw $v0, 4($a1) /* 366858 E0066828 8E850010 */ lw $a1, 0x10($s4) /* 36685C E006682C 8E860014 */ lw $a2, 0x14($s4) diff --git a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s index bd54d11594..ee71f96b46 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s @@ -42,10 +42,10 @@ glabel func_E006C5E8 /* 36E84C E006C67C 24C20008 */ addiu $v0, $a2, 8 /* 36E850 E006C680 AE820000 */ sw $v0, ($s4) /* 36E854 E006C684 8C62001C */ lw $v0, 0x1c($v1) -/* 36E858 E006C688 3C038000 */ lui $v1, %hi(D_80007410) +/* 36E858 E006C688 3C038000 */ lui $v1, 0x8000 /* 36E85C E006C68C 00431021 */ addu $v0, $v0, $v1 /* 36E860 E006C690 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 36E864 E006C694 8C637410 */ lw $v1, %lo(D_80007410)($v1) +/* 36E864 E006C694 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 36E868 E006C698 3C04800B */ lui $a0, %hi(gCameras) /* 36E86C E006C69C 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* 36E870 E006C6A0 ACC20004 */ sw $v0, 4($a2) diff --git a/asm/nonmatchings/code_3740B0/func_E0070740.s b/asm/nonmatchings/code_3740B0/func_E0070740.s index 9c0d0af8fb..6babf74bab 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070740.s +++ b/asm/nonmatchings/code_3740B0/func_E0070740.s @@ -104,11 +104,11 @@ glabel func_E0070740 /* 37497C E00708CC 92450047 */ lbu $a1, 0x47($s2) /* 374980 E00708D0 9246004B */ lbu $a2, 0x4b($s2) /* 374984 E00708D4 9248005F */ lbu $t0, 0x5f($s2) -/* 374988 E00708D8 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 374988 E00708D8 3C02DE00 */ lui $v0, 0xde00 /* 37498C E00708DC AEA70000 */ sw $a3, ($s5) /* 374990 E00708E0 AC820008 */ sw $v0, 8($a0) /* 374994 E00708E4 3C020900 */ lui $v0, 0x900 -/* 374998 E00708E8 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 374998 E00708E8 24420F20 */ addiu $v0, $v0, 0xf20 /* 37499C E00708EC AC82000C */ sw $v0, 0xc($a0) /* 3749A0 E00708F0 24820018 */ addiu $v0, $a0, 0x18 /* 3749A4 E00708F4 AEA20000 */ sw $v0, ($s5) diff --git a/asm/nonmatchings/code_376460/func_E00745E0.s b/asm/nonmatchings/code_376460/func_E00745E0.s index 9be0ad4524..c624d80199 100644 --- a/asm/nonmatchings/code_376460/func_E00745E0.s +++ b/asm/nonmatchings/code_376460/func_E00745E0.s @@ -104,11 +104,11 @@ glabel func_E00745E0 /* 376BCC E007476C 92450047 */ lbu $a1, 0x47($s2) /* 376BD0 E0074770 9246004B */ lbu $a2, 0x4b($s2) /* 376BD4 E0074774 9248005F */ lbu $t0, 0x5f($s2) -/* 376BD8 E0074778 3C02DE00 */ lui $v0, %hi(D_DE000F20) +/* 376BD8 E0074778 3C02DE00 */ lui $v0, 0xde00 /* 376BDC E007477C AEA70000 */ sw $a3, ($s5) /* 376BE0 E0074780 AC820008 */ sw $v0, 8($a0) /* 376BE4 E0074784 3C020900 */ lui $v0, 0x900 -/* 376BE8 E0074788 24420F20 */ addiu $v0, $v0, %lo(D_DE000F20) +/* 376BE8 E0074788 24420F20 */ addiu $v0, $v0, 0xf20 /* 376BEC E007478C AC82000C */ sw $v0, 0xc($a0) /* 376BF0 E0074790 24820018 */ addiu $v0, $a0, 0x18 /* 376BF4 E0074794 AEA20000 */ sw $v0, ($s5) diff --git a/asm/nonmatchings/code_37A3F0/func_E007827C.s b/asm/nonmatchings/code_37A3F0/func_E007827C.s index de02fe01e5..af33e54b57 100644 --- a/asm/nonmatchings/code_37A3F0/func_E007827C.s +++ b/asm/nonmatchings/code_37A3F0/func_E007827C.s @@ -35,10 +35,10 @@ glabel func_E007827C /* 37A6E0 E00782F0 8CC20010 */ lw $v0, 0x10($a2) /* 37A6E4 E00782F4 AEA40000 */ sw $a0, ($s5) /* 37A6E8 E00782F8 8C42001C */ lw $v0, 0x1c($v0) -/* 37A6EC E00782FC 3C038000 */ lui $v1, %hi(D_7FFF8918) +/* 37A6EC E00782FC 3C038000 */ lui $v1, 0x8000 /* 37A6F0 E0078300 00431021 */ addu $v0, $v0, $v1 /* 37A6F4 E0078304 3C03E008 */ lui $v1, %hi(D_E0078918) -/* 37A6F8 E0078308 24638918 */ addiu $v1, $v1, %lo(D_7FFF8918) +/* 37A6F8 E0078308 24638918 */ addiu $v1, $v1, %lo(D_E0078918) /* 37A6FC E007830C AC820004 */ sw $v0, 4($a0) /* 37A700 E0078310 00121040 */ sll $v0, $s2, 1 /* 37A704 E0078314 00521021 */ addu $v0, $v0, $s2 diff --git a/asm/nonmatchings/code_37F720/func_E007E54C.s b/asm/nonmatchings/code_37F720/func_E007E54C.s index 023feaa1db..4d58adc057 100644 --- a/asm/nonmatchings/code_37F720/func_E007E54C.s +++ b/asm/nonmatchings/code_37F720/func_E007E54C.s @@ -150,11 +150,11 @@ glabel func_E007E54C /* 37FEB0 E007E790 8EE30000 */ lw $v1, ($s7) /* 37FEB4 E007E794 00541021 */ addu $v0, $v0, $s4 /* 37FEB8 E007E798 00621821 */ addu $v1, $v1, $v0 -/* 37FEBC E007E79C 3C02DE00 */ lui $v0, %hi(D_DE000DE0) +/* 37FEBC E007E79C 3C02DE00 */ lui $v0, 0xde00 /* 37FEC0 E007E7A0 ACA30004 */ sw $v1, 4($a1) /* 37FEC4 E007E7A4 AC820000 */ sw $v0, ($a0) /* 37FEC8 E007E7A8 3C020900 */ lui $v0, 0x900 -/* 37FECC E007E7AC 24420DE0 */ addiu $v0, $v0, %lo(D_DE000DE0) +/* 37FECC E007E7AC 24420DE0 */ addiu $v0, $v0, 0xde0 /* 37FED0 E007E7B0 AC820004 */ sw $v0, 4($a0) /* 37FED4 E007E7B4 8FB900E8 */ lw $t9, 0xe8($sp) /* 37FED8 E007E7B8 2631004C */ addiu $s1, $s1, 0x4c diff --git a/asm/nonmatchings/code_389850/func_E00863B4.s b/asm/nonmatchings/code_389850/func_E00863B4.s index cb8d8b8ef6..3b5d551a6f 100644 --- a/asm/nonmatchings/code_389850/func_E00863B4.s +++ b/asm/nonmatchings/code_389850/func_E00863B4.s @@ -242,11 +242,11 @@ glabel func_E00863B4 /* 389F9C E008674C 4406A000 */ mfc1 $a2, $f20 /* 389FA0 E0086750 4407A000 */ mfc1 $a3, $f20 /* 389FA4 E0086754 0060282D */ daddu $a1, $v1, $zero -/* 389FA8 E0086758 3C09DE00 */ lui $t1, %hi(D_DE006AB4) +/* 389FA8 E0086758 3C09DE00 */ lui $t1, 0xde00 /* 389FAC E008675C ACA90000 */ sw $t1, ($a1) /* 389FB0 E0086760 8E820000 */ lw $v0, ($s4) /* 389FB4 E0086764 3C09E008 */ lui $t1, %hi(D_E0086AB4) -/* 389FB8 E0086768 25296AB4 */ addiu $t1, $t1, %lo(D_DE006AB4) +/* 389FB8 E0086768 25296AB4 */ addiu $t1, $t1, %lo(D_E0086AB4) /* 389FBC E008676C 00021080 */ sll $v0, $v0, 2 /* 389FC0 E0086770 00491021 */ addu $v0, $v0, $t1 /* 389FC4 E0086774 8C420000 */ lw $v0, ($v0) diff --git a/asm/nonmatchings/code_38ADF0/func_E00887E0.s b/asm/nonmatchings/code_38ADF0/func_E00887E0.s index 0a237044a3..e31ec86bc9 100644 --- a/asm/nonmatchings/code_38ADF0/func_E00887E0.s +++ b/asm/nonmatchings/code_38ADF0/func_E00887E0.s @@ -47,10 +47,10 @@ glabel func_E00887E0 /* 38B678 E0088888 24620010 */ addiu $v0, $v1, 0x10 /* 38B67C E008888C AEA20000 */ sw $v0, ($s5) /* 38B680 E0088890 8CA5001C */ lw $a1, 0x1c($a1) -/* 38B684 E0088894 3C02DE00 */ lui $v0, %hi(D_DE000940) +/* 38B684 E0088894 3C02DE00 */ lui $v0, 0xde00 /* 38B688 E0088898 AC620008 */ sw $v0, 8($v1) /* 38B68C E008889C 3C020900 */ lui $v0, 0x900 -/* 38B690 E00888A0 24420940 */ addiu $v0, $v0, %lo(D_DE000940) +/* 38B690 E00888A0 24420940 */ addiu $v0, $v0, 0x940 /* 38B694 E00888A4 AC62000C */ sw $v0, 0xc($v1) /* 38B698 E00888A8 3C028000 */ lui $v0, 0x8000 /* 38B69C E00888AC 00A22821 */ addu $a1, $a1, $v0 diff --git a/asm/nonmatchings/code_38EE60/func_E008E4E0.s b/asm/nonmatchings/code_38EE60/func_E008E4E0.s index b9cce8d8fd..5d73b03c9c 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E4E0.s +++ b/asm/nonmatchings/code_38EE60/func_E008E4E0.s @@ -101,10 +101,10 @@ glabel func_E008E4E0 /* 38F4C0 E008E660 24A20008 */ addiu $v0, $a1, 8 /* 38F4C4 E008E664 AC830004 */ sw $v1, 4($a0) /* 38F4C8 E008E668 AE820000 */ sw $v0, ($s4) -/* 38F4CC E008E66C 3C02DE00 */ lui $v0, %hi(D_DE000080) +/* 38F4CC E008E66C 3C02DE00 */ lui $v0, 0xde00 /* 38F4D0 E008E670 ACA20000 */ sw $v0, ($a1) /* 38F4D4 E008E674 3C020900 */ lui $v0, 0x900 -/* 38F4D8 E008E678 24420080 */ addiu $v0, $v0, %lo(D_DE000080) +/* 38F4D8 E008E678 24420080 */ addiu $v0, $v0, 0x80 /* 38F4DC E008E67C ACA20004 */ sw $v0, 4($a1) /* 38F4E0 E008E680 24A20010 */ addiu $v0, $a1, 0x10 /* 38F4E4 E008E684 AE820000 */ sw $v0, ($s4) diff --git a/asm/nonmatchings/code_38F900/func_E0090444.s b/asm/nonmatchings/code_38F900/func_E0090444.s index 77c77f2c97..88c6732907 100644 --- a/asm/nonmatchings/code_38F900/func_E0090444.s +++ b/asm/nonmatchings/code_38F900/func_E0090444.s @@ -131,12 +131,12 @@ glabel func_E0090444 /* 38FF38 E0090638 24820008 */ addiu $v0, $a0, 8 /* 38FF3C E009063C ACA30004 */ sw $v1, 4($a1) /* 38FF40 E0090640 AE820000 */ sw $v0, ($s4) -/* 38FF44 E0090644 3C02FA00 */ lui $v0, %hi(D_FA0015A8) +/* 38FF44 E0090644 3C02FA00 */ lui $v0, 0xfa00 /* 38FF48 E0090648 3C05DE00 */ lui $a1, 0xde00 /* 38FF4C E009064C AC820000 */ sw $v0, ($a0) /* 38FF50 E0090650 92630017 */ lbu $v1, 0x17($s3) /* 38FF54 E0090654 3C020900 */ lui $v0, 0x900 -/* 38FF58 E0090658 244215A8 */ addiu $v0, $v0, %lo(D_FA0015A8) +/* 38FF58 E0090658 244215A8 */ addiu $v0, $v0, 0x15a8 /* 38FF5C E009065C AC82000C */ sw $v0, 0xc($a0) /* 38FF60 E0090660 2402FF00 */ addiu $v0, $zero, -0x100 /* 38FF64 E0090664 AC850008 */ sw $a1, 8($a0) @@ -172,10 +172,10 @@ glabel func_E0090444 /* 38FFD8 E00906D8 24E7FFFB */ addiu $a3, $a3, -5 /* 38FFDC E00906DC 25020020 */ addiu $v0, $t0, 0x20 /* 38FFE0 E00906E0 AE820000 */ sw $v0, ($s4) -/* 38FFE4 E00906E4 3C02FA00 */ lui $v0, %hi(D_FA000A78) +/* 38FFE4 E00906E4 3C02FA00 */ lui $v0, 0xfa00 /* 38FFE8 E00906E8 AD020018 */ sw $v0, 0x18($t0) /* 38FFEC E00906EC 3C02E009 */ lui $v0, %hi(D_E0090A78) -/* 38FFF0 E00906F0 24420A78 */ addiu $v0, $v0, %lo(D_FA000A78) +/* 38FFF0 E00906F0 24420A78 */ addiu $v0, $v0, %lo(D_E0090A78) /* 38FFF4 E00906F4 00072040 */ sll $a0, $a3, 1 /* 38FFF8 E00906F8 00872021 */ addu $a0, $a0, $a3 /* 38FFFC E00906FC 00042040 */ sll $a0, $a0, 1 diff --git a/asm/nonmatchings/code_391D30/func_E00922A0.s b/asm/nonmatchings/code_391D30/func_E00922A0.s index a3ffd07d7f..051fdda945 100644 --- a/asm/nonmatchings/code_391D30/func_E00922A0.s +++ b/asm/nonmatchings/code_391D30/func_E00922A0.s @@ -116,10 +116,10 @@ glabel func_E00922A0 /* 39218C E009245C 24820008 */ addiu $v0, $a0, 8 /* 392190 E0092460 ACA30004 */ sw $v1, 4($a1) /* 392194 E0092464 AE020000 */ sw $v0, ($s0) -/* 392198 E0092468 3C02DE00 */ lui $v0, %hi(D_DE0002C0) +/* 392198 E0092468 3C02DE00 */ lui $v0, 0xde00 /* 39219C E009246C AC820000 */ sw $v0, ($a0) /* 3921A0 E0092470 3C020900 */ lui $v0, 0x900 -/* 3921A4 E0092474 244202C0 */ addiu $v0, $v0, %lo(D_DE0002C0) +/* 3921A4 E0092474 244202C0 */ addiu $v0, $v0, 0x2c0 /* 3921A8 E0092478 AC820004 */ sw $v0, 4($a0) /* 3921AC E009247C 3C02FA00 */ lui $v0, 0xfa00 /* 3921B0 E0092480 AC820008 */ sw $v0, 8($a0) diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4650.s b/asm/nonmatchings/code_3A37E0/func_E00A4650.s index bc7bb0eed7..8570e9229e 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4650.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4650.s @@ -43,10 +43,10 @@ glabel func_E00A4650 /* 3A3EC8 E00A46E8 24A20008 */ addiu $v0, $a1, 8 /* 3A3ECC E00A46EC AEA20000 */ sw $v0, ($s5) /* 3A3ED0 E00A46F0 8C62001C */ lw $v0, 0x1c($v1) -/* 3A3ED4 E00A46F4 3C038000 */ lui $v1, %hi(D_80001D80) +/* 3A3ED4 E00A46F4 3C038000 */ lui $v1, 0x8000 /* 3A3ED8 E00A46F8 00431021 */ addu $v0, $v0, $v1 /* 3A3EDC E00A46FC 3C03800B */ lui $v1, %hi(gCameras) -/* 3A3EE0 E00A4700 24631D80 */ addiu $v1, $v1, %lo(D_80001D80) +/* 3A3EE0 E00A4700 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 3A3EE4 E00A4704 ACA20004 */ sw $v0, 4($a1) /* 3A3EE8 E00A4708 8E450004 */ lw $a1, 4($s2) /* 3A3EEC E00A470C 8E460008 */ lw $a2, 8($s2) diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8320.s b/asm/nonmatchings/code_3A70F0/func_E00A8320.s index 933a2e7de6..3219374518 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8320.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8320.s @@ -115,10 +115,10 @@ glabel func_E00A8320 /* 3A75C8 E00A84D8 AC820004 */ sw $v0, 4($a0) /* 3A75CC E00A84DC 24820010 */ addiu $v0, $a0, 0x10 /* 3A75D0 E00A84E0 AEA20000 */ sw $v0, ($s5) -/* 3A75D4 E00A84E4 3C02DE00 */ lui $v0, %hi(D_DE003110) +/* 3A75D4 E00A84E4 3C02DE00 */ lui $v0, 0xde00 /* 3A75D8 E00A84E8 AC820008 */ sw $v0, 8($a0) /* 3A75DC E00A84EC 3C020900 */ lui $v0, 0x900 -/* 3A75E0 E00A84F0 24423110 */ addiu $v0, $v0, %lo(D_DE003110) +/* 3A75E0 E00A84F0 24423110 */ addiu $v0, $v0, 0x3110 /* 3A75E4 E00A84F4 AC82000C */ sw $v0, 0xc($a0) .LE00A84F8: /* 3A75E8 E00A84F8 27A40018 */ addiu $a0, $sp, 0x18 diff --git a/asm/nonmatchings/code_3B2350/func_E00AE54C.s b/asm/nonmatchings/code_3B2350/func_E00AE54C.s index 03eb3b199d..efa1e53a0e 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE54C.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE54C.s @@ -48,10 +48,10 @@ glabel func_E00AE54C /* 3B2948 E00AE5F8 24A20008 */ addiu $v0, $a1, 8 /* 3B294C E00AE5FC AE620000 */ sw $v0, ($s3) /* 3B2950 E00AE600 8C62001C */ lw $v0, 0x1c($v1) -/* 3B2954 E00AE604 3C038000 */ lui $v1, %hi(D_80001D80) +/* 3B2954 E00AE604 3C038000 */ lui $v1, 0x8000 /* 3B2958 E00AE608 00431021 */ addu $v0, $v0, $v1 /* 3B295C E00AE60C 3C03800B */ lui $v1, %hi(gCameras) -/* 3B2960 E00AE610 24631D80 */ addiu $v1, $v1, %lo(D_80001D80) +/* 3B2960 E00AE610 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 3B2964 E00AE614 ACA20004 */ sw $v0, 4($a1) /* 3B2968 E00AE618 8E450004 */ lw $a1, 4($s2) /* 3B296C E00AE61C 8E460008 */ lw $a2, 8($s2) @@ -118,10 +118,10 @@ glabel func_E00AE54C /* 3B2A60 E00AE710 9243002B */ lbu $v1, 0x2b($s2) /* 3B2A64 E00AE714 9245002F */ lbu $a1, 0x2f($s2) /* 3B2A68 E00AE718 92460033 */ lbu $a2, 0x33($s2) -/* 3B2A6C E00AE71C 3C02DE00 */ lui $v0, %hi(D_DE001000) +/* 3B2A6C E00AE71C 3C02DE00 */ lui $v0, 0xde00 /* 3B2A70 E00AE720 AC820010 */ sw $v0, 0x10($a0) /* 3B2A74 E00AE724 3C020900 */ lui $v0, 0x900 -/* 3B2A78 E00AE728 24421000 */ addiu $v0, $v0, %lo(D_DE001000) +/* 3B2A78 E00AE728 24421000 */ addiu $v0, $v0, 0x1000 /* 3B2A7C E00AE72C AC820014 */ sw $v0, 0x14($a0) /* 3B2A80 E00AE730 00031E00 */ sll $v1, $v1, 0x18 /* 3B2A84 E00AE734 00052C00 */ sll $a1, $a1, 0x10 @@ -266,10 +266,10 @@ glabel func_E00AE54C /* 3B2CAC E00AE95C 005E1025 */ or $v0, $v0, $fp /* 3B2CB0 E00AE960 AC820008 */ sw $v0, 8($a0) /* 3B2CB4 E00AE964 8FA900AC */ lw $t1, 0xac($sp) -/* 3B2CB8 E00AE968 3C02DE00 */ lui $v0, %hi(D_DE0010F8) +/* 3B2CB8 E00AE968 3C02DE00 */ lui $v0, 0xde00 /* 3B2CBC E00AE96C AC820010 */ sw $v0, 0x10($a0) /* 3B2CC0 E00AE970 3C020900 */ lui $v0, 0x900 -/* 3B2CC4 E00AE974 244210F8 */ addiu $v0, $v0, %lo(D_DE0010F8) +/* 3B2CC4 E00AE974 244210F8 */ addiu $v0, $v0, 0x10f8 /* 3B2CC8 E00AE978 AC820014 */ sw $v0, 0x14($a0) /* 3B2CCC E00AE97C 24020040 */ addiu $v0, $zero, 0x40 /* 3B2CD0 E00AE980 AC870018 */ sw $a3, 0x18($a0) diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s index 293bd31b62..645ab52485 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s @@ -110,12 +110,12 @@ glabel func_E00B0234 /* 3B4288 E00B03D8 8C63A674 */ lw $v1, %lo(D_8009A674)($v1) /* 3B428C E00B03DC 00501021 */ addu $v0, $v0, $s0 /* 3B4290 E00B03E0 00621821 */ addu $v1, $v1, $v0 -/* 3B4294 E00B03E4 3C02DE00 */ lui $v0, %hi(D_DE000000) +/* 3B4294 E00B03E4 3C02DE00 */ lui $v0, 0xde00 /* 3B4298 E00B03E8 ACA30004 */ sw $v1, 4($a1) /* 3B429C E00B03EC AE570000 */ sw $s7, ($s2) /* 3B42A0 E00B03F0 AC820000 */ sw $v0, ($a0) /* 3B42A4 E00B03F4 3C020900 */ lui $v0, 0x900 -/* 3B42A8 E00B03F8 24420000 */ addiu $v0, $v0, %lo(D_DE000000) +/* 3B42A8 E00B03F8 24420000 */ addiu $v0, $v0, 0 /* 3B42AC E00B03FC AC820004 */ sw $v0, 4($a0) /* 3B42B0 E00B0400 8FAA00A8 */ lw $t2, 0xa8($sp) /* 3B42B4 E00B0404 4600C586 */ mov.s $f22, $f24 @@ -184,10 +184,10 @@ glabel func_E00B0234 /* 3B43AC E00B04FC 24820008 */ addiu $v0, $a0, 8 /* 3B43B0 E00B0500 ACA30004 */ sw $v1, 4($a1) /* 3B43B4 E00B0504 AE420000 */ sw $v0, ($s2) -/* 3B43B8 E00B0508 3C02DE00 */ lui $v0, %hi(D_DE0000C8) +/* 3B43B8 E00B0508 3C02DE00 */ lui $v0, 0xde00 /* 3B43BC E00B050C AC820000 */ sw $v0, ($a0) /* 3B43C0 E00B0510 3C020900 */ lui $v0, 0x900 -/* 3B43C4 E00B0514 244200C8 */ addiu $v0, $v0, %lo(D_DE0000C8) +/* 3B43C4 E00B0514 244200C8 */ addiu $v0, $v0, 0xc8 /* 3B43C8 E00B0518 AC820004 */ sw $v0, 4($a0) /* 3B43CC E00B051C 24820010 */ addiu $v0, $a0, 0x10 /* 3B43D0 E00B0520 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8208.s b/asm/nonmatchings/code_3B7B80/func_E00B8208.s index 79a33a0d59..f60db10268 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8208.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8208.s @@ -379,10 +379,10 @@ glabel func_E00B8208 /* 3B8344 E00B87C4 92050008 */ lbu $a1, 8($s0) /* 3B8348 E00B87C8 24820010 */ addiu $v0, $a0, 0x10 /* 3B834C E00B87CC AE820000 */ sw $v0, ($s4) -/* 3B8350 E00B87D0 3C02DE00 */ lui $v0, %hi(D_DE000328) +/* 3B8350 E00B87D0 3C02DE00 */ lui $v0, 0xde00 /* 3B8354 E00B87D4 AC820008 */ sw $v0, 8($a0) /* 3B8358 E00B87D8 3C020900 */ lui $v0, 0x900 -/* 3B835C E00B87DC 24420328 */ addiu $v0, $v0, %lo(D_DE000328) +/* 3B835C E00B87DC 24420328 */ addiu $v0, $v0, 0x328 /* 3B8360 E00B87E0 AC82000C */ sw $v0, 0xc($a0) /* 3B8364 E00B87E4 24820018 */ addiu $v0, $a0, 0x18 /* 3B8368 E00B87E8 AE820000 */ sw $v0, ($s4) diff --git a/asm/nonmatchings/code_3BA030/func_E00BC374.s b/asm/nonmatchings/code_3BA030/func_E00BC374.s index 403f03fae2..f66f2e4100 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC374.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC374.s @@ -106,10 +106,10 @@ glabel func_E00BC374 /* 3BA538 E00BC508 92A5004B */ lbu $a1, 0x4b($s5) /* 3BA53C E00BC50C 24C30018 */ addiu $v1, $a2, 0x18 /* 3BA540 E00BC510 AE230000 */ sw $v1, ($s1) -/* 3BA544 E00BC514 3C03DE00 */ lui $v1, %hi(D_DE001000) +/* 3BA544 E00BC514 3C03DE00 */ lui $v1, 0xde00 /* 3BA548 E00BC518 ACC30010 */ sw $v1, 0x10($a2) /* 3BA54C E00BC51C 3C030900 */ lui $v1, 0x900 -/* 3BA550 E00BC520 24631000 */ addiu $v1, $v1, %lo(D_DE001000) +/* 3BA550 E00BC520 24631000 */ addiu $v1, $v1, 0x1000 /* 3BA554 E00BC524 ACC30014 */ sw $v1, 0x14($a2) /* 3BA558 E00BC528 00021600 */ sll $v0, $v0, 0x18 /* 3BA55C E00BC52C 00042400 */ sll $a0, $a0, 0x10 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s index 3ec4c25554..48634f2025 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s @@ -22,10 +22,10 @@ glabel func_8002A904 /* 5D48 8002A948 24E20008 */ addiu $v0, $a3, 8 /* 5D4C 8002A94C AC600004 */ sw $zero, 4($v1) /* 5D50 8002A950 AD020000 */ sw $v0, ($t0) -/* 5D54 8002A954 3C02DE00 */ lui $v0, %hi(D_DE004580) +/* 5D54 8002A954 3C02DE00 */ lui $v0, 0xde00 /* 5D58 8002A958 ACE20000 */ sw $v0, ($a3) /* 5D5C 8002A95C 3C028007 */ lui $v0, %hi(D_80074580) -/* 5D60 8002A960 24424580 */ addiu $v0, $v0, %lo(D_DE004580) +/* 5D60 8002A960 24424580 */ addiu $v0, $v0, %lo(D_80074580) /* 5D64 8002A964 316300FF */ andi $v1, $t3, 0xff /* 5D68 8002A968 ACE20004 */ sw $v0, 4($a3) /* 5D6C 8002A96C 240200FF */ addiu $v0, $zero, 0xff diff --git a/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/asm/nonmatchings/code_6e40_len_500/render_curtains.s index b20156d4a8..f25d1d306b 100644 --- a/asm/nonmatchings/code_6e40_len_500/render_curtains.s +++ b/asm/nonmatchings/code_6e40_len_500/render_curtains.s @@ -162,12 +162,12 @@ glabel render_curtains /* 70E8 8002BCE8 AC500004 */ sw $s0, 4($v0) /* 70EC 8002BCEC 24A20008 */ addiu $v0, $a1, 8 /* 70F0 8002BCF0 AE220000 */ sw $v0, ($s1) -/* 70F4 8002BCF4 3C02FA00 */ lui $v0, %hi(D_FA006078) +/* 70F4 8002BCF4 3C02FA00 */ lui $v0, 0xfa00 /* 70F8 8002BCF8 ACA20000 */ sw $v0, ($a1) /* 70FC 8002BCFC 24A20010 */ addiu $v0, $a1, 0x10 /* 7100 8002BD00 AE220000 */ sw $v0, ($s1) /* 7104 8002BD04 3C028007 */ lui $v0, %hi(D_80076078) -/* 7108 8002BD08 24426078 */ addiu $v0, $v0, %lo(D_FA006078) +/* 7108 8002BD08 24426078 */ addiu $v0, $v0, %lo(D_80076078) /* 710C 8002BD0C ACB40008 */ sw $s4, 8($a1) /* 7110 8002BD10 ACA2000C */ sw $v0, 0xc($a1) /* 7114 8002BD14 C6620000 */ lwc1 $f2, ($s3) diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s index 4708295c6d..cb6e4d4f97 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s @@ -185,11 +185,11 @@ glabel func_800F0490 /* 89BF8 800F0748 4616B082 */ mul.s $f2, $f22, $f22 /* 89BFC 800F074C 00000000 */ nop /* 89C00 800F0750 C62C0084 */ lwc1 $f12, 0x84($s1) -/* 89C04 800F0754 3C01C000 */ lui $at, %hi(D_BFFF949C) +/* 89C04 800F0754 3C01C000 */ lui $at, 0xc000 /* 89C08 800F0758 4481A000 */ mtc1 $at, $f20 /* 89C0C 800F075C 46020000 */ add.s $f0, $f0, $f2 /* 89C10 800F0760 3C018011 */ lui $at, %hi(D_8010949C) -/* 89C14 800F0764 A420949C */ sh $zero, %lo(D_BFFF949C)($at) +/* 89C14 800F0764 A420949C */ sh $zero, %lo(D_8010949C)($at) /* 89C18 800F0768 3C0140A0 */ lui $at, 0x40a0 /* 89C1C 800F076C 44811000 */ mtc1 $at, $f2 /* 89C20 800F0770 46006307 */ neg.s $f12, $f12 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s index ec77206650..f1d02c1ace 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s @@ -101,10 +101,10 @@ glabel func_800F102C /* 8A65C 800F11AC 24820008 */ addiu $v0, $a0, 8 /* 8A660 800F11B0 ACA30004 */ sw $v1, 4($a1) /* 8A664 800F11B4 AE020000 */ sw $v0, ($s0) -/* 8A668 800F11B8 3C02DE00 */ lui $v0, %hi(D_DDFF9710) +/* 8A668 800F11B8 3C02DE00 */ lui $v0, 0xde00 /* 8A66C 800F11BC AC820000 */ sw $v0, ($a0) /* 8A670 800F11C0 3C028011 */ lui $v0, %hi(D_80109710) -/* 8A674 800F11C4 24429710 */ addiu $v0, $v0, %lo(D_DDFF9710) +/* 8A674 800F11C4 24429710 */ addiu $v0, $v0, %lo(D_80109710) /* 8A678 800F11C8 AC820004 */ sw $v0, 4($a0) /* 8A67C 800F11CC 24820010 */ addiu $v0, $a0, 0x10 /* 8A680 800F11D0 AE020000 */ sw $v0, ($s0) @@ -188,10 +188,10 @@ glabel func_800F102C /* 8A7B0 800F1300 92070000 */ lbu $a3, ($s0) /* 8A7B4 800F1304 24820010 */ addiu $v0, $a0, 0x10 /* 8A7B8 800F1308 AE220000 */ sw $v0, ($s1) -/* 8A7BC 800F130C 3C02DE00 */ lui $v0, %hi(D_DDFF97D8) +/* 8A7BC 800F130C 3C02DE00 */ lui $v0, 0xde00 /* 8A7C0 800F1310 AC820008 */ sw $v0, 8($a0) /* 8A7C4 800F1314 3C028011 */ lui $v0, %hi(D_801097D8) -/* 8A7C8 800F1318 244297D8 */ addiu $v0, $v0, %lo(D_DDFF97D8) +/* 8A7C8 800F1318 244297D8 */ addiu $v0, $v0, %lo(D_801097D8) /* 8A7CC 800F131C AC82000C */ sw $v0, 0xc($a0) /* 8A7D0 800F1320 24820018 */ addiu $v0, $a0, 0x18 /* 8A7D4 800F1324 AE220000 */ sw $v0, ($s1) diff --git a/asm/nonmatchings/code_8e790_len_2850/draw_box.s b/asm/nonmatchings/code_8e790_len_2850/draw_box.s index 7551a24add..ae786ce415 100644 --- a/asm/nonmatchings/code_8e790_len_2850/draw_box.s +++ b/asm/nonmatchings/code_8e790_len_2850/draw_box.s @@ -256,12 +256,12 @@ glabel draw_box /* 8EB44 800F5694 8FAE01F0 */ lw $t6, 0x1f0($sp) /* 8EB48 800F5698 31C20001 */ andi $v0, $t6, 1 /* 8EB4C 800F569C 1040000E */ beqz $v0, .L800F56D8 -/* 8EB50 800F56A0 3C04E300 */ lui $a0, %hi(D_E2FFD6B0) +/* 8EB50 800F56A0 3C04E300 */ lui $a0, 0xe300 /* 8EB54 800F56A4 3C058011 */ lui $a1, %hi(D_8010BBB0) /* 8EB58 800F56A8 24A5BBB0 */ addiu $a1, $a1, %lo(D_8010BBB0) /* 8EB5C 800F56AC 8CA20000 */ lw $v0, ($a1) /* 8EB60 800F56B0 3C048011 */ lui $a0, %hi(D_8010D6B0) -/* 8EB64 800F56B4 2484D6B0 */ addiu $a0, $a0, %lo(D_E2FFD6B0) +/* 8EB64 800F56B4 2484D6B0 */ addiu $a0, $a0, %lo(D_8010D6B0) /* 8EB68 800F56B8 00021A00 */ sll $v1, $v0, 8 /* 8EB6C 800F56BC 24420001 */ addiu $v0, $v0, 1 /* 8EB70 800F56C0 ACA20000 */ sw $v0, ($a1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s index 7b34bca8d1..07d5eba7b0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s @@ -140,10 +140,10 @@ glabel appendGfx_model /* A9978 80113278 24420008 */ addiu $v0, $v0, 8 /* A997C 8011327C AE020000 */ sw $v0, ($s0) /* A9980 80113280 0040302D */ daddu $a2, $v0, $zero -/* A9984 80113284 3C02FA00 */ lui $v0, %hi(D_F9FFB750) +/* A9984 80113284 3C02FA00 */ lui $v0, 0xfa00 /* A9988 80113288 AD020000 */ sw $v0, ($t0) /* A998C 8011328C 3C028015 */ lui $v0, %hi(D_8014B750) -/* A9990 80113290 9042B750 */ lbu $v0, %lo(D_F9FFB750)($v0) +/* A9990 80113290 9042B750 */ lbu $v0, %lo(D_8014B750)($v0) /* A9994 80113294 3C038015 */ lui $v1, %hi(D_8014B751) /* A9998 80113298 9063B751 */ lbu $v1, %lo(D_8014B751)($v1) /* A999C 8011329C 3C048015 */ lui $a0, %hi(D_8014B752) @@ -159,11 +159,11 @@ glabel appendGfx_model /* A99C4 801132C4 AD020004 */ sw $v0, 4($t0) /* A99C8 801132C8 00C0402D */ daddu $t0, $a2, $zero /* A99CC 801132CC 24C60008 */ addiu $a2, $a2, 8 -/* A99D0 801132D0 3C02F800 */ lui $v0, %hi(D_F7FFB754) +/* A99D0 801132D0 3C02F800 */ lui $v0, 0xf800 /* A99D4 801132D4 AE060000 */ sw $a2, ($s0) /* A99D8 801132D8 AD020000 */ sw $v0, ($t0) /* A99DC 801132DC 3C028015 */ lui $v0, %hi(D_8014B754) -/* A99E0 801132E0 9042B754 */ lbu $v0, %lo(D_F7FFB754)($v0) +/* A99E0 801132E0 9042B754 */ lbu $v0, %lo(D_8014B754)($v0) /* A99E4 801132E4 3C048015 */ lui $a0, %hi(D_8014B755) /* A99E8 801132E8 9084B755 */ lbu $a0, %lo(D_8014B755)($a0) /* A99EC 801132EC 3C038015 */ lui $v1, %hi(D_8014B756) @@ -192,10 +192,10 @@ glabel appendGfx_model /* A9A44 80113344 24420008 */ addiu $v0, $v0, 8 /* A9A48 80113348 AE020000 */ sw $v0, ($s0) /* A9A4C 8011334C 0040282D */ daddu $a1, $v0, $zero -/* A9A50 80113350 3C02FA00 */ lui $v0, %hi(D_F9FFB760) +/* A9A50 80113350 3C02FA00 */ lui $v0, 0xfa00 /* A9A54 80113354 ACC20000 */ sw $v0, ($a2) /* A9A58 80113358 3C028015 */ lui $v0, %hi(D_8014B760) -/* A9A5C 8011335C 9042B760 */ lbu $v0, %lo(D_F9FFB760)($v0) +/* A9A5C 8011335C 9042B760 */ lbu $v0, %lo(D_8014B760)($v0) /* A9A60 80113360 3C048015 */ lui $a0, %hi(D_8014B761) /* A9A64 80113364 9084B761 */ lbu $a0, %lo(D_8014B761)($a0) /* A9A68 80113368 3C038015 */ lui $v1, %hi(D_8014B762) @@ -209,11 +209,11 @@ glabel appendGfx_model /* A9A88 80113388 ACC20004 */ sw $v0, 4($a2) /* A9A8C 8011338C 00A0302D */ daddu $a2, $a1, $zero /* A9A90 80113390 24A50008 */ addiu $a1, $a1, 8 -/* A9A94 80113394 3C02FB00 */ lui $v0, %hi(D_FAFFB763) +/* A9A94 80113394 3C02FB00 */ lui $v0, 0xfb00 /* A9A98 80113398 AE050000 */ sw $a1, ($s0) /* A9A9C 8011339C ACC20000 */ sw $v0, ($a2) /* A9AA0 801133A0 3C028015 */ lui $v0, %hi(D_8014B763) -/* A9AA4 801133A4 9042B763 */ lbu $v0, %lo(D_FAFFB763)($v0) +/* A9AA4 801133A4 9042B763 */ lbu $v0, %lo(D_8014B763)($v0) /* A9AA8 801133A8 3C048015 */ lui $a0, %hi(D_8014B764) /* A9AAC 801133AC 9084B764 */ lbu $a0, %lo(D_8014B764)($a0) /* A9AB0 801133B0 3C038015 */ lui $v1, %hi(D_8014B765) @@ -989,12 +989,12 @@ glabel appendGfx_model /* AA668 80113F68 9063B74C */ lbu $v1, %lo(D_8014B74C)($v1) /* AA66C 80113F6C 240200FF */ addiu $v0, $zero, 0xff /* AA670 80113F70 106202ED */ beq $v1, $v0, .L80114B28 -/* AA674 80113F74 3C02DE00 */ lui $v0, %hi(D_DDFFB000) +/* AA674 80113F74 3C02DE00 */ lui $v0, 0xde00 /* AA678 80113F78 8E030000 */ lw $v1, ($s0) /* AA67C 80113F7C 0060202D */ daddu $a0, $v1, $zero /* AA680 80113F80 AC820000 */ sw $v0, ($a0) /* AA684 80113F84 3C028015 */ lui $v0, %hi(D_8014B000) -/* AA688 80113F88 8C42B000 */ lw $v0, %lo(D_DDFFB000)($v0) +/* AA688 80113F88 8C42B000 */ lw $v0, %lo(D_8014B000)($v0) /* AA68C 80113F8C 24630008 */ addiu $v1, $v1, 8 /* AA690 80113F90 AE030000 */ sw $v1, ($s0) /* AA694 80113F94 AC820004 */ sw $v0, 4($a0) @@ -1193,10 +1193,10 @@ glabel appendGfx_model /* AA990 80114290 00461025 */ or $v0, $v0, $a2 /* AA994 80114294 00431025 */ or $v0, $v0, $v1 /* AA998 80114298 ACE20004 */ sw $v0, 4($a3) -/* AA99C 8011429C 3C02F900 */ lui $v0, %hi(D_F8FFB74D) +/* AA99C 8011429C 3C02F900 */ lui $v0, 0xf900 /* AA9A0 801142A0 AD020000 */ sw $v0, ($t0) /* AA9A4 801142A4 3C028015 */ lui $v0, %hi(D_8014B74D) -/* AA9A8 801142A8 9042B74D */ lbu $v0, %lo(D_F8FFB74D)($v0) +/* AA9A8 801142A8 9042B74D */ lbu $v0, %lo(D_8014B74D)($v0) /* AA9AC 801142AC 3C048015 */ lui $a0, %hi(D_8014B74E) /* AA9B0 801142B0 9084B74E */ lbu $a0, %lo(D_8014B74E)($a0) /* AA9B4 801142B4 3C038015 */ lui $v1, %hi(D_8014B74F) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s index 13ce3c266c..a4dac1b940 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s @@ -101,10 +101,10 @@ glabel func_8011F4D4 /* B5D48 8011F648 0040202D */ daddu $a0, $v0, $zero /* B5D4C 8011F64C 24420008 */ addiu $v0, $v0, 8 /* B5D50 8011F650 AC620000 */ sw $v0, ($v1) -/* B5D54 8011F654 3C02DE00 */ lui $v0, %hi(D_DDFFB7F8) +/* B5D54 8011F654 3C02DE00 */ lui $v0, 0xde00 /* B5D58 8011F658 AC820000 */ sw $v0, ($a0) /* B5D5C 8011F65C 3C028015 */ lui $v0, %hi(D_8014B7F8) -/* B5D60 8011F660 2442B7F8 */ addiu $v0, $v0, %lo(D_DDFFB7F8) +/* B5D60 8011F660 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B5D64 8011F664 08047E7F */ j .L8011F9FC /* B5D68 8011F668 AC820004 */ sw $v0, 4($a0) /* B5D6C 8011F66C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -113,10 +113,10 @@ glabel func_8011F4D4 /* B5D78 8011F678 0040202D */ daddu $a0, $v0, $zero /* B5D7C 8011F67C 24420008 */ addiu $v0, $v0, 8 /* B5D80 8011F680 AC620000 */ sw $v0, ($v1) -/* B5D84 8011F684 3C02DE00 */ lui $v0, %hi(D_DDFFB820) +/* B5D84 8011F684 3C02DE00 */ lui $v0, 0xde00 /* B5D88 8011F688 AC820000 */ sw $v0, ($a0) /* B5D8C 8011F68C 3C028015 */ lui $v0, %hi(D_8014B820) -/* B5D90 8011F690 2442B820 */ addiu $v0, $v0, %lo(D_DDFFB820) +/* B5D90 8011F690 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B5D94 8011F694 08047E7F */ j .L8011F9FC /* B5D98 8011F698 AC820004 */ sw $v0, 4($a0) /* B5D9C 8011F69C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -125,10 +125,10 @@ glabel func_8011F4D4 /* B5DA8 8011F6A8 0040202D */ daddu $a0, $v0, $zero /* B5DAC 8011F6AC 24420008 */ addiu $v0, $v0, 8 /* B5DB0 8011F6B0 AC620000 */ sw $v0, ($v1) -/* B5DB4 8011F6B4 3C02DE00 */ lui $v0, %hi(D_DDFFB848) +/* B5DB4 8011F6B4 3C02DE00 */ lui $v0, 0xde00 /* B5DB8 8011F6B8 AC820000 */ sw $v0, ($a0) /* B5DBC 8011F6BC 3C028015 */ lui $v0, %hi(D_8014B848) -/* B5DC0 8011F6C0 2442B848 */ addiu $v0, $v0, %lo(D_DDFFB848) +/* B5DC0 8011F6C0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B5DC4 8011F6C4 08047E7F */ j .L8011F9FC /* B5DC8 8011F6C8 AC820004 */ sw $v0, 4($a0) /* B5DCC 8011F6CC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -137,10 +137,10 @@ glabel func_8011F4D4 /* B5DD8 8011F6D8 0040202D */ daddu $a0, $v0, $zero /* B5DDC 8011F6DC 24420008 */ addiu $v0, $v0, 8 /* B5DE0 8011F6E0 AC620000 */ sw $v0, ($v1) -/* B5DE4 8011F6E4 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* B5DE4 8011F6E4 3C02DE00 */ lui $v0, 0xde00 /* B5DE8 8011F6E8 AC820000 */ sw $v0, ($a0) /* B5DEC 8011F6EC 3C028015 */ lui $v0, %hi(D_8014B870) -/* B5DF0 8011F6F0 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* B5DF0 8011F6F0 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B5DF4 8011F6F4 08047E7F */ j .L8011F9FC /* B5DF8 8011F6F8 AC820004 */ sw $v0, 4($a0) /* B5DFC 8011F6FC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -149,10 +149,10 @@ glabel func_8011F4D4 /* B5E08 8011F708 0040202D */ daddu $a0, $v0, $zero /* B5E0C 8011F70C 24420008 */ addiu $v0, $v0, 8 /* B5E10 8011F710 AC620000 */ sw $v0, ($v1) -/* B5E14 8011F714 3C02DE00 */ lui $v0, %hi(D_DDFFB898) +/* B5E14 8011F714 3C02DE00 */ lui $v0, 0xde00 /* B5E18 8011F718 AC820000 */ sw $v0, ($a0) /* B5E1C 8011F71C 3C028015 */ lui $v0, %hi(D_8014B898) -/* B5E20 8011F720 2442B898 */ addiu $v0, $v0, %lo(D_DDFFB898) +/* B5E20 8011F720 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B5E24 8011F724 08047E7F */ j .L8011F9FC /* B5E28 8011F728 AC820004 */ sw $v0, 4($a0) /* B5E2C 8011F72C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -161,10 +161,10 @@ glabel func_8011F4D4 /* B5E38 8011F738 0040202D */ daddu $a0, $v0, $zero /* B5E3C 8011F73C 24420008 */ addiu $v0, $v0, 8 /* B5E40 8011F740 AC620000 */ sw $v0, ($v1) -/* B5E44 8011F744 3C02DE00 */ lui $v0, %hi(D_DDFFB8C0) +/* B5E44 8011F744 3C02DE00 */ lui $v0, 0xde00 /* B5E48 8011F748 AC820000 */ sw $v0, ($a0) /* B5E4C 8011F74C 3C028015 */ lui $v0, %hi(D_8014B8C0) -/* B5E50 8011F750 2442B8C0 */ addiu $v0, $v0, %lo(D_DDFFB8C0) +/* B5E50 8011F750 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B5E54 8011F754 08047E7F */ j .L8011F9FC /* B5E58 8011F758 AC820004 */ sw $v0, 4($a0) /* B5E5C 8011F75C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -173,10 +173,10 @@ glabel func_8011F4D4 /* B5E68 8011F768 0040202D */ daddu $a0, $v0, $zero /* B5E6C 8011F76C 24420008 */ addiu $v0, $v0, 8 /* B5E70 8011F770 AC620000 */ sw $v0, ($v1) -/* B5E74 8011F774 3C02DE00 */ lui $v0, %hi(D_DDFFB8E8) +/* B5E74 8011F774 3C02DE00 */ lui $v0, 0xde00 /* B5E78 8011F778 AC820000 */ sw $v0, ($a0) /* B5E7C 8011F77C 3C028015 */ lui $v0, %hi(D_8014B8E8) -/* B5E80 8011F780 2442B8E8 */ addiu $v0, $v0, %lo(D_DDFFB8E8) +/* B5E80 8011F780 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B5E84 8011F784 08047E7F */ j .L8011F9FC /* B5E88 8011F788 AC820004 */ sw $v0, 4($a0) .L8011F78C: @@ -198,10 +198,10 @@ glabel func_8011F4D4 /* B5EC8 8011F7C8 0040202D */ daddu $a0, $v0, $zero /* B5ECC 8011F7CC 24420008 */ addiu $v0, $v0, 8 /* B5ED0 8011F7D0 AC620000 */ sw $v0, ($v1) -/* B5ED4 8011F7D4 3C02DE00 */ lui $v0, %hi(D_DDFFBE78) +/* B5ED4 8011F7D4 3C02DE00 */ lui $v0, 0xde00 /* B5ED8 8011F7D8 AC820000 */ sw $v0, ($a0) /* B5EDC 8011F7DC 3C028015 */ lui $v0, %hi(D_8014BE78) -/* B5EE0 8011F7E0 2442BE78 */ addiu $v0, $v0, %lo(D_DDFFBE78) +/* B5EE0 8011F7E0 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B5EE4 8011F7E4 08047E42 */ j .L8011F908 /* B5EE8 8011F7E8 AC820004 */ sw $v0, 4($a0) /* B5EEC 8011F7EC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -210,10 +210,10 @@ glabel func_8011F4D4 /* B5EF8 8011F7F8 0040202D */ daddu $a0, $v0, $zero /* B5EFC 8011F7FC 24420008 */ addiu $v0, $v0, 8 /* B5F00 8011F800 AC620000 */ sw $v0, ($v1) -/* B5F04 8011F804 3C02DE00 */ lui $v0, %hi(D_DDFFBEA0) +/* B5F04 8011F804 3C02DE00 */ lui $v0, 0xde00 /* B5F08 8011F808 AC820000 */ sw $v0, ($a0) /* B5F0C 8011F80C 3C028015 */ lui $v0, %hi(D_8014BEA0) -/* B5F10 8011F810 2442BEA0 */ addiu $v0, $v0, %lo(D_DDFFBEA0) +/* B5F10 8011F810 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B5F14 8011F814 08047E42 */ j .L8011F908 /* B5F18 8011F818 AC820004 */ sw $v0, 4($a0) /* B5F1C 8011F81C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -222,10 +222,10 @@ glabel func_8011F4D4 /* B5F28 8011F828 0040202D */ daddu $a0, $v0, $zero /* B5F2C 8011F82C 24420008 */ addiu $v0, $v0, 8 /* B5F30 8011F830 AC620000 */ sw $v0, ($v1) -/* B5F34 8011F834 3C02DE00 */ lui $v0, %hi(D_DDFFBEC8) +/* B5F34 8011F834 3C02DE00 */ lui $v0, 0xde00 /* B5F38 8011F838 AC820000 */ sw $v0, ($a0) /* B5F3C 8011F83C 3C028015 */ lui $v0, %hi(D_8014BEC8) -/* B5F40 8011F840 2442BEC8 */ addiu $v0, $v0, %lo(D_DDFFBEC8) +/* B5F40 8011F840 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B5F44 8011F844 08047E42 */ j .L8011F908 /* B5F48 8011F848 AC820004 */ sw $v0, 4($a0) /* B5F4C 8011F84C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -234,10 +234,10 @@ glabel func_8011F4D4 /* B5F58 8011F858 0040202D */ daddu $a0, $v0, $zero /* B5F5C 8011F85C 24420008 */ addiu $v0, $v0, 8 /* B5F60 8011F860 AC620000 */ sw $v0, ($v1) -/* B5F64 8011F864 3C02DE00 */ lui $v0, %hi(D_DDFFBEF0) +/* B5F64 8011F864 3C02DE00 */ lui $v0, 0xde00 /* B5F68 8011F868 AC820000 */ sw $v0, ($a0) /* B5F6C 8011F86C 3C028015 */ lui $v0, %hi(D_8014BEF0) -/* B5F70 8011F870 2442BEF0 */ addiu $v0, $v0, %lo(D_DDFFBEF0) +/* B5F70 8011F870 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B5F74 8011F874 08047E42 */ j .L8011F908 /* B5F78 8011F878 AC820004 */ sw $v0, 4($a0) /* B5F7C 8011F87C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -246,10 +246,10 @@ glabel func_8011F4D4 /* B5F88 8011F888 0040202D */ daddu $a0, $v0, $zero /* B5F8C 8011F88C 24420008 */ addiu $v0, $v0, 8 /* B5F90 8011F890 AC620000 */ sw $v0, ($v1) -/* B5F94 8011F894 3C02DE00 */ lui $v0, %hi(D_DDFFBF18) +/* B5F94 8011F894 3C02DE00 */ lui $v0, 0xde00 /* B5F98 8011F898 AC820000 */ sw $v0, ($a0) /* B5F9C 8011F89C 3C028015 */ lui $v0, %hi(D_8014BF18) -/* B5FA0 8011F8A0 2442BF18 */ addiu $v0, $v0, %lo(D_DDFFBF18) +/* B5FA0 8011F8A0 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B5FA4 8011F8A4 08047E42 */ j .L8011F908 /* B5FA8 8011F8A8 AC820004 */ sw $v0, 4($a0) /* B5FAC 8011F8AC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -258,10 +258,10 @@ glabel func_8011F4D4 /* B5FB8 8011F8B8 0040202D */ daddu $a0, $v0, $zero /* B5FBC 8011F8BC 24420008 */ addiu $v0, $v0, 8 /* B5FC0 8011F8C0 AC620000 */ sw $v0, ($v1) -/* B5FC4 8011F8C4 3C02DE00 */ lui $v0, %hi(D_DDFFBF40) +/* B5FC4 8011F8C4 3C02DE00 */ lui $v0, 0xde00 /* B5FC8 8011F8C8 AC820000 */ sw $v0, ($a0) /* B5FCC 8011F8CC 3C028015 */ lui $v0, %hi(D_8014BF40) -/* B5FD0 8011F8D0 2442BF40 */ addiu $v0, $v0, %lo(D_DDFFBF40) +/* B5FD0 8011F8D0 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B5FD4 8011F8D4 08047E42 */ j .L8011F908 /* B5FD8 8011F8D8 AC820004 */ sw $v0, 4($a0) /* B5FDC 8011F8DC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -270,10 +270,10 @@ glabel func_8011F4D4 /* B5FE8 8011F8E8 0040202D */ daddu $a0, $v0, $zero /* B5FEC 8011F8EC 24420008 */ addiu $v0, $v0, 8 /* B5FF0 8011F8F0 AC620000 */ sw $v0, ($v1) -/* B5FF4 8011F8F4 3C02DE00 */ lui $v0, %hi(D_DDFFBF68) +/* B5FF4 8011F8F4 3C02DE00 */ lui $v0, 0xde00 /* B5FF8 8011F8F8 AC820000 */ sw $v0, ($a0) /* B5FFC 8011F8FC 3C028015 */ lui $v0, %hi(D_8014BF68) -/* B6000 8011F900 2442BF68 */ addiu $v0, $v0, %lo(D_DDFFBF68) +/* B6000 8011F900 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B6004 8011F904 AC820004 */ sw $v0, 4($a0) .L8011F908: /* B6008 8011F908 3C070001 */ lui $a3, 1 @@ -315,11 +315,11 @@ glabel func_8011F4D4 /* B6088 8011F988 8D060000 */ lw $a2, ($t0) /* B608C 8011F98C 00C0482D */ daddu $t1, $a2, $zero /* B6090 8011F990 24C60008 */ addiu $a2, $a2, 8 -/* B6094 8011F994 3C02F800 */ lui $v0, %hi(D_F8003A4B) +/* B6094 8011F994 3C02F800 */ lui $v0, 0xf800 /* B6098 8011F998 AD060000 */ sw $a2, ($t0) /* B609C 8011F99C AD220000 */ sw $v0, ($t1) /* B60A0 8011F9A0 3C028015 */ lui $v0, %hi(D_80153A4B) -/* B60A4 8011F9A4 90423A4B */ lbu $v0, %lo(D_F8003A4B)($v0) +/* B60A4 8011F9A4 90423A4B */ lbu $v0, %lo(D_80153A4B)($v0) /* B60A8 8011F9A8 3C038015 */ lui $v1, %hi(D_80153A4F) /* B60AC 8011F9AC 90633A4F */ lbu $v1, %lo(D_80153A4F)($v1) /* B60B0 8011F9B0 3C048015 */ lui $a0, %hi(D_80153A53) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s index 4f98c10038..012eb9b6c9 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_item_entity.s @@ -186,19 +186,19 @@ glabel appendGfx_item_entity /* C8B5C 8013245C A4E40000 */ sh $a0, ($a3) /* C8B60 80132460 25020008 */ addiu $v0, $t0, 8 /* C8B64 80132464 AD220000 */ sw $v0, ($t1) -/* C8B68 80132468 3C02DE00 */ lui $v0, %hi(D_DDFFBBD8) +/* C8B68 80132468 3C02DE00 */ lui $v0, 0xde00 /* C8B6C 8013246C AD020000 */ sw $v0, ($t0) /* C8B70 80132470 3C028015 */ lui $v0, %hi(D_8014BBD8) -/* C8B74 80132474 2442BBD8 */ addiu $v0, $v0, %lo(D_DDFFBBD8) +/* C8B74 80132474 2442BBD8 */ addiu $v0, $v0, %lo(D_8014BBD8) /* C8B78 80132478 0804C927 */ j .L8013249C /* C8B7C 8013247C AD020004 */ sw $v0, 4($t0) .L80132480: /* C8B80 80132480 25020008 */ addiu $v0, $t0, 8 /* C8B84 80132484 AD220000 */ sw $v0, ($t1) -/* C8B88 80132488 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* C8B88 80132488 3C02DE00 */ lui $v0, 0xde00 /* C8B8C 8013248C AD020000 */ sw $v0, ($t0) /* C8B90 80132490 3C028015 */ lui $v0, %hi(D_8014B870) -/* C8B94 80132494 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* C8B94 80132494 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* C8B98 80132498 AD020004 */ sw $v0, 4($t0) .L8013249C: /* C8B9C 8013249C 3C03D9FD */ lui $v1, 0xd9fd @@ -213,10 +213,10 @@ glabel appendGfx_item_entity /* C8BC0 801324C0 AC400004 */ sw $zero, 4($v0) /* C8BC4 801324C4 24E20008 */ addiu $v0, $a3, 8 /* C8BC8 801324C8 AD020000 */ sw $v0, ($t0) -/* C8BCC 801324CC 3C02DE00 */ lui $v0, %hi(D_DDFFC620) +/* C8BCC 801324CC 3C02DE00 */ lui $v0, 0xde00 /* C8BD0 801324D0 ACE20000 */ sw $v0, ($a3) /* C8BD4 801324D4 3C028015 */ lui $v0, %hi(D_8014C620) -/* C8BD8 801324D8 2442C620 */ addiu $v0, $v0, %lo(D_DDFFC620) +/* C8BD8 801324D8 2442C620 */ addiu $v0, $v0, %lo(D_8014C620) /* C8BDC 801324DC ACE20004 */ sw $v0, 4($a3) /* C8BE0 801324E0 8E620000 */ lw $v0, ($s3) /* C8BE4 801324E4 3C030808 */ lui $v1, 0x808 @@ -297,10 +297,10 @@ glabel appendGfx_item_entity /* C8D08 80132608 ADC20000 */ sw $v0, ($t6) /* C8D0C 8013260C 3C020700 */ lui $v0, 0x700 /* C8D10 80132610 ADC2000C */ sw $v0, 0xc($t6) -/* C8D14 80132614 3C02F000 */ lui $v0, %hi(D_F0001328) +/* C8D14 80132614 3C02F000 */ lui $v0, 0xf000 /* C8D18 80132618 ADC20018 */ sw $v0, 0x18($t6) /* C8D1C 8013261C 3C028015 */ lui $v0, %hi(D_80151328) -/* C8D20 80132620 8C421328 */ lw $v0, %lo(D_F0001328)($v0) +/* C8D20 80132620 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C8D24 80132624 3C11E700 */ lui $s1, 0xe700 /* C8D28 80132628 ADC00004 */ sw $zero, 4($t6) /* C8D2C 8013262C ADC50008 */ sw $a1, 8($t6) @@ -468,10 +468,10 @@ glabel appendGfx_item_entity /* C8FA8 801328A8 0040202D */ daddu $a0, $v0, $zero /* C8FAC 801328AC 24420008 */ addiu $v0, $v0, 8 /* C8FB0 801328B0 AC620000 */ sw $v0, ($v1) -/* C8FB4 801328B4 3C02DE00 */ lui $v0, %hi(D_DDFFC678) +/* C8FB4 801328B4 3C02DE00 */ lui $v0, 0xde00 /* C8FB8 801328B8 AC820000 */ sw $v0, ($a0) /* C8FBC 801328BC 3C028015 */ lui $v0, %hi(D_8014C678) -/* C8FC0 801328C0 2442C678 */ addiu $v0, $v0, %lo(D_DDFFC678) +/* C8FC0 801328C0 2442C678 */ addiu $v0, $v0, %lo(D_8014C678) /* C8FC4 801328C4 0804CAFF */ j .L80132BFC /* C8FC8 801328C8 AC820004 */ sw $v0, 4($a0) .L801328CC: @@ -506,10 +506,10 @@ glabel appendGfx_item_entity /* C903C 8013293C ADC20000 */ sw $v0, ($t6) /* C9040 80132940 3C020700 */ lui $v0, 0x700 /* C9044 80132944 ADC2000C */ sw $v0, 0xc($t6) -/* C9048 80132948 3C02F000 */ lui $v0, %hi(D_F0001328) +/* C9048 80132948 3C02F000 */ lui $v0, 0xf000 /* C904C 8013294C ADC20018 */ sw $v0, 0x18($t6) /* C9050 80132950 3C028015 */ lui $v0, %hi(D_80151328) -/* C9054 80132954 8C421328 */ lw $v0, %lo(D_F0001328)($v0) +/* C9054 80132954 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* C9058 80132958 3C11E700 */ lui $s1, 0xe700 /* C905C 8013295C ADC00004 */ sw $zero, 4($t6) /* C9060 80132960 ADC50008 */ sw $a1, 8($t6) @@ -677,10 +677,10 @@ glabel appendGfx_item_entity /* C92DC 80132BDC 0040202D */ daddu $a0, $v0, $zero /* C92E0 80132BE0 24420008 */ addiu $v0, $v0, 8 /* C92E4 80132BE4 AC620000 */ sw $v0, ($v1) -/* C92E8 80132BE8 3C02DE00 */ lui $v0, %hi(D_DDFFC6A0) +/* C92E8 80132BE8 3C02DE00 */ lui $v0, 0xde00 /* C92EC 80132BEC AC820000 */ sw $v0, ($a0) /* C92F0 80132BF0 3C028015 */ lui $v0, %hi(D_8014C6A0) -/* C92F4 80132BF4 2442C6A0 */ addiu $v0, $v0, %lo(D_DDFFC6A0) +/* C92F4 80132BF4 2442C6A0 */ addiu $v0, $v0, %lo(D_8014C6A0) /* C92F8 80132BF8 AC820004 */ sw $v0, 4($a0) .L80132BFC: /* C92FC 80132BFC 3C03D838 */ lui $v1, 0xd838 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s index 347097c872..2100874227 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s @@ -57,10 +57,10 @@ glabel draw_number /* BDE60 80127760 0040202D */ daddu $a0, $v0, $zero /* BDE64 80127764 24420008 */ addiu $v0, $v0, 8 /* BDE68 80127768 AC620000 */ sw $v0, ($v1) -/* BDE6C 8012776C 3C02DE00 */ lui $v0, %hi(D_DDFFC368) +/* BDE6C 8012776C 3C02DE00 */ lui $v0, 0xde00 /* BDE70 80127770 AC820000 */ sw $v0, ($a0) /* BDE74 80127774 3C028015 */ lui $v0, %hi(D_8014C368) -/* BDE78 80127778 2442C368 */ addiu $v0, $v0, %lo(D_DDFFC368) +/* BDE78 80127778 2442C368 */ addiu $v0, $v0, %lo(D_8014C368) /* BDE7C 8012777C AC820004 */ sw $v0, 4($a0) /* BDE80 80127780 32220001 */ andi $v0, $s1, 1 /* BDE84 80127784 1040001E */ beqz $v0, .L80127800 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s index be22b8f2c0..24f00f17a4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s @@ -133,10 +133,10 @@ glabel func_80121184 /* B7A78 80121378 0040202D */ daddu $a0, $v0, $zero /* B7A7C 8012137C 24420008 */ addiu $v0, $v0, 8 /* B7A80 80121380 AC620000 */ sw $v0, ($v1) -/* B7A84 80121384 3C02DE00 */ lui $v0, %hi(D_DDFFB7F8) +/* B7A84 80121384 3C02DE00 */ lui $v0, 0xde00 /* B7A88 80121388 AC820000 */ sw $v0, ($a0) /* B7A8C 8012138C 3C028015 */ lui $v0, %hi(D_8014B7F8) -/* B7A90 80121390 2442B7F8 */ addiu $v0, $v0, %lo(D_DDFFB7F8) +/* B7A90 80121390 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B7A94 80121394 0804862B */ j .L801218AC /* B7A98 80121398 AC820004 */ sw $v0, 4($a0) /* B7A9C 8012139C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -145,10 +145,10 @@ glabel func_80121184 /* B7AA8 801213A8 0040202D */ daddu $a0, $v0, $zero /* B7AAC 801213AC 24420008 */ addiu $v0, $v0, 8 /* B7AB0 801213B0 AC620000 */ sw $v0, ($v1) -/* B7AB4 801213B4 3C02DE00 */ lui $v0, %hi(D_DDFFB820) +/* B7AB4 801213B4 3C02DE00 */ lui $v0, 0xde00 /* B7AB8 801213B8 AC820000 */ sw $v0, ($a0) /* B7ABC 801213BC 3C028015 */ lui $v0, %hi(D_8014B820) -/* B7AC0 801213C0 2442B820 */ addiu $v0, $v0, %lo(D_DDFFB820) +/* B7AC0 801213C0 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B7AC4 801213C4 0804862B */ j .L801218AC /* B7AC8 801213C8 AC820004 */ sw $v0, 4($a0) /* B7ACC 801213CC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -157,10 +157,10 @@ glabel func_80121184 /* B7AD8 801213D8 0040202D */ daddu $a0, $v0, $zero /* B7ADC 801213DC 24420008 */ addiu $v0, $v0, 8 /* B7AE0 801213E0 AC620000 */ sw $v0, ($v1) -/* B7AE4 801213E4 3C02DE00 */ lui $v0, %hi(D_DDFFB848) +/* B7AE4 801213E4 3C02DE00 */ lui $v0, 0xde00 /* B7AE8 801213E8 AC820000 */ sw $v0, ($a0) /* B7AEC 801213EC 3C028015 */ lui $v0, %hi(D_8014B848) -/* B7AF0 801213F0 2442B848 */ addiu $v0, $v0, %lo(D_DDFFB848) +/* B7AF0 801213F0 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B7AF4 801213F4 0804862B */ j .L801218AC /* B7AF8 801213F8 AC820004 */ sw $v0, 4($a0) /* B7AFC 801213FC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -169,10 +169,10 @@ glabel func_80121184 /* B7B08 80121408 0040202D */ daddu $a0, $v0, $zero /* B7B0C 8012140C 24420008 */ addiu $v0, $v0, 8 /* B7B10 80121410 AC620000 */ sw $v0, ($v1) -/* B7B14 80121414 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* B7B14 80121414 3C02DE00 */ lui $v0, 0xde00 /* B7B18 80121418 AC820000 */ sw $v0, ($a0) /* B7B1C 8012141C 3C028015 */ lui $v0, %hi(D_8014B870) -/* B7B20 80121420 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* B7B20 80121420 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B7B24 80121424 0804862B */ j .L801218AC /* B7B28 80121428 AC820004 */ sw $v0, 4($a0) /* B7B2C 8012142C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -181,10 +181,10 @@ glabel func_80121184 /* B7B38 80121438 0040202D */ daddu $a0, $v0, $zero /* B7B3C 8012143C 24420008 */ addiu $v0, $v0, 8 /* B7B40 80121440 AC620000 */ sw $v0, ($v1) -/* B7B44 80121444 3C02DE00 */ lui $v0, %hi(D_DDFFB898) +/* B7B44 80121444 3C02DE00 */ lui $v0, 0xde00 /* B7B48 80121448 AC820000 */ sw $v0, ($a0) /* B7B4C 8012144C 3C028015 */ lui $v0, %hi(D_8014B898) -/* B7B50 80121450 2442B898 */ addiu $v0, $v0, %lo(D_DDFFB898) +/* B7B50 80121450 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B7B54 80121454 0804862B */ j .L801218AC /* B7B58 80121458 AC820004 */ sw $v0, 4($a0) /* B7B5C 8012145C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -193,10 +193,10 @@ glabel func_80121184 /* B7B68 80121468 0040202D */ daddu $a0, $v0, $zero /* B7B6C 8012146C 24420008 */ addiu $v0, $v0, 8 /* B7B70 80121470 AC620000 */ sw $v0, ($v1) -/* B7B74 80121474 3C02DE00 */ lui $v0, %hi(D_DDFFB9B0) +/* B7B74 80121474 3C02DE00 */ lui $v0, 0xde00 /* B7B78 80121478 AC820000 */ sw $v0, ($a0) /* B7B7C 8012147C 3C028015 */ lui $v0, %hi(D_8014B9B0) -/* B7B80 80121480 2442B9B0 */ addiu $v0, $v0, %lo(D_DDFFB9B0) +/* B7B80 80121480 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B7B84 80121484 0804862B */ j .L801218AC /* B7B88 80121488 AC820004 */ sw $v0, 4($a0) /* B7B8C 8012148C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -205,10 +205,10 @@ glabel func_80121184 /* B7B98 80121498 0040202D */ daddu $a0, $v0, $zero /* B7B9C 8012149C 24420008 */ addiu $v0, $v0, 8 /* B7BA0 801214A0 AC620000 */ sw $v0, ($v1) -/* B7BA4 801214A4 3C02DE00 */ lui $v0, %hi(D_DDFFB8C0) +/* B7BA4 801214A4 3C02DE00 */ lui $v0, 0xde00 /* B7BA8 801214A8 AC820000 */ sw $v0, ($a0) /* B7BAC 801214AC 3C028015 */ lui $v0, %hi(D_8014B8C0) -/* B7BB0 801214B0 2442B8C0 */ addiu $v0, $v0, %lo(D_DDFFB8C0) +/* B7BB0 801214B0 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B7BB4 801214B4 0804862B */ j .L801218AC /* B7BB8 801214B8 AC820004 */ sw $v0, 4($a0) /* B7BBC 801214BC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -217,10 +217,10 @@ glabel func_80121184 /* B7BC8 801214C8 0040202D */ daddu $a0, $v0, $zero /* B7BCC 801214CC 24420008 */ addiu $v0, $v0, 8 /* B7BD0 801214D0 AC620000 */ sw $v0, ($v1) -/* B7BD4 801214D4 3C02DE00 */ lui $v0, %hi(D_DDFFB9D8) +/* B7BD4 801214D4 3C02DE00 */ lui $v0, 0xde00 /* B7BD8 801214D8 AC820000 */ sw $v0, ($a0) /* B7BDC 801214DC 3C028015 */ lui $v0, %hi(D_8014B9D8) -/* B7BE0 801214E0 2442B9D8 */ addiu $v0, $v0, %lo(D_DDFFB9D8) +/* B7BE0 801214E0 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B7BE4 801214E4 0804862B */ j .L801218AC /* B7BE8 801214E8 AC820004 */ sw $v0, 4($a0) /* B7BEC 801214EC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -229,10 +229,10 @@ glabel func_80121184 /* B7BF8 801214F8 0040202D */ daddu $a0, $v0, $zero /* B7BFC 801214FC 24420008 */ addiu $v0, $v0, 8 /* B7C00 80121500 AC620000 */ sw $v0, ($v1) -/* B7C04 80121504 3C02DE00 */ lui $v0, %hi(D_DDFFB8E8) +/* B7C04 80121504 3C02DE00 */ lui $v0, 0xde00 /* B7C08 80121508 AC820000 */ sw $v0, ($a0) /* B7C0C 8012150C 3C028015 */ lui $v0, %hi(D_8014B8E8) -/* B7C10 80121510 2442B8E8 */ addiu $v0, $v0, %lo(D_DDFFB8E8) +/* B7C10 80121510 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B7C14 80121514 0804862B */ j .L801218AC /* B7C18 80121518 AC820004 */ sw $v0, 4($a0) /* B7C1C 8012151C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -241,10 +241,10 @@ glabel func_80121184 /* B7C28 80121528 0040202D */ daddu $a0, $v0, $zero /* B7C2C 8012152C 24420008 */ addiu $v0, $v0, 8 /* B7C30 80121530 AC620000 */ sw $v0, ($v1) -/* B7C34 80121534 3C02DE00 */ lui $v0, %hi(D_DDFFBA00) +/* B7C34 80121534 3C02DE00 */ lui $v0, 0xde00 /* B7C38 80121538 AC820000 */ sw $v0, ($a0) /* B7C3C 8012153C 3C028015 */ lui $v0, %hi(D_8014BA00) -/* B7C40 80121540 2442BA00 */ addiu $v0, $v0, %lo(D_DDFFBA00) +/* B7C40 80121540 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B7C44 80121544 0804862B */ j .L801218AC /* B7C48 80121548 AC820004 */ sw $v0, 4($a0) /* B7C4C 8012154C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -253,10 +253,10 @@ glabel func_80121184 /* B7C58 80121558 0040202D */ daddu $a0, $v0, $zero /* B7C5C 8012155C 24420008 */ addiu $v0, $v0, 8 /* B7C60 80121560 AC620000 */ sw $v0, ($v1) -/* B7C64 80121564 3C02DE00 */ lui $v0, %hi(D_DDFFB988) +/* B7C64 80121564 3C02DE00 */ lui $v0, 0xde00 /* B7C68 80121568 AC820000 */ sw $v0, ($a0) /* B7C6C 8012156C 3C028015 */ lui $v0, %hi(D_8014B988) -/* B7C70 80121570 2442B988 */ addiu $v0, $v0, %lo(D_DDFFB988) +/* B7C70 80121570 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B7C74 80121574 0804862B */ j .L801218AC /* B7C78 80121578 AC820004 */ sw $v0, 4($a0) /* B7C7C 8012157C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -265,10 +265,10 @@ glabel func_80121184 /* B7C88 80121588 0040202D */ daddu $a0, $v0, $zero /* B7C8C 8012158C 24420008 */ addiu $v0, $v0, 8 /* B7C90 80121590 AC620000 */ sw $v0, ($v1) -/* B7C94 80121594 3C02DE00 */ lui $v0, %hi(D_DDFFBA48) +/* B7C94 80121594 3C02DE00 */ lui $v0, 0xde00 /* B7C98 80121598 AC820000 */ sw $v0, ($a0) /* B7C9C 8012159C 3C028015 */ lui $v0, %hi(D_8014BA48) -/* B7CA0 801215A0 2442BA48 */ addiu $v0, $v0, %lo(D_DDFFBA48) +/* B7CA0 801215A0 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B7CA4 801215A4 0804862B */ j .L801218AC /* B7CA8 801215A8 AC820004 */ sw $v0, 4($a0) /* B7CAC 801215AC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -277,10 +277,10 @@ glabel func_80121184 /* B7CB8 801215B8 0040202D */ daddu $a0, $v0, $zero /* B7CBC 801215BC 24420008 */ addiu $v0, $v0, 8 /* B7CC0 801215C0 AC620000 */ sw $v0, ($v1) -/* B7CC4 801215C4 3C02DE00 */ lui $v0, %hi(D_DDFFBA70) +/* B7CC4 801215C4 3C02DE00 */ lui $v0, 0xde00 /* B7CC8 801215C8 AC820000 */ sw $v0, ($a0) /* B7CCC 801215CC 3C028015 */ lui $v0, %hi(D_8014BA70) -/* B7CD0 801215D0 2442BA70 */ addiu $v0, $v0, %lo(D_DDFFBA70) +/* B7CD0 801215D0 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B7CD4 801215D4 0804862B */ j .L801218AC /* B7CD8 801215D8 AC820004 */ sw $v0, 4($a0) /* B7CDC 801215DC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -289,10 +289,10 @@ glabel func_80121184 /* B7CE8 801215E8 0040202D */ daddu $a0, $v0, $zero /* B7CEC 801215EC 24420008 */ addiu $v0, $v0, 8 /* B7CF0 801215F0 AC620000 */ sw $v0, ($v1) -/* B7CF4 801215F4 3C02DE00 */ lui $v0, %hi(D_DDFFBA98) +/* B7CF4 801215F4 3C02DE00 */ lui $v0, 0xde00 /* B7CF8 801215F8 AC820000 */ sw $v0, ($a0) /* B7CFC 801215FC 3C028015 */ lui $v0, %hi(D_8014BA98) -/* B7D00 80121600 2442BA98 */ addiu $v0, $v0, %lo(D_DDFFBA98) +/* B7D00 80121600 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B7D04 80121604 0804862B */ j .L801218AC /* B7D08 80121608 AC820004 */ sw $v0, 4($a0) /* B7D0C 8012160C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -301,10 +301,10 @@ glabel func_80121184 /* B7D18 80121618 0040202D */ daddu $a0, $v0, $zero /* B7D1C 8012161C 24420008 */ addiu $v0, $v0, 8 /* B7D20 80121620 AC620000 */ sw $v0, ($v1) -/* B7D24 80121624 3C02DE00 */ lui $v0, %hi(D_DDFFBAE8) +/* B7D24 80121624 3C02DE00 */ lui $v0, 0xde00 /* B7D28 80121628 AC820000 */ sw $v0, ($a0) /* B7D2C 8012162C 3C028015 */ lui $v0, %hi(D_8014BAE8) -/* B7D30 80121630 2442BAE8 */ addiu $v0, $v0, %lo(D_DDFFBAE8) +/* B7D30 80121630 2442BAE8 */ addiu $v0, $v0, %lo(D_8014BAE8) /* B7D34 80121634 0804862B */ j .L801218AC /* B7D38 80121638 AC820004 */ sw $v0, 4($a0) .L8012163C: @@ -326,10 +326,10 @@ glabel func_80121184 /* B7D78 80121678 0040202D */ daddu $a0, $v0, $zero /* B7D7C 8012167C 24420008 */ addiu $v0, $v0, 8 /* B7D80 80121680 AC620000 */ sw $v0, ($v1) -/* B7D84 80121684 3C02DE00 */ lui $v0, %hi(D_DDFFBE78) +/* B7D84 80121684 3C02DE00 */ lui $v0, 0xde00 /* B7D88 80121688 AC820000 */ sw $v0, ($a0) /* B7D8C 8012168C 3C028015 */ lui $v0, %hi(D_8014BE78) -/* B7D90 80121690 2442BE78 */ addiu $v0, $v0, %lo(D_DDFFBE78) +/* B7D90 80121690 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B7D94 80121694 080485EE */ j .L801217B8 /* B7D98 80121698 AC820004 */ sw $v0, 4($a0) /* B7D9C 8012169C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -338,10 +338,10 @@ glabel func_80121184 /* B7DA8 801216A8 0040202D */ daddu $a0, $v0, $zero /* B7DAC 801216AC 24420008 */ addiu $v0, $v0, 8 /* B7DB0 801216B0 AC620000 */ sw $v0, ($v1) -/* B7DB4 801216B4 3C02DE00 */ lui $v0, %hi(D_DDFFBEA0) +/* B7DB4 801216B4 3C02DE00 */ lui $v0, 0xde00 /* B7DB8 801216B8 AC820000 */ sw $v0, ($a0) /* B7DBC 801216BC 3C028015 */ lui $v0, %hi(D_8014BEA0) -/* B7DC0 801216C0 2442BEA0 */ addiu $v0, $v0, %lo(D_DDFFBEA0) +/* B7DC0 801216C0 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B7DC4 801216C4 080485EE */ j .L801217B8 /* B7DC8 801216C8 AC820004 */ sw $v0, 4($a0) /* B7DCC 801216CC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -350,10 +350,10 @@ glabel func_80121184 /* B7DD8 801216D8 0040202D */ daddu $a0, $v0, $zero /* B7DDC 801216DC 24420008 */ addiu $v0, $v0, 8 /* B7DE0 801216E0 AC620000 */ sw $v0, ($v1) -/* B7DE4 801216E4 3C02DE00 */ lui $v0, %hi(D_DDFFBEC8) +/* B7DE4 801216E4 3C02DE00 */ lui $v0, 0xde00 /* B7DE8 801216E8 AC820000 */ sw $v0, ($a0) /* B7DEC 801216EC 3C028015 */ lui $v0, %hi(D_8014BEC8) -/* B7DF0 801216F0 2442BEC8 */ addiu $v0, $v0, %lo(D_DDFFBEC8) +/* B7DF0 801216F0 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B7DF4 801216F4 080485EE */ j .L801217B8 /* B7DF8 801216F8 AC820004 */ sw $v0, 4($a0) /* B7DFC 801216FC 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -362,10 +362,10 @@ glabel func_80121184 /* B7E08 80121708 0040202D */ daddu $a0, $v0, $zero /* B7E0C 8012170C 24420008 */ addiu $v0, $v0, 8 /* B7E10 80121710 AC620000 */ sw $v0, ($v1) -/* B7E14 80121714 3C02DE00 */ lui $v0, %hi(D_DDFFBEF0) +/* B7E14 80121714 3C02DE00 */ lui $v0, 0xde00 /* B7E18 80121718 AC820000 */ sw $v0, ($a0) /* B7E1C 8012171C 3C028015 */ lui $v0, %hi(D_8014BEF0) -/* B7E20 80121720 2442BEF0 */ addiu $v0, $v0, %lo(D_DDFFBEF0) +/* B7E20 80121720 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B7E24 80121724 080485EE */ j .L801217B8 /* B7E28 80121728 AC820004 */ sw $v0, 4($a0) /* B7E2C 8012172C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -374,10 +374,10 @@ glabel func_80121184 /* B7E38 80121738 0040202D */ daddu $a0, $v0, $zero /* B7E3C 8012173C 24420008 */ addiu $v0, $v0, 8 /* B7E40 80121740 AC620000 */ sw $v0, ($v1) -/* B7E44 80121744 3C02DE00 */ lui $v0, %hi(D_DDFFBF18) +/* B7E44 80121744 3C02DE00 */ lui $v0, 0xde00 /* B7E48 80121748 AC820000 */ sw $v0, ($a0) /* B7E4C 8012174C 3C028015 */ lui $v0, %hi(D_8014BF18) -/* B7E50 80121750 2442BF18 */ addiu $v0, $v0, %lo(D_DDFFBF18) +/* B7E50 80121750 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B7E54 80121754 080485EE */ j .L801217B8 /* B7E58 80121758 AC820004 */ sw $v0, 4($a0) /* B7E5C 8012175C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -386,10 +386,10 @@ glabel func_80121184 /* B7E68 80121768 0040202D */ daddu $a0, $v0, $zero /* B7E6C 8012176C 24420008 */ addiu $v0, $v0, 8 /* B7E70 80121770 AC620000 */ sw $v0, ($v1) -/* B7E74 80121774 3C02DE00 */ lui $v0, %hi(D_DDFFBF40) +/* B7E74 80121774 3C02DE00 */ lui $v0, 0xde00 /* B7E78 80121778 AC820000 */ sw $v0, ($a0) /* B7E7C 8012177C 3C028015 */ lui $v0, %hi(D_8014BF40) -/* B7E80 80121780 2442BF40 */ addiu $v0, $v0, %lo(D_DDFFBF40) +/* B7E80 80121780 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B7E84 80121784 080485EE */ j .L801217B8 /* B7E88 80121788 AC820004 */ sw $v0, 4($a0) /* B7E8C 8012178C 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -398,10 +398,10 @@ glabel func_80121184 /* B7E98 80121798 0040202D */ daddu $a0, $v0, $zero /* B7E9C 8012179C 24420008 */ addiu $v0, $v0, 8 /* B7EA0 801217A0 AC620000 */ sw $v0, ($v1) -/* B7EA4 801217A4 3C02DE00 */ lui $v0, %hi(D_DDFFBF68) +/* B7EA4 801217A4 3C02DE00 */ lui $v0, 0xde00 /* B7EA8 801217A8 AC820000 */ sw $v0, ($a0) /* B7EAC 801217AC 3C028015 */ lui $v0, %hi(D_8014BF68) -/* B7EB0 801217B0 2442BF68 */ addiu $v0, $v0, %lo(D_DDFFBF68) +/* B7EB0 801217B0 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B7EB4 801217B4 AC820004 */ sw $v0, 4($a0) .L801217B8: /* B7EB8 801217B8 3C070001 */ lui $a3, 1 @@ -443,11 +443,11 @@ glabel func_80121184 /* B7F38 80121838 8D060000 */ lw $a2, ($t0) /* B7F3C 8012183C 00C0482D */ daddu $t1, $a2, $zero /* B7F40 80121840 24C60008 */ addiu $a2, $a2, 8 -/* B7F44 80121844 3C02F800 */ lui $v0, %hi(D_F800437F) +/* B7F44 80121844 3C02F800 */ lui $v0, 0xf800 /* B7F48 80121848 AD060000 */ sw $a2, ($t0) /* B7F4C 8012184C AD220000 */ sw $v0, ($t1) /* B7F50 80121850 3C028015 */ lui $v0, %hi(D_8015437F) -/* B7F54 80121854 9042437F */ lbu $v0, %lo(D_F800437F)($v0) +/* B7F54 80121854 9042437F */ lbu $v0, %lo(D_8015437F)($v0) /* B7F58 80121858 3C038015 */ lui $v1, %hi(D_80154383) /* B7F5C 8012185C 90634383 */ lbu $v1, %lo(D_80154383)($v1) /* B7F60 80121860 3C048015 */ lui $a0, %hi(D_80154387) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s index 61c1a0797a..27b4ae80c9 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s @@ -122,10 +122,10 @@ glabel func_80122288 /* B8B4C 8012244C 0040202D */ daddu $a0, $v0, $zero /* B8B50 80122450 24420008 */ addiu $v0, $v0, 8 /* B8B54 80122454 AC620000 */ sw $v0, ($v1) -/* B8B58 80122458 3C02DE00 */ lui $v0, %hi(D_DDFFB7F8) +/* B8B58 80122458 3C02DE00 */ lui $v0, 0xde00 /* B8B5C 8012245C AC820000 */ sw $v0, ($a0) /* B8B60 80122460 3C028015 */ lui $v0, %hi(D_8014B7F8) -/* B8B64 80122464 2442B7F8 */ addiu $v0, $v0, %lo(D_DDFFB7F8) +/* B8B64 80122464 2442B7F8 */ addiu $v0, $v0, %lo(D_8014B7F8) /* B8B68 80122468 08048A60 */ j .L80122980 /* B8B6C 8012246C AC820004 */ sw $v0, 4($a0) /* B8B70 80122470 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -134,10 +134,10 @@ glabel func_80122288 /* B8B7C 8012247C 0040202D */ daddu $a0, $v0, $zero /* B8B80 80122480 24420008 */ addiu $v0, $v0, 8 /* B8B84 80122484 AC620000 */ sw $v0, ($v1) -/* B8B88 80122488 3C02DE00 */ lui $v0, %hi(D_DDFFB820) +/* B8B88 80122488 3C02DE00 */ lui $v0, 0xde00 /* B8B8C 8012248C AC820000 */ sw $v0, ($a0) /* B8B90 80122490 3C028015 */ lui $v0, %hi(D_8014B820) -/* B8B94 80122494 2442B820 */ addiu $v0, $v0, %lo(D_DDFFB820) +/* B8B94 80122494 2442B820 */ addiu $v0, $v0, %lo(D_8014B820) /* B8B98 80122498 08048A60 */ j .L80122980 /* B8B9C 8012249C AC820004 */ sw $v0, 4($a0) /* B8BA0 801224A0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -146,10 +146,10 @@ glabel func_80122288 /* B8BAC 801224AC 0040202D */ daddu $a0, $v0, $zero /* B8BB0 801224B0 24420008 */ addiu $v0, $v0, 8 /* B8BB4 801224B4 AC620000 */ sw $v0, ($v1) -/* B8BB8 801224B8 3C02DE00 */ lui $v0, %hi(D_DDFFB848) +/* B8BB8 801224B8 3C02DE00 */ lui $v0, 0xde00 /* B8BBC 801224BC AC820000 */ sw $v0, ($a0) /* B8BC0 801224C0 3C028015 */ lui $v0, %hi(D_8014B848) -/* B8BC4 801224C4 2442B848 */ addiu $v0, $v0, %lo(D_DDFFB848) +/* B8BC4 801224C4 2442B848 */ addiu $v0, $v0, %lo(D_8014B848) /* B8BC8 801224C8 08048A60 */ j .L80122980 /* B8BCC 801224CC AC820004 */ sw $v0, 4($a0) /* B8BD0 801224D0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -158,10 +158,10 @@ glabel func_80122288 /* B8BDC 801224DC 0040202D */ daddu $a0, $v0, $zero /* B8BE0 801224E0 24420008 */ addiu $v0, $v0, 8 /* B8BE4 801224E4 AC620000 */ sw $v0, ($v1) -/* B8BE8 801224E8 3C02DE00 */ lui $v0, %hi(D_DDFFB870) +/* B8BE8 801224E8 3C02DE00 */ lui $v0, 0xde00 /* B8BEC 801224EC AC820000 */ sw $v0, ($a0) /* B8BF0 801224F0 3C028015 */ lui $v0, %hi(D_8014B870) -/* B8BF4 801224F4 2442B870 */ addiu $v0, $v0, %lo(D_DDFFB870) +/* B8BF4 801224F4 2442B870 */ addiu $v0, $v0, %lo(D_8014B870) /* B8BF8 801224F8 08048A60 */ j .L80122980 /* B8BFC 801224FC AC820004 */ sw $v0, 4($a0) /* B8C00 80122500 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -170,10 +170,10 @@ glabel func_80122288 /* B8C0C 8012250C 0040202D */ daddu $a0, $v0, $zero /* B8C10 80122510 24420008 */ addiu $v0, $v0, 8 /* B8C14 80122514 AC620000 */ sw $v0, ($v1) -/* B8C18 80122518 3C02DE00 */ lui $v0, %hi(D_DDFFB898) +/* B8C18 80122518 3C02DE00 */ lui $v0, 0xde00 /* B8C1C 8012251C AC820000 */ sw $v0, ($a0) /* B8C20 80122520 3C028015 */ lui $v0, %hi(D_8014B898) -/* B8C24 80122524 2442B898 */ addiu $v0, $v0, %lo(D_DDFFB898) +/* B8C24 80122524 2442B898 */ addiu $v0, $v0, %lo(D_8014B898) /* B8C28 80122528 08048A60 */ j .L80122980 /* B8C2C 8012252C AC820004 */ sw $v0, 4($a0) /* B8C30 80122530 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -182,10 +182,10 @@ glabel func_80122288 /* B8C3C 8012253C 0040202D */ daddu $a0, $v0, $zero /* B8C40 80122540 24420008 */ addiu $v0, $v0, 8 /* B8C44 80122544 AC620000 */ sw $v0, ($v1) -/* B8C48 80122548 3C02DE00 */ lui $v0, %hi(D_DDFFB9B0) +/* B8C48 80122548 3C02DE00 */ lui $v0, 0xde00 /* B8C4C 8012254C AC820000 */ sw $v0, ($a0) /* B8C50 80122550 3C028015 */ lui $v0, %hi(D_8014B9B0) -/* B8C54 80122554 2442B9B0 */ addiu $v0, $v0, %lo(D_DDFFB9B0) +/* B8C54 80122554 2442B9B0 */ addiu $v0, $v0, %lo(D_8014B9B0) /* B8C58 80122558 08048A60 */ j .L80122980 /* B8C5C 8012255C AC820004 */ sw $v0, 4($a0) /* B8C60 80122560 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -194,10 +194,10 @@ glabel func_80122288 /* B8C6C 8012256C 0040202D */ daddu $a0, $v0, $zero /* B8C70 80122570 24420008 */ addiu $v0, $v0, 8 /* B8C74 80122574 AC620000 */ sw $v0, ($v1) -/* B8C78 80122578 3C02DE00 */ lui $v0, %hi(D_DDFFB8C0) +/* B8C78 80122578 3C02DE00 */ lui $v0, 0xde00 /* B8C7C 8012257C AC820000 */ sw $v0, ($a0) /* B8C80 80122580 3C028015 */ lui $v0, %hi(D_8014B8C0) -/* B8C84 80122584 2442B8C0 */ addiu $v0, $v0, %lo(D_DDFFB8C0) +/* B8C84 80122584 2442B8C0 */ addiu $v0, $v0, %lo(D_8014B8C0) /* B8C88 80122588 08048A60 */ j .L80122980 /* B8C8C 8012258C AC820004 */ sw $v0, 4($a0) /* B8C90 80122590 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -206,10 +206,10 @@ glabel func_80122288 /* B8C9C 8012259C 0040202D */ daddu $a0, $v0, $zero /* B8CA0 801225A0 24420008 */ addiu $v0, $v0, 8 /* B8CA4 801225A4 AC620000 */ sw $v0, ($v1) -/* B8CA8 801225A8 3C02DE00 */ lui $v0, %hi(D_DDFFB9D8) +/* B8CA8 801225A8 3C02DE00 */ lui $v0, 0xde00 /* B8CAC 801225AC AC820000 */ sw $v0, ($a0) /* B8CB0 801225B0 3C028015 */ lui $v0, %hi(D_8014B9D8) -/* B8CB4 801225B4 2442B9D8 */ addiu $v0, $v0, %lo(D_DDFFB9D8) +/* B8CB4 801225B4 2442B9D8 */ addiu $v0, $v0, %lo(D_8014B9D8) /* B8CB8 801225B8 08048A60 */ j .L80122980 /* B8CBC 801225BC AC820004 */ sw $v0, 4($a0) /* B8CC0 801225C0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -218,10 +218,10 @@ glabel func_80122288 /* B8CCC 801225CC 0040202D */ daddu $a0, $v0, $zero /* B8CD0 801225D0 24420008 */ addiu $v0, $v0, 8 /* B8CD4 801225D4 AC620000 */ sw $v0, ($v1) -/* B8CD8 801225D8 3C02DE00 */ lui $v0, %hi(D_DDFFB8E8) +/* B8CD8 801225D8 3C02DE00 */ lui $v0, 0xde00 /* B8CDC 801225DC AC820000 */ sw $v0, ($a0) /* B8CE0 801225E0 3C028015 */ lui $v0, %hi(D_8014B8E8) -/* B8CE4 801225E4 2442B8E8 */ addiu $v0, $v0, %lo(D_DDFFB8E8) +/* B8CE4 801225E4 2442B8E8 */ addiu $v0, $v0, %lo(D_8014B8E8) /* B8CE8 801225E8 08048A60 */ j .L80122980 /* B8CEC 801225EC AC820004 */ sw $v0, 4($a0) /* B8CF0 801225F0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -230,10 +230,10 @@ glabel func_80122288 /* B8CFC 801225FC 0040202D */ daddu $a0, $v0, $zero /* B8D00 80122600 24420008 */ addiu $v0, $v0, 8 /* B8D04 80122604 AC620000 */ sw $v0, ($v1) -/* B8D08 80122608 3C02DE00 */ lui $v0, %hi(D_DDFFBA00) +/* B8D08 80122608 3C02DE00 */ lui $v0, 0xde00 /* B8D0C 8012260C AC820000 */ sw $v0, ($a0) /* B8D10 80122610 3C028015 */ lui $v0, %hi(D_8014BA00) -/* B8D14 80122614 2442BA00 */ addiu $v0, $v0, %lo(D_DDFFBA00) +/* B8D14 80122614 2442BA00 */ addiu $v0, $v0, %lo(D_8014BA00) /* B8D18 80122618 08048A60 */ j .L80122980 /* B8D1C 8012261C AC820004 */ sw $v0, 4($a0) /* B8D20 80122620 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -242,10 +242,10 @@ glabel func_80122288 /* B8D2C 8012262C 0040202D */ daddu $a0, $v0, $zero /* B8D30 80122630 24420008 */ addiu $v0, $v0, 8 /* B8D34 80122634 AC620000 */ sw $v0, ($v1) -/* B8D38 80122638 3C02DE00 */ lui $v0, %hi(D_DDFFB988) +/* B8D38 80122638 3C02DE00 */ lui $v0, 0xde00 /* B8D3C 8012263C AC820000 */ sw $v0, ($a0) /* B8D40 80122640 3C028015 */ lui $v0, %hi(D_8014B988) -/* B8D44 80122644 2442B988 */ addiu $v0, $v0, %lo(D_DDFFB988) +/* B8D44 80122644 2442B988 */ addiu $v0, $v0, %lo(D_8014B988) /* B8D48 80122648 08048A60 */ j .L80122980 /* B8D4C 8012264C AC820004 */ sw $v0, 4($a0) /* B8D50 80122650 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -254,10 +254,10 @@ glabel func_80122288 /* B8D5C 8012265C 0040202D */ daddu $a0, $v0, $zero /* B8D60 80122660 24420008 */ addiu $v0, $v0, 8 /* B8D64 80122664 AC620000 */ sw $v0, ($v1) -/* B8D68 80122668 3C02DE00 */ lui $v0, %hi(D_DDFFBA48) +/* B8D68 80122668 3C02DE00 */ lui $v0, 0xde00 /* B8D6C 8012266C AC820000 */ sw $v0, ($a0) /* B8D70 80122670 3C028015 */ lui $v0, %hi(D_8014BA48) -/* B8D74 80122674 2442BA48 */ addiu $v0, $v0, %lo(D_DDFFBA48) +/* B8D74 80122674 2442BA48 */ addiu $v0, $v0, %lo(D_8014BA48) /* B8D78 80122678 08048A60 */ j .L80122980 /* B8D7C 8012267C AC820004 */ sw $v0, 4($a0) /* B8D80 80122680 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -266,10 +266,10 @@ glabel func_80122288 /* B8D8C 8012268C 0040202D */ daddu $a0, $v0, $zero /* B8D90 80122690 24420008 */ addiu $v0, $v0, 8 /* B8D94 80122694 AC620000 */ sw $v0, ($v1) -/* B8D98 80122698 3C02DE00 */ lui $v0, %hi(D_DDFFBA70) +/* B8D98 80122698 3C02DE00 */ lui $v0, 0xde00 /* B8D9C 8012269C AC820000 */ sw $v0, ($a0) /* B8DA0 801226A0 3C028015 */ lui $v0, %hi(D_8014BA70) -/* B8DA4 801226A4 2442BA70 */ addiu $v0, $v0, %lo(D_DDFFBA70) +/* B8DA4 801226A4 2442BA70 */ addiu $v0, $v0, %lo(D_8014BA70) /* B8DA8 801226A8 08048A60 */ j .L80122980 /* B8DAC 801226AC AC820004 */ sw $v0, 4($a0) /* B8DB0 801226B0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -278,10 +278,10 @@ glabel func_80122288 /* B8DBC 801226BC 0040202D */ daddu $a0, $v0, $zero /* B8DC0 801226C0 24420008 */ addiu $v0, $v0, 8 /* B8DC4 801226C4 AC620000 */ sw $v0, ($v1) -/* B8DC8 801226C8 3C02DE00 */ lui $v0, %hi(D_DDFFBA98) +/* B8DC8 801226C8 3C02DE00 */ lui $v0, 0xde00 /* B8DCC 801226CC AC820000 */ sw $v0, ($a0) /* B8DD0 801226D0 3C028015 */ lui $v0, %hi(D_8014BA98) -/* B8DD4 801226D4 2442BA98 */ addiu $v0, $v0, %lo(D_DDFFBA98) +/* B8DD4 801226D4 2442BA98 */ addiu $v0, $v0, %lo(D_8014BA98) /* B8DD8 801226D8 08048A60 */ j .L80122980 /* B8DDC 801226DC AC820004 */ sw $v0, 4($a0) /* B8DE0 801226E0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -290,10 +290,10 @@ glabel func_80122288 /* B8DEC 801226EC 0040202D */ daddu $a0, $v0, $zero /* B8DF0 801226F0 24420008 */ addiu $v0, $v0, 8 /* B8DF4 801226F4 AC620000 */ sw $v0, ($v1) -/* B8DF8 801226F8 3C02DE00 */ lui $v0, %hi(D_DDFFBAE8) +/* B8DF8 801226F8 3C02DE00 */ lui $v0, 0xde00 /* B8DFC 801226FC AC820000 */ sw $v0, ($a0) /* B8E00 80122700 3C028015 */ lui $v0, %hi(D_8014BAE8) -/* B8E04 80122704 2442BAE8 */ addiu $v0, $v0, %lo(D_DDFFBAE8) +/* B8E04 80122704 2442BAE8 */ addiu $v0, $v0, %lo(D_8014BAE8) /* B8E08 80122708 08048A60 */ j .L80122980 /* B8E0C 8012270C AC820004 */ sw $v0, 4($a0) .L80122710: @@ -315,10 +315,10 @@ glabel func_80122288 /* B8E4C 8012274C 0040202D */ daddu $a0, $v0, $zero /* B8E50 80122750 24420008 */ addiu $v0, $v0, 8 /* B8E54 80122754 AC620000 */ sw $v0, ($v1) -/* B8E58 80122758 3C02DE00 */ lui $v0, %hi(D_DDFFBE78) +/* B8E58 80122758 3C02DE00 */ lui $v0, 0xde00 /* B8E5C 8012275C AC820000 */ sw $v0, ($a0) /* B8E60 80122760 3C028015 */ lui $v0, %hi(D_8014BE78) -/* B8E64 80122764 2442BE78 */ addiu $v0, $v0, %lo(D_DDFFBE78) +/* B8E64 80122764 2442BE78 */ addiu $v0, $v0, %lo(D_8014BE78) /* B8E68 80122768 08048A23 */ j .L8012288C /* B8E6C 8012276C AC820004 */ sw $v0, 4($a0) /* B8E70 80122770 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -327,10 +327,10 @@ glabel func_80122288 /* B8E7C 8012277C 0040202D */ daddu $a0, $v0, $zero /* B8E80 80122780 24420008 */ addiu $v0, $v0, 8 /* B8E84 80122784 AC620000 */ sw $v0, ($v1) -/* B8E88 80122788 3C02DE00 */ lui $v0, %hi(D_DDFFBEA0) +/* B8E88 80122788 3C02DE00 */ lui $v0, 0xde00 /* B8E8C 8012278C AC820000 */ sw $v0, ($a0) /* B8E90 80122790 3C028015 */ lui $v0, %hi(D_8014BEA0) -/* B8E94 80122794 2442BEA0 */ addiu $v0, $v0, %lo(D_DDFFBEA0) +/* B8E94 80122794 2442BEA0 */ addiu $v0, $v0, %lo(D_8014BEA0) /* B8E98 80122798 08048A23 */ j .L8012288C /* B8E9C 8012279C AC820004 */ sw $v0, 4($a0) /* B8EA0 801227A0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -339,10 +339,10 @@ glabel func_80122288 /* B8EAC 801227AC 0040202D */ daddu $a0, $v0, $zero /* B8EB0 801227B0 24420008 */ addiu $v0, $v0, 8 /* B8EB4 801227B4 AC620000 */ sw $v0, ($v1) -/* B8EB8 801227B8 3C02DE00 */ lui $v0, %hi(D_DDFFBEC8) +/* B8EB8 801227B8 3C02DE00 */ lui $v0, 0xde00 /* B8EBC 801227BC AC820000 */ sw $v0, ($a0) /* B8EC0 801227C0 3C028015 */ lui $v0, %hi(D_8014BEC8) -/* B8EC4 801227C4 2442BEC8 */ addiu $v0, $v0, %lo(D_DDFFBEC8) +/* B8EC4 801227C4 2442BEC8 */ addiu $v0, $v0, %lo(D_8014BEC8) /* B8EC8 801227C8 08048A23 */ j .L8012288C /* B8ECC 801227CC AC820004 */ sw $v0, 4($a0) /* B8ED0 801227D0 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -351,10 +351,10 @@ glabel func_80122288 /* B8EDC 801227DC 0040202D */ daddu $a0, $v0, $zero /* B8EE0 801227E0 24420008 */ addiu $v0, $v0, 8 /* B8EE4 801227E4 AC620000 */ sw $v0, ($v1) -/* B8EE8 801227E8 3C02DE00 */ lui $v0, %hi(D_DDFFBEF0) +/* B8EE8 801227E8 3C02DE00 */ lui $v0, 0xde00 /* B8EEC 801227EC AC820000 */ sw $v0, ($a0) /* B8EF0 801227F0 3C028015 */ lui $v0, %hi(D_8014BEF0) -/* B8EF4 801227F4 2442BEF0 */ addiu $v0, $v0, %lo(D_DDFFBEF0) +/* B8EF4 801227F4 2442BEF0 */ addiu $v0, $v0, %lo(D_8014BEF0) /* B8EF8 801227F8 08048A23 */ j .L8012288C /* B8EFC 801227FC AC820004 */ sw $v0, 4($a0) /* B8F00 80122800 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -363,10 +363,10 @@ glabel func_80122288 /* B8F0C 8012280C 0040202D */ daddu $a0, $v0, $zero /* B8F10 80122810 24420008 */ addiu $v0, $v0, 8 /* B8F14 80122814 AC620000 */ sw $v0, ($v1) -/* B8F18 80122818 3C02DE00 */ lui $v0, %hi(D_DDFFBF18) +/* B8F18 80122818 3C02DE00 */ lui $v0, 0xde00 /* B8F1C 8012281C AC820000 */ sw $v0, ($a0) /* B8F20 80122820 3C028015 */ lui $v0, %hi(D_8014BF18) -/* B8F24 80122824 2442BF18 */ addiu $v0, $v0, %lo(D_DDFFBF18) +/* B8F24 80122824 2442BF18 */ addiu $v0, $v0, %lo(D_8014BF18) /* B8F28 80122828 08048A23 */ j .L8012288C /* B8F2C 8012282C AC820004 */ sw $v0, 4($a0) /* B8F30 80122830 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -375,10 +375,10 @@ glabel func_80122288 /* B8F3C 8012283C 0040202D */ daddu $a0, $v0, $zero /* B8F40 80122840 24420008 */ addiu $v0, $v0, 8 /* B8F44 80122844 AC620000 */ sw $v0, ($v1) -/* B8F48 80122848 3C02DE00 */ lui $v0, %hi(D_DDFFBF40) +/* B8F48 80122848 3C02DE00 */ lui $v0, 0xde00 /* B8F4C 8012284C AC820000 */ sw $v0, ($a0) /* B8F50 80122850 3C028015 */ lui $v0, %hi(D_8014BF40) -/* B8F54 80122854 2442BF40 */ addiu $v0, $v0, %lo(D_DDFFBF40) +/* B8F54 80122854 2442BF40 */ addiu $v0, $v0, %lo(D_8014BF40) /* B8F58 80122858 08048A23 */ j .L8012288C /* B8F5C 8012285C AC820004 */ sw $v0, 4($a0) /* B8F60 80122860 3C03800A */ lui $v1, %hi(D_8009A66C) @@ -387,10 +387,10 @@ glabel func_80122288 /* B8F6C 8012286C 0040202D */ daddu $a0, $v0, $zero /* B8F70 80122870 24420008 */ addiu $v0, $v0, 8 /* B8F74 80122874 AC620000 */ sw $v0, ($v1) -/* B8F78 80122878 3C02DE00 */ lui $v0, %hi(D_DDFFBF68) +/* B8F78 80122878 3C02DE00 */ lui $v0, 0xde00 /* B8F7C 8012287C AC820000 */ sw $v0, ($a0) /* B8F80 80122880 3C028015 */ lui $v0, %hi(D_8014BF68) -/* B8F84 80122884 2442BF68 */ addiu $v0, $v0, %lo(D_DDFFBF68) +/* B8F84 80122884 2442BF68 */ addiu $v0, $v0, %lo(D_8014BF68) /* B8F88 80122888 AC820004 */ sw $v0, 4($a0) .L8012288C: /* B8F8C 8012288C 3C070001 */ lui $a3, 1 @@ -432,11 +432,11 @@ glabel func_80122288 /* B900C 8012290C 8D060000 */ lw $a2, ($t0) /* B9010 80122910 00C0482D */ daddu $t1, $a2, $zero /* B9014 80122914 24C60008 */ addiu $a2, $a2, 8 -/* B9018 80122918 3C02F800 */ lui $v0, %hi(D_F800437F) +/* B9018 80122918 3C02F800 */ lui $v0, 0xf800 /* B901C 8012291C AD060000 */ sw $a2, ($t0) /* B9020 80122920 AD220000 */ sw $v0, ($t1) /* B9024 80122924 3C028015 */ lui $v0, %hi(D_8015437F) -/* B9028 80122928 9042437F */ lbu $v0, %lo(D_F800437F)($v0) +/* B9028 80122928 9042437F */ lbu $v0, %lo(D_8015437F)($v0) /* B902C 8012292C 3C038015 */ lui $v1, %hi(D_80154383) /* B9030 80122930 90634383 */ lbu $v1, %lo(D_80154383)($v1) /* B9034 80122934 3C048015 */ lui $a0, %hi(D_80154387) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s index 565441a2e2..3a45c861dc 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s @@ -34,10 +34,10 @@ glabel func_80126790 /* BCF04 80126804 24620008 */ addiu $v0, $v1, 8 /* BCF08 80126808 ACC00004 */ sw $zero, 4($a2) /* BCF0C 8012680C ACA20000 */ sw $v0, ($a1) -/* BCF10 80126810 3C02DE00 */ lui $v0, %hi(D_DDFFC2D8) +/* BCF10 80126810 3C02DE00 */ lui $v0, 0xde00 /* BCF14 80126814 AC620000 */ sw $v0, ($v1) /* BCF18 80126818 3C028015 */ lui $v0, %hi(D_8014C2D8) -/* BCF1C 8012681C 2442C2D8 */ addiu $v0, $v0, %lo(D_DDFFC2D8) +/* BCF1C 8012681C 2442C2D8 */ addiu $v0, $v0, %lo(D_8014C2D8) /* BCF20 80126820 3C058015 */ lui $a1, %hi(D_80154C30) /* BCF24 80126824 24A54C30 */ addiu $a1, $a1, %lo(D_80154C30) /* BCF28 80126828 AC620004 */ sw $v0, 4($v1) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s index c7e218614a..f094e25c0a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s @@ -3041,10 +3041,10 @@ glabel func_80127D90 /* C1290 8012AB90 AC400004 */ sw $zero, 4($v0) /* C1294 8012AB94 24620008 */ addiu $v0, $v1, 8 /* C1298 8012AB98 AEE20000 */ sw $v0, ($s7) -/* C129C 8012AB9C 3C02DE00 */ lui $v0, %hi(D_DDFFC500) +/* C129C 8012AB9C 3C02DE00 */ lui $v0, 0xde00 /* C12A0 8012ABA0 AC620000 */ sw $v0, ($v1) /* C12A4 8012ABA4 3C028015 */ lui $v0, %hi(D_8014C500) -/* C12A8 8012ABA8 2442C500 */ addiu $v0, $v0, %lo(D_DDFFC500) +/* C12A8 8012ABA8 2442C500 */ addiu $v0, $v0, %lo(D_8014C500) /* C12AC 8012ABAC AC620004 */ sw $v0, 4($v1) .L8012ABB0: /* C12B0 8012ABB0 3C058015 */ lui $a1, %hi(D_80155D74) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s index b6a15657a8..ac78ec1325 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s @@ -13,9 +13,9 @@ glabel func_8012C2E0 /* C2A00 8012C300 24430008 */ addiu $v1, $v0, 8 /* C2A04 8012C304 ACA00004 */ sw $zero, 4($a1) /* C2A08 8012C308 AC830000 */ sw $v1, ($a0) -/* C2A0C 8012C30C 3C03DE00 */ lui $v1, %hi(D_DDFFC500) +/* C2A0C 8012C30C 3C03DE00 */ lui $v1, 0xde00 /* C2A10 8012C310 AC430000 */ sw $v1, ($v0) /* C2A14 8012C314 3C038015 */ lui $v1, %hi(D_8014C500) -/* C2A18 8012C318 2463C500 */ addiu $v1, $v1, %lo(D_DDFFC500) +/* C2A18 8012C318 2463C500 */ addiu $v1, $v1, %lo(D_8014C500) /* C2A1C 8012C31C 03E00008 */ jr $ra /* C2A20 8012C320 AC430004 */ sw $v1, 4($v0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s index d1250819de..d536e22d2e 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s @@ -399,10 +399,10 @@ glabel func_8012D3DC /* C40C0 8012D9C0 AD280000 */ sw $t0, ($t1) /* C40C4 8012D9C4 AD200004 */ sw $zero, 4($t1) /* C40C8 8012D9C8 AC620014 */ sw $v0, 0x14($v1) -/* C40CC 8012D9CC 3C02FA00 */ lui $v0, %hi(D_F9FFBF70) +/* C40CC 8012D9CC 3C02FA00 */ lui $v0, 0xfa00 /* C40D0 8012D9D0 AC620018 */ sw $v0, 0x18($v1) /* C40D4 8012D9D4 3C02802F */ lui $v0, %hi(D_802EBF70) -/* C40D8 8012D9D8 2442BF70 */ addiu $v0, $v0, %lo(D_F9FFBF70) +/* C40D8 8012D9D8 2442BF70 */ addiu $v0, $v0, %lo(D_802EBF70) /* C40DC 8012D9DC AC730000 */ sw $s3, ($v1) /* C40E0 8012D9E0 AC6F0004 */ sw $t7, 4($v1) /* C40E4 8012D9E4 AC6C0008 */ sw $t4, 8($v1) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s index 4f9a6f8fe6..b74ea39b2c 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s @@ -377,10 +377,10 @@ glabel func_80136A80 /* CD71C 8013701C AC620000 */ sw $v0, ($v1) /* CD720 80137020 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* CD724 80137024 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CD728 80137028 3C02DE00 */ lui $v0, %hi(D_DDFFE670) +/* CD728 80137028 3C02DE00 */ lui $v0, 0xde00 /* CD72C 8013702C AD020000 */ sw $v0, ($t0) /* CD730 80137030 3C028015 */ lui $v0, %hi(D_8014E670) -/* CD734 80137034 2442E670 */ addiu $v0, $v0, %lo(D_DDFFE670) +/* CD734 80137034 2442E670 */ addiu $v0, $v0, %lo(D_8014E670) /* CD738 80137038 AD020004 */ sw $v0, 4($t0) /* CD73C 8013703C AFB40010 */ sw $s4, 0x10($sp) /* CD740 80137040 AFB50014 */ sw $s5, 0x14($sp) @@ -399,10 +399,10 @@ glabel func_80136A80 /* CD774 80137074 0040402D */ daddu $t0, $v0, $zero /* CD778 80137078 24420008 */ addiu $v0, $v0, 8 /* CD77C 8013707C AC620000 */ sw $v0, ($v1) -/* CD780 80137080 3C02DE00 */ lui $v0, %hi(D_DDFFE670) +/* CD780 80137080 3C02DE00 */ lui $v0, 0xde00 /* CD784 80137084 AD020000 */ sw $v0, ($t0) /* CD788 80137088 3C028015 */ lui $v0, %hi(D_8014E670) -/* CD78C 8013708C 2442E670 */ addiu $v0, $v0, %lo(D_DDFFE670) +/* CD78C 8013708C 2442E670 */ addiu $v0, $v0, %lo(D_8014E670) /* CD790 80137090 0804DC51 */ j .L80137144 /* CD794 80137094 0260382D */ daddu $a3, $s3, $zero /* CD798 80137098 240400A0 */ addiu $a0, $zero, 0xa0 @@ -421,10 +421,10 @@ glabel func_80136A80 /* CD7CC 801370CC AC620000 */ sw $v0, ($v1) /* CD7D0 801370D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* CD7D4 801370D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CD7D8 801370D8 3C02DE00 */ lui $v0, %hi(D_DDFFE6C0) +/* CD7D8 801370D8 3C02DE00 */ lui $v0, 0xde00 /* CD7DC 801370DC AD020000 */ sw $v0, ($t0) /* CD7E0 801370E0 3C028015 */ lui $v0, %hi(D_8014E6C0) -/* CD7E4 801370E4 2442E6C0 */ addiu $v0, $v0, %lo(D_DDFFE6C0) +/* CD7E4 801370E4 2442E6C0 */ addiu $v0, $v0, %lo(D_8014E6C0) /* CD7E8 801370E8 AD020004 */ sw $v0, 4($t0) /* CD7EC 801370EC AFB40010 */ sw $s4, 0x10($sp) /* CD7F0 801370F0 AFB50014 */ sw $s5, 0x14($sp) @@ -444,10 +444,10 @@ glabel func_80136A80 /* CD828 80137128 0040402D */ daddu $t0, $v0, $zero /* CD82C 8013712C 24420008 */ addiu $v0, $v0, 8 /* CD830 80137130 AC620000 */ sw $v0, ($v1) -/* CD834 80137134 3C02DE00 */ lui $v0, %hi(D_DDFFE6C0) +/* CD834 80137134 3C02DE00 */ lui $v0, 0xde00 /* CD838 80137138 AD020000 */ sw $v0, ($t0) /* CD83C 8013713C 3C028015 */ lui $v0, %hi(D_8014E6C0) -/* CD840 80137140 2442E6C0 */ addiu $v0, $v0, %lo(D_DDFFE6C0) +/* CD840 80137140 2442E6C0 */ addiu $v0, $v0, %lo(D_8014E6C0) .L80137144: /* CD844 80137144 AD020004 */ sw $v0, 4($t0) /* CD848 80137148 2402FFFF */ addiu $v0, $zero, -1 @@ -473,10 +473,10 @@ glabel func_80136A80 /* CD894 80137194 AC620000 */ sw $v0, ($v1) /* CD898 80137198 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* CD89C 8013719C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* CD8A0 801371A0 3C02DE00 */ lui $v0, %hi(D_DDFFE618) +/* CD8A0 801371A0 3C02DE00 */ lui $v0, 0xde00 /* CD8A4 801371A4 AD020000 */ sw $v0, ($t0) /* CD8A8 801371A8 3C028015 */ lui $v0, %hi(D_8014E618) -/* CD8AC 801371AC 2442E618 */ addiu $v0, $v0, %lo(D_DDFFE618) +/* CD8AC 801371AC 2442E618 */ addiu $v0, $v0, %lo(D_8014E618) /* CD8B0 801371B0 AD020004 */ sw $v0, 4($t0) /* CD8B4 801371B4 AFA00010 */ sw $zero, 0x10($sp) /* CD8B8 801371B8 AFA00014 */ sw $zero, 0x14($sp) @@ -495,10 +495,10 @@ glabel func_80136A80 /* CD8EC 801371EC 0040402D */ daddu $t0, $v0, $zero /* CD8F0 801371F0 24420008 */ addiu $v0, $v0, 8 /* CD8F4 801371F4 AC620000 */ sw $v0, ($v1) -/* CD8F8 801371F8 3C02DE00 */ lui $v0, %hi(D_DDFFE618) +/* CD8F8 801371F8 3C02DE00 */ lui $v0, 0xde00 /* CD8FC 801371FC AD020000 */ sw $v0, ($t0) /* CD900 80137200 3C028015 */ lui $v0, %hi(D_8014E618) -/* CD904 80137204 2442E618 */ addiu $v0, $v0, %lo(D_DDFFE618) +/* CD904 80137204 2442E618 */ addiu $v0, $v0, %lo(D_8014E618) /* CD908 80137208 AD020004 */ sw $v0, 4($t0) /* CD90C 8013720C 2402FFFF */ addiu $v0, $zero, -1 /* CD910 80137210 AFA00010 */ sw $zero, 0x10($sp) @@ -1087,10 +1087,10 @@ glabel func_80136A80 /* CE224 80137B24 AC820004 */ sw $v0, 4($a0) /* CE228 80137B28 25020008 */ addiu $v0, $t0, 8 /* CE22C 80137B2C AE420000 */ sw $v0, ($s2) -/* CE230 80137B30 3C02DE00 */ lui $v0, %hi(D_DDFFE8F0) +/* CE230 80137B30 3C02DE00 */ lui $v0, 0xde00 /* CE234 80137B34 AD020000 */ sw $v0, ($t0) /* CE238 80137B38 3C028015 */ lui $v0, %hi(D_8014E8F0) -/* CE23C 80137B3C 2442E8F0 */ addiu $v0, $v0, %lo(D_DDFFE8F0) +/* CE23C 80137B3C 2442E8F0 */ addiu $v0, $v0, %lo(D_8014E8F0) /* CE240 80137B40 AD020004 */ sw $v0, 4($t0) /* CE244 80137B44 25020010 */ addiu $v0, $t0, 0x10 /* CE248 80137B48 AE420000 */ sw $v0, ($s2) @@ -1200,10 +1200,10 @@ glabel func_80136A80 /* CE3D8 80137CD8 0040402D */ daddu $t0, $v0, $zero /* CE3DC 80137CDC 24420008 */ addiu $v0, $v0, 8 /* CE3E0 80137CE0 AC620000 */ sw $v0, ($v1) -/* CE3E4 80137CE4 3C02DE00 */ lui $v0, %hi(D_DDFFE718) +/* CE3E4 80137CE4 3C02DE00 */ lui $v0, 0xde00 /* CE3E8 80137CE8 AD020000 */ sw $v0, ($t0) /* CE3EC 80137CEC 3C028015 */ lui $v0, %hi(D_8014E718) -/* CE3F0 80137CF0 2442E718 */ addiu $v0, $v0, %lo(D_DDFFE718) +/* CE3F0 80137CF0 2442E718 */ addiu $v0, $v0, %lo(D_8014E718) /* CE3F4 80137CF4 AD020004 */ sw $v0, 4($t0) /* CE3F8 80137CF8 0C04E395 */ jal func_80138E54 /* CE3FC 80137CFC E7B80010 */ swc1 $f24, 0x10($sp) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s index 876651e680..12e766d720 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s @@ -8,11 +8,11 @@ glabel func_80138108 /* CE814 80138114 24830014 */ addiu $v1, $a0, 0x14 /* CE818 80138118 3C01437F */ lui $at, 0x437f /* CE81C 8013811C 44811000 */ mtc1 $at, $f2 -/* CE820 80138120 3C01BF80 */ lui $at, %hi(D_BF806900) +/* CE820 80138120 3C01BF80 */ lui $at, 0xbf80 /* CE824 80138124 44810000 */ mtc1 $at, $f0 /* CE828 80138128 2402FFFF */ addiu $v0, $zero, -1 /* CE82C 8013812C 3C018015 */ lui $at, %hi(D_80156900) -/* CE830 80138130 AC226900 */ sw $v0, %lo(D_BF806900)($at) +/* CE830 80138130 AC226900 */ sw $v0, %lo(D_80156900)($at) /* CE834 80138134 3C018015 */ lui $at, %hi(D_80156908) /* CE838 80138138 AC226908 */ sw $v0, %lo(D_80156908)($at) /* CE83C 8013813C 3C018015 */ lui $at, %hi(D_80156904) diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index 486486f279..30353dbe67 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s @@ -255,10 +255,10 @@ glabel func_80138E54 /* CF934 80139234 24820008 */ addiu $v0, $a0, 8 /* CF938 80139238 ACA30004 */ sw $v1, 4($a1) /* CF93C 8013923C AE420000 */ sw $v0, ($s2) -/* CF940 80139240 3C02DE00 */ lui $v0, %hi(D_DDFFEDE8) +/* CF940 80139240 3C02DE00 */ lui $v0, 0xde00 /* CF944 80139244 AC820000 */ sw $v0, ($a0) /* CF948 80139248 3C028015 */ lui $v0, %hi(D_8014EDE8) -/* CF94C 8013924C 2442EDE8 */ addiu $v0, $v0, %lo(D_DDFFEDE8) +/* CF94C 8013924C 2442EDE8 */ addiu $v0, $v0, %lo(D_8014EDE8) /* CF950 80139250 AC820004 */ sw $v0, 4($a0) /* CF954 80139254 24820010 */ addiu $v0, $a0, 0x10 /* CF958 80139258 AE420000 */ sw $v0, ($s2) @@ -382,10 +382,10 @@ glabel func_80138E54 /* CFB20 80139420 ACA20004 */ sw $v0, 4($a1) /* CFB24 80139424 24820008 */ addiu $v0, $a0, 8 /* CFB28 80139428 AE420000 */ sw $v0, ($s2) -/* CFB2C 8013942C 3C02DE00 */ lui $v0, %hi(D_DDFFEDE8) +/* CFB2C 8013942C 3C02DE00 */ lui $v0, 0xde00 /* CFB30 80139430 AC820000 */ sw $v0, ($a0) /* CFB34 80139434 3C028015 */ lui $v0, %hi(D_8014EDE8) -/* CFB38 80139438 2442EDE8 */ addiu $v0, $v0, %lo(D_DDFFEDE8) +/* CFB38 80139438 2442EDE8 */ addiu $v0, $v0, %lo(D_8014EDE8) /* CFB3C 8013943C AC820004 */ sw $v0, 4($a0) /* CFB40 80139440 24820010 */ addiu $v0, $a0, 0x10 /* CFB44 80139444 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index 4aba039f32..26577fdbd0 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -28,10 +28,10 @@ glabel func_8013B1B0 /* D190C 8013B20C ACA40000 */ sw $a0, ($a1) /* D1910 8013B210 24820008 */ addiu $v0, $a0, 8 /* D1914 8013B214 ACA20000 */ sw $v0, ($a1) -/* D1918 8013B218 3C02DE00 */ lui $v0, %hi(D_DDFFEE68) +/* D1918 8013B218 3C02DE00 */ lui $v0, 0xde00 /* D191C 8013B21C AC820000 */ sw $v0, ($a0) /* D1920 8013B220 3C028015 */ lui $v0, %hi(D_8014EE68) -/* D1924 8013B224 2442EE68 */ addiu $v0, $v0, %lo(D_DDFFEE68) +/* D1924 8013B224 2442EE68 */ addiu $v0, $v0, %lo(D_8014EE68) /* D1928 8013B228 AC820004 */ sw $v0, 4($a0) /* D192C 8013B22C 8E420014 */ lw $v0, 0x14($s2) /* D1930 8013B230 3C030001 */ lui $v1, 1 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s index 13195fd8ef..c7e06dd7df 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s @@ -35,10 +35,10 @@ glabel func_80142210 /* D8984 80142284 0040202D */ daddu $a0, $v0, $zero /* D8988 80142288 24420008 */ addiu $v0, $v0, 8 /* D898C 8014228C AC620000 */ sw $v0, ($v1) -/* D8990 80142290 3C02DE00 */ lui $v0, %hi(D_DDFFF078) +/* D8990 80142290 3C02DE00 */ lui $v0, 0xde00 /* D8994 80142294 AC820000 */ sw $v0, ($a0) /* D8998 80142298 3C020015 */ lui $v0, 0x15 -/* D899C 8014229C 2442F078 */ addiu $v0, $v0, %lo(D_DDFFF078) +/* D899C 8014229C 2442F078 */ addiu $v0, $v0, -0xf88 /* D89A0 801422A0 AC820004 */ sw $v0, 4($a0) .L801422A4: /* D89A4 801422A4 8CB00000 */ lw $s0, ($a1) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s index 48597cb42c..f1dacbccd8 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s @@ -26,10 +26,10 @@ glabel func_8014271C /* D8E70 80142770 0040202D */ daddu $a0, $v0, $zero /* D8E74 80142774 24420008 */ addiu $v0, $v0, 8 /* D8E78 80142778 AC620000 */ sw $v0, ($v1) -/* D8E7C 8014277C 3C02DE00 */ lui $v0, %hi(D_DDFFF0A0) +/* D8E7C 8014277C 3C02DE00 */ lui $v0, 0xde00 /* D8E80 80142780 AC820000 */ sw $v0, ($a0) /* D8E84 80142784 3C020015 */ lui $v0, 0x15 -/* D8E88 80142788 2442F0A0 */ addiu $v0, $v0, %lo(D_DDFFF0A0) +/* D8E88 80142788 2442F0A0 */ addiu $v0, $v0, -0xf60 /* D8E8C 8014278C AC820004 */ sw $v0, 4($a0) .L80142790: /* D8E90 80142790 8CB00000 */ lw $s0, ($a1) diff --git a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s index c2f2a68af2..4ea7b7199f 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s +++ b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s @@ -526,10 +526,10 @@ glabel func_80145EC0 /* DCD90 80146690 3484C000 */ ori $a0, $a0, 0xc000 /* DCD94 80146694 25820040 */ addiu $v0, $t4, 0x40 /* DCD98 80146698 ADA20000 */ sw $v0, ($t5) -/* DCD9C 8014669C 3C02FD10 */ lui $v0, %hi(D_FD0F93A0) +/* DCD9C 8014669C 3C02FD10 */ lui $v0, 0xfd10 /* DCDA0 801466A0 AD820038 */ sw $v0, 0x38($t4) /* DCDA4 801466A4 3C028016 */ lui $v0, %hi(D_801593A0) -/* DCDA8 801466A8 244293A0 */ addiu $v0, $v0, %lo(D_FD0F93A0) +/* DCDA8 801466A8 244293A0 */ addiu $v0, $v0, %lo(D_801593A0) /* DCDAC 801466AC AD82003C */ sw $v0, 0x3c($t4) /* DCDB0 801466B0 25820048 */ addiu $v0, $t4, 0x48 /* DCDB4 801466B4 ADA20000 */ sw $v0, ($t5) diff --git a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s index 0420bb0c63..257867f3cb 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s +++ b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s @@ -93,10 +93,10 @@ glabel func_800343A4 /* F904 80034504 0040182D */ daddu $v1, $v0, $zero /* F908 80034508 24420008 */ addiu $v0, $v0, 8 /* F90C 8003450C AD220000 */ sw $v0, ($t1) -/* F910 80034510 3C02DE00 */ lui $v0, %hi(D_DE007908) +/* F910 80034510 3C02DE00 */ lui $v0, 0xde00 /* F914 80034514 AC620000 */ sw $v0, ($v1) /* F918 80034518 3C028007 */ lui $v0, %hi(D_80077908) -/* F91C 8003451C 24427908 */ addiu $v0, $v0, %lo(D_DE007908) +/* F91C 8003451C 24427908 */ addiu $v0, $v0, %lo(D_80077908) /* F920 80034520 AC620004 */ sw $v0, 4($v1) .L80034524: /* F924 80034524 3C080400 */ lui $t0, 0x400 @@ -190,10 +190,10 @@ glabel func_800343A4 /* FA84 80034684 0040182D */ daddu $v1, $v0, $zero /* FA88 80034688 24420008 */ addiu $v0, $v0, 8 /* FA8C 8003468C AD220000 */ sw $v0, ($t1) -/* FA90 80034690 3C02DE00 */ lui $v0, %hi(D_DE007908) +/* FA90 80034690 3C02DE00 */ lui $v0, 0xde00 /* FA94 80034694 AC620000 */ sw $v0, ($v1) /* FA98 80034698 3C028007 */ lui $v0, %hi(D_80077908) -/* FA9C 8003469C 24427908 */ addiu $v0, $v0, %lo(D_DE007908) +/* FA9C 8003469C 24427908 */ addiu $v0, $v0, %lo(D_80077908) /* FAA0 800346A0 AC620004 */ sw $v0, 4($v1) .L800346A4: /* FAA4 800346A4 3C080400 */ lui $t0, 0x400 @@ -287,10 +287,10 @@ glabel func_800343A4 /* FC04 80034804 0040182D */ daddu $v1, $v0, $zero /* FC08 80034808 24420008 */ addiu $v0, $v0, 8 /* FC0C 8003480C AD220000 */ sw $v0, ($t1) -/* FC10 80034810 3C02DE00 */ lui $v0, %hi(D_DE007908) +/* FC10 80034810 3C02DE00 */ lui $v0, 0xde00 /* FC14 80034814 AC620000 */ sw $v0, ($v1) /* FC18 80034818 3C028007 */ lui $v0, %hi(D_80077908) -/* FC1C 8003481C 24427908 */ addiu $v0, $v0, %lo(D_DE007908) +/* FC1C 8003481C 24427908 */ addiu $v0, $v0, %lo(D_80077908) /* FC20 80034820 AC620004 */ sw $v0, 4($v1) .L80034824: /* FC24 80034824 3C080400 */ lui $t0, 0x400 diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s index 6b8336dc25..0e198f3de3 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s @@ -149,18 +149,18 @@ glabel spr_appendMDL_component /* FFC10 802DCB20 14620008 */ bne $v1, $v0, .L802DCB44 /* FFC14 802DCB24 24E20008 */ addiu $v0, $a3, 8 /* FFC18 802DCB28 AD020000 */ sw $v0, ($t0) -/* FFC1C 802DCB2C 3C02DE00 */ lui $v0, %hi(D_DDFFF460) +/* FFC1C 802DCB2C 3C02DE00 */ lui $v0, 0xde00 /* FFC20 802DCB30 ACE20000 */ sw $v0, ($a3) /* FFC24 802DCB34 3C02802E */ lui $v0, %hi(D_802DF460) -/* FFC28 802DCB38 2442F460 */ addiu $v0, $v0, %lo(D_DDFFF460) +/* FFC28 802DCB38 2442F460 */ addiu $v0, $v0, %lo(D_802DF460) /* FFC2C 802DCB3C 080B72EE */ j .L802DCBB8 /* FFC30 802DCB40 ACE20004 */ sw $v0, 4($a3) .L802DCB44: /* FFC34 802DCB44 AD020000 */ sw $v0, ($t0) -/* FFC38 802DCB48 3C02DE00 */ lui $v0, %hi(D_DDFFF490) +/* FFC38 802DCB48 3C02DE00 */ lui $v0, 0xde00 /* FFC3C 802DCB4C ACE20000 */ sw $v0, ($a3) /* FFC40 802DCB50 3C02802E */ lui $v0, %hi(D_802DF490) -/* FFC44 802DCB54 2442F490 */ addiu $v0, $v0, %lo(D_DDFFF490) +/* FFC44 802DCB54 2442F490 */ addiu $v0, $v0, %lo(D_802DF490) /* FFC48 802DCB58 080B72EE */ j .L802DCBB8 /* FFC4C 802DCB5C ACE20004 */ sw $v0, 4($a3) .L802DCB60: @@ -169,10 +169,10 @@ glabel spr_appendMDL_component /* FFC58 802DCB68 14620008 */ bne $v1, $v0, .L802DCB8C /* FFC5C 802DCB6C 24E20008 */ addiu $v0, $a3, 8 /* FFC60 802DCB70 AD020000 */ sw $v0, ($t0) -/* FFC64 802DCB74 3C02DE00 */ lui $v0, %hi(D_DDFFF3F0) +/* FFC64 802DCB74 3C02DE00 */ lui $v0, 0xde00 /* FFC68 802DCB78 ACE20000 */ sw $v0, ($a3) /* FFC6C 802DCB7C 3C02802E */ lui $v0, %hi(D_802DF3F0) -/* FFC70 802DCB80 2442F3F0 */ addiu $v0, $v0, %lo(D_DDFFF3F0) +/* FFC70 802DCB80 2442F3F0 */ addiu $v0, $v0, %lo(D_802DF3F0) /* FFC74 802DCB84 080B72EE */ j .L802DCBB8 /* FFC78 802DCB88 ACE20004 */ sw $v0, 4($a3) .L802DCB8C: @@ -182,10 +182,10 @@ glabel spr_appendMDL_component /* FFC88 802DCB98 24E20010 */ addiu $v0, $a3, 0x10 /* FFC8C 802DCB9C ACE30004 */ sw $v1, 4($a3) /* FFC90 802DCBA0 AD020000 */ sw $v0, ($t0) -/* FFC94 802DCBA4 3C02DE00 */ lui $v0, %hi(D_DDFFF428) +/* FFC94 802DCBA4 3C02DE00 */ lui $v0, 0xde00 /* FFC98 802DCBA8 ACE20008 */ sw $v0, 8($a3) /* FFC9C 802DCBAC 3C02802E */ lui $v0, %hi(D_802DF428) -/* FFCA0 802DCBB0 2442F428 */ addiu $v0, $v0, %lo(D_DDFFF428) +/* FFCA0 802DCBB0 2442F428 */ addiu $v0, $v0, %lo(D_802DF428) /* FFCA4 802DCBB4 ACE2000C */ sw $v0, 0xc($a3) .L802DCBB8: /* FFCA8 802DCBB8 92910004 */ lbu $s1, 4($s4) diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s index 4768554bfd..66ef5e7386 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s @@ -57,10 +57,10 @@ glabel decode_yay0 /* 4A2A8 8006EEA8 30C600FF */ andi $a2, $a2, 0xff /* 4A2AC 8006EEAC 30E700FF */ andi $a3, $a3, 0xff /* 4A2B0 8006EEB0 8FAE0010 */ lw $t6, 0x10($sp) -/* 4A2B4 8006EEB4 3C01A000 */ lui $at, %hi(D_A0000C7C) +/* 4A2B4 8006EEB4 3C01A000 */ lui $at, 0xa000 /* 4A2B8 8006EEB8 01C17825 */ or $t7, $t6, $at /* 4A2BC 8006EEBC 3C01800B */ lui $at, %hi(D_800B0C7C) -/* 4A2C0 8006EEC0 AC2F0C7C */ sw $t7, %lo(D_A0000C7C)($at) +/* 4A2C0 8006EEC0 AC2F0C7C */ sw $t7, %lo(D_800B0C7C)($at) /* 4A2C4 8006EEC4 3C18800B */ lui $t8, %hi(D_800B0C74) /* 4A2C8 8006EEC8 93180C74 */ lbu $t8, %lo(D_800B0C74)($t8) /* 4A2CC 8006EECC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s index ee2beb1373..ea050b8c5e 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s @@ -5,10 +5,10 @@ glabel func_8006EF28 /* 4A328 8006EF28 00047440 */ sll $t6, $a0, 0x11 /* 4A32C 8006EF2C 3C010800 */ lui $at, 0x800 /* 4A330 8006EF30 01C17821 */ addu $t7, $t6, $at -/* 4A334 8006EF34 3C01A000 */ lui $at, %hi(D_A0000C7C) +/* 4A334 8006EF34 3C01A000 */ lui $at, 0xa000 /* 4A338 8006EF38 01E1C025 */ or $t8, $t7, $at /* 4A33C 8006EF3C 3C01800B */ lui $at, %hi(D_800B0C7C) -/* 4A340 8006EF40 AC380C7C */ sw $t8, %lo(D_A0000C7C)($at) +/* 4A340 8006EF40 AC380C7C */ sw $t8, %lo(D_800B0C7C)($at) /* 4A344 8006EF44 24990008 */ addiu $t9, $a0, 8 /* 4A348 8006EF48 3C01800B */ lui $at, %hi(D_800B0C74) /* 4A34C 8006EF4C A0390C74 */ sb $t9, %lo(D_800B0C74)($at) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s index 85ee88b171..511ce1361d 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s @@ -17,7 +17,7 @@ glabel func_80240000_E12760 /* E12790 80240030 D42235B0 */ ldc1 $f2, %lo(D_802435B0)($at) /* E12794 80240034 46002021 */ cvt.d.s $f0, $f4 /* E12798 80240038 4622003C */ c.lt.d $f0, $f2 -/* E1279C 8024003C 00000000 */ nop +/* E1279C 8024003C 00000000 */ nop /* E127A0 80240040 45000003 */ bc1f .L80240050 /* E127A4 80240044 0080802D */ daddu $s0, $a0, $zero /* E127A8 80240048 3C01C2BE */ lui $at, %hi(D_C2BE35B8) @@ -27,9 +27,9 @@ glabel func_80240000_E12760 /* E127B4 80240054 D42235B8 */ ldc1 $f2, %lo(D_C2BE35B8)($at) /* E127B8 80240058 46002021 */ cvt.d.s $f0, $f4 /* E127BC 8024005C 4620103C */ c.lt.d $f2, $f0 -/* E127C0 80240060 00000000 */ nop +/* E127C0 80240060 00000000 */ nop /* E127C4 80240064 45000003 */ bc1f .L80240074 -/* E127C8 80240068 00000000 */ nop +/* E127C8 80240068 00000000 */ nop /* E127CC 8024006C 3C0142BE */ lui $at, 0x42be /* E127D0 80240070 44812000 */ mtc1 $at, $f4 .L80240074: @@ -39,9 +39,9 @@ glabel func_80240000_E12760 /* E127E0 80240080 44801000 */ mtc1 $zero, $f2 /* E127E4 80240084 4600C021 */ cvt.d.s $f0, $f24 /* E127E8 80240088 4622003C */ c.lt.d $f0, $f2 -/* E127EC 8024008C 00000000 */ nop +/* E127EC 8024008C 00000000 */ nop /* E127F0 80240090 45000003 */ bc1f .L802400A0 -/* E127F4 80240094 00000000 */ nop +/* E127F4 80240094 00000000 */ nop /* E127F8 80240098 3C01C2A0 */ lui $at, 0xc2a0 /* E127FC 8024009C 4481C000 */ mtc1 $at, $f24 .L802400A0: @@ -50,9 +50,9 @@ glabel func_80240000_E12760 /* E12808 802400A8 44801000 */ mtc1 $zero, $f2 /* E1280C 802400AC 4600C021 */ cvt.d.s $f0, $f24 /* E12810 802400B0 4620103C */ c.lt.d $f2, $f0 -/* E12814 802400B4 00000000 */ nop +/* E12814 802400B4 00000000 */ nop /* E12818 802400B8 45000003 */ bc1f .L802400C8 -/* E1281C 802400BC 00000000 */ nop +/* E1281C 802400BC 00000000 */ nop /* E12820 802400C0 3C0142A0 */ lui $at, 0x42a0 /* E12824 802400C4 4481C000 */ mtc1 $at, $f24 .L802400C8: @@ -60,16 +60,16 @@ glabel func_80240000_E12760 /* E1282C 802400CC D42035C0 */ ldc1 $f0, %lo(D_802435C0)($at) /* E12830 802400D0 4600C521 */ cvt.d.s $f20, $f24 /* E12834 802400D4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12838 802400D8 00000000 */ nop +/* E12838 802400D8 00000000 */ nop /* E1283C 802400DC 3C018024 */ lui $at, %hi(D_802435C8) /* E12840 802400E0 D42035C8 */ ldc1 $f0, %lo(D_802435C8)($at) /* E12844 802400E4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12848 802400E8 00000000 */ nop +/* E12848 802400E8 00000000 */ nop /* E1284C 802400EC 3C018024 */ lui $at, %hi(D_802435D0) /* E12850 802400F0 D42035D0 */ ldc1 $f0, %lo(D_802435D0)($at) /* E12854 802400F4 460025A1 */ cvt.d.s $f22, $f4 /* E12858 802400F8 4620B582 */ mul.d $f22, $f22, $f0 -/* E1285C 802400FC 00000000 */ nop +/* E1285C 802400FC 00000000 */ nop /* E12860 80240100 0200202D */ daddu $a0, $s0, $zero /* E12864 80240104 3C05FE36 */ lui $a1, 0xfe36 /* E12868 80240108 34A53C80 */ ori $a1, $a1, 0x3c80 @@ -98,12 +98,12 @@ glabel func_80240000_E12760 /* E128C4 80240164 D42235D8 */ ldc1 $f2, %lo(D_802435D8)($at) /* E128C8 80240168 46000021 */ cvt.d.s $f0, $f0 /* E128CC 8024016C 46220002 */ mul.d $f0, $f0, $f2 -/* E128D0 80240170 00000000 */ nop +/* E128D0 80240170 00000000 */ nop /* E128D4 80240174 3C028015 */ lui $v0, %hi(D_80151328) /* E128D8 80240178 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* E128DC 8024017C 3C0142A0 */ lui $at, 0x42a0 /* E128E0 80240180 44811000 */ mtc1 $at, $f2 -/* E128E4 80240184 00000000 */ nop +/* E128E4 80240184 00000000 */ nop /* E128E8 80240188 E442000C */ swc1 $f2, 0xc($v0) /* E128EC 8024018C 3C014248 */ lui $at, 0x4248 /* E128F0 80240190 44811000 */ mtc1 $at, $f2 @@ -121,4 +121,4 @@ glabel func_80240000_E12760 /* E12920 802401C0 24020002 */ addiu $v0, $zero, 2 /* E12924 802401C4 03E00008 */ jr $ra /* E12928 802401C8 27BD0038 */ addiu $sp, $sp, 0x38 -/* E1292C 802401CC 00000000 */ nop +/* E1292C 802401CC 00000000 */ nop diff --git a/asm/nonmatchings/world/partner/goombario/func_802BD564.s b/asm/nonmatchings/world/partner/goombario/func_802BD564.s index 6f4fb0c5dc..4a7d667ccf 100644 --- a/asm/nonmatchings/world/partner/goombario/func_802BD564.s +++ b/asm/nonmatchings/world/partner/goombario/func_802BD564.s @@ -8,7 +8,7 @@ glabel func_802BD564 /* 317490 802BD570 AFBF0010 */ sw $ra, 0x10($sp) /* 317494 802BD574 8CA20000 */ lw $v0, ($a1) /* 317498 802BD578 10400008 */ beqz $v0, .L802BD59C -/* 31749C 802BD57C 00000000 */ nop +/* 31749C 802BD57C 00000000 */ nop /* 3174A0 802BD580 3C03802C */ lui $v1, %hi(D_802BDD88) /* 3174A4 802BD584 8C63DD88 */ lw $v1, %lo(D_802BDD88)($v1) /* 3174A8 802BD588 8C620008 */ lw $v0, 8($v1) diff --git a/asm/nonmatchings/world/partner/goompa/func_802BD14C.s b/asm/nonmatchings/world/partner/goompa/func_802BD14C.s new file mode 100644 index 0000000000..5f370243bc --- /dev/null +++ b/asm/nonmatchings/world/partner/goompa/func_802BD14C.s @@ -0,0 +1,247 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BD14C +/* 324A5C 802BD14C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 324A60 802BD150 AFB00018 */ sw $s0, 0x18($sp) +/* 324A64 802BD154 3C108011 */ lui $s0, %hi(gPlayerData) +/* 324A68 802BD158 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 324A6C 802BD15C AFBF0028 */ sw $ra, 0x28($sp) +/* 324A70 802BD160 AFB30024 */ sw $s3, 0x24($sp) +/* 324A74 802BD164 AFB20020 */ sw $s2, 0x20($sp) +/* 324A78 802BD168 AFB1001C */ sw $s1, 0x1c($sp) +/* 324A7C 802BD16C F7B40030 */ sdc1 $f20, 0x30($sp) +/* 324A80 802BD170 8C91014C */ lw $s1, 0x14c($a0) +/* 324A84 802BD174 10A00009 */ beqz $a1, .L802BD19C +/* 324A88 802BD178 0220202D */ daddu $a0, $s1, $zero +/* 324A8C 802BD17C 0C03AE2A */ jal enable_partner_walking +/* 324A90 802BD180 24050001 */ addiu $a1, $zero, 1 +/* 324A94 802BD184 3C04802C */ lui $a0, %hi(D_802BD58C) +/* 324A98 802BD188 8C84D58C */ lw $a0, %lo(D_802BD58C)($a0) +/* 324A9C 802BD18C 0C00A580 */ jal mem_clear +/* 324AA0 802BD190 2405001C */ addiu $a1, $zero, 0x1c +/* 324AA4 802BD194 3C018011 */ lui $at, %hi(D_8010C954) +/* 324AA8 802BD198 AC20C954 */ sw $zero, %lo(D_8010C954)($at) +.L802BD19C: +/* 324AAC 802BD19C 3C138011 */ lui $s3, %hi(D_8010C954) +/* 324AB0 802BD1A0 2673C954 */ addiu $s3, $s3, %lo(D_8010C954) +/* 324AB4 802BD1A4 8E020308 */ lw $v0, 0x308($s0) +/* 324AB8 802BD1A8 8E720000 */ lw $s2, ($s3) +/* 324ABC 802BD1AC 24420001 */ addiu $v0, $v0, 1 +/* 324AC0 802BD1B0 16400007 */ bnez $s2, .L802BD1D0 +/* 324AC4 802BD1B4 AE020308 */ sw $v0, 0x308($s0) +/* 324AC8 802BD1B8 0C03AE8F */ jal func_800EBA3C +/* 324ACC 802BD1BC 0220202D */ daddu $a0, $s1, $zero +/* 324AD0 802BD1C0 0C03AED0 */ jal func_800EBB40 +/* 324AD4 802BD1C4 0220202D */ daddu $a0, $s1, $zero +/* 324AD8 802BD1C8 080AF530 */ j .L802BD4C0 +/* 324ADC 802BD1CC 0000102D */ daddu $v0, $zero, $zero +.L802BD1D0: +/* 324AE0 802BD1D0 3C10802C */ lui $s0, %hi(D_802BD58C) +/* 324AE4 802BD1D4 2610D58C */ addiu $s0, $s0, %lo(D_802BD58C) +/* 324AE8 802BD1D8 8E040000 */ lw $a0, ($s0) +/* 324AEC 802BD1DC 8C830004 */ lw $v1, 4($a0) +/* 324AF0 802BD1E0 24050001 */ addiu $a1, $zero, 1 +/* 324AF4 802BD1E4 10650030 */ beq $v1, $a1, .L802BD2A8 +/* 324AF8 802BD1E8 28620002 */ slti $v0, $v1, 2 +/* 324AFC 802BD1EC 10400005 */ beqz $v0, .L802BD204 +/* 324B00 802BD1F0 24020002 */ addiu $v0, $zero, 2 +/* 324B04 802BD1F4 10600009 */ beqz $v1, .L802BD21C +/* 324B08 802BD1F8 0000102D */ daddu $v0, $zero, $zero +/* 324B0C 802BD1FC 080AF530 */ j .L802BD4C0 +/* 324B10 802BD200 00000000 */ nop +.L802BD204: +/* 324B14 802BD204 1062009A */ beq $v1, $v0, .L802BD470 +/* 324B18 802BD208 24020003 */ addiu $v0, $zero, 3 +/* 324B1C 802BD20C 106200A0 */ beq $v1, $v0, .L802BD490 +/* 324B20 802BD210 0000102D */ daddu $v0, $zero, $zero +/* 324B24 802BD214 080AF530 */ j .L802BD4C0 +/* 324B28 802BD218 00000000 */ nop +.L802BD21C: +/* 324B2C 802BD21C AC850004 */ sw $a1, 4($a0) +/* 324B30 802BD220 8E220000 */ lw $v0, ($s1) +/* 324B34 802BD224 AC820008 */ sw $v0, 8($a0) +/* 324B38 802BD228 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 324B3C 802BD22C C62E0040 */ lwc1 $f14, 0x40($s1) +/* 324B40 802BD230 8E460048 */ lw $a2, 0x48($s2) +/* 324B44 802BD234 0C00A7B5 */ jal dist2D +/* 324B48 802BD238 8E470050 */ lw $a3, 0x50($s2) +/* 324B4C 802BD23C 8E020000 */ lw $v0, ($s0) +/* 324B50 802BD240 46000005 */ abs.s $f0, $f0 +/* 324B54 802BD244 E440000C */ swc1 $f0, 0xc($v0) +/* 324B58 802BD248 C64C0048 */ lwc1 $f12, 0x48($s2) +/* 324B5C 802BD24C C64E0050 */ lwc1 $f14, 0x50($s2) +/* 324B60 802BD250 8E260038 */ lw $a2, 0x38($s1) +/* 324B64 802BD254 0C00A720 */ jal atan2 +/* 324B68 802BD258 8E270040 */ lw $a3, 0x40($s1) +/* 324B6C 802BD25C 3C040004 */ lui $a0, 4 +/* 324B70 802BD260 24020078 */ addiu $v0, $zero, 0x78 +/* 324B74 802BD264 8E030000 */ lw $v1, ($s0) +/* 324B78 802BD268 3C0140C0 */ lui $at, 0x40c0 +/* 324B7C 802BD26C 44811000 */ mtc1 $at, $f2 +/* 324B80 802BD270 3C014248 */ lui $at, 0x4248 +/* 324B84 802BD274 44812000 */ mtc1 $at, $f4 +/* 324B88 802BD278 34840148 */ ori $a0, $a0, 0x148 +/* 324B8C 802BD27C E4600010 */ swc1 $f0, 0x10($v1) +/* 324B90 802BD280 E4620014 */ swc1 $f2, 0x14($v1) +/* 324B94 802BD284 E4640018 */ swc1 $f4, 0x18($v1) +/* 324B98 802BD288 AC620000 */ sw $v0, ($v1) +/* 324B9C 802BD28C 8E220000 */ lw $v0, ($s1) +/* 324BA0 802BD290 2403FDFF */ addiu $v1, $zero, -0x201 +/* 324BA4 802BD294 00441025 */ or $v0, $v0, $a0 +/* 324BA8 802BD298 00431024 */ and $v0, $v0, $v1 +/* 324BAC 802BD29C AE220000 */ sw $v0, ($s1) +/* 324BB0 802BD2A0 3C10802C */ lui $s0, %hi(D_802BD58C) +/* 324BB4 802BD2A4 2610D58C */ addiu $s0, $s0, %lo(D_802BD58C) +.L802BD2A8: +/* 324BB8 802BD2A8 8E020000 */ lw $v0, ($s0) +/* 324BBC 802BD2AC 3C0140C9 */ lui $at, 0x40c9 +/* 324BC0 802BD2B0 34210FD0 */ ori $at, $at, 0xfd0 +/* 324BC4 802BD2B4 44810000 */ mtc1 $at, $f0 +/* 324BC8 802BD2B8 C44C0010 */ lwc1 $f12, 0x10($v0) +/* 324BCC 802BD2BC 46006302 */ mul.s $f12, $f12, $f0 +/* 324BD0 802BD2C0 00000000 */ nop +/* 324BD4 802BD2C4 27A50010 */ addiu $a1, $sp, 0x10 +/* 324BD8 802BD2C8 3C0143B4 */ lui $at, 0x43b4 +/* 324BDC 802BD2CC 44810000 */ mtc1 $at, $f0 +/* 324BE0 802BD2D0 27A60014 */ addiu $a2, $sp, 0x14 +/* 324BE4 802BD2D4 0C00A82D */ jal sin_cos_rad +/* 324BE8 802BD2D8 46006303 */ div.s $f12, $f12, $f0 +/* 324BEC 802BD2DC 8E020000 */ lw $v0, ($s0) +/* 324BF0 802BD2E0 C7A20010 */ lwc1 $f2, 0x10($sp) +/* 324BF4 802BD2E4 C440000C */ lwc1 $f0, 0xc($v0) +/* 324BF8 802BD2E8 46001082 */ mul.s $f2, $f2, $f0 +/* 324BFC 802BD2EC 00000000 */ nop +/* 324C00 802BD2F0 C6400048 */ lwc1 $f0, 0x48($s2) +/* 324C04 802BD2F4 46020000 */ add.s $f0, $f0, $f2 +/* 324C08 802BD2F8 E6200038 */ swc1 $f0, 0x38($s1) +/* 324C0C 802BD2FC C7A20014 */ lwc1 $f2, 0x14($sp) +/* 324C10 802BD300 C440000C */ lwc1 $f0, 0xc($v0) +/* 324C14 802BD304 46001082 */ mul.s $f2, $f2, $f0 +/* 324C18 802BD308 00000000 */ nop +/* 324C1C 802BD30C C6400050 */ lwc1 $f0, 0x50($s2) +/* 324C20 802BD310 46020001 */ sub.s $f0, $f0, $f2 +/* 324C24 802BD314 E6200040 */ swc1 $f0, 0x40($s1) +/* 324C28 802BD318 C4400010 */ lwc1 $f0, 0x10($v0) +/* 324C2C 802BD31C C44C0014 */ lwc1 $f12, 0x14($v0) +/* 324C30 802BD320 0C00A6C9 */ jal clamp_angle +/* 324C34 802BD324 460C0301 */ sub.s $f12, $f0, $f12 +/* 324C38 802BD328 8E100000 */ lw $s0, ($s0) +/* 324C3C 802BD32C 3C0141A0 */ lui $at, 0x41a0 +/* 324C40 802BD330 44811000 */ mtc1 $at, $f2 +/* 324C44 802BD334 C604000C */ lwc1 $f4, 0xc($s0) +/* 324C48 802BD338 4604103C */ c.lt.s $f2, $f4 +/* 324C4C 802BD33C 00000000 */ nop +/* 324C50 802BD340 45000005 */ bc1f .L802BD358 +/* 324C54 802BD344 E6000010 */ swc1 $f0, 0x10($s0) +/* 324C58 802BD348 3C013F80 */ lui $at, 0x3f80 +/* 324C5C 802BD34C 44810000 */ mtc1 $at, $f0 +/* 324C60 802BD350 080AF4E1 */ j .L802BD384 +/* 324C64 802BD354 46002001 */ sub.s $f0, $f4, $f0 +.L802BD358: +/* 324C68 802BD358 3C014198 */ lui $at, 0x4198 +/* 324C6C 802BD35C 44810000 */ mtc1 $at, $f0 +/* 324C70 802BD360 00000000 */ nop +/* 324C74 802BD364 4600203C */ c.lt.s $f4, $f0 +/* 324C78 802BD368 00000000 */ nop +/* 324C7C 802BD36C 45000006 */ bc1f .L802BD388 +/* 324C80 802BD370 00000000 */ nop +/* 324C84 802BD374 3C013F80 */ lui $at, 0x3f80 +/* 324C88 802BD378 44810000 */ mtc1 $at, $f0 +/* 324C8C 802BD37C 00000000 */ nop +/* 324C90 802BD380 46002000 */ add.s $f0, $f4, $f0 +.L802BD384: +/* 324C94 802BD384 E600000C */ swc1 $f0, 0xc($s0) +.L802BD388: +/* 324C98 802BD388 3C10802C */ lui $s0, %hi(D_802BD58C) +/* 324C9C 802BD38C 2610D58C */ addiu $s0, $s0, %lo(D_802BD58C) +/* 324CA0 802BD390 8E020000 */ lw $v0, ($s0) +/* 324CA4 802BD394 3C0140C9 */ lui $at, 0x40c9 +/* 324CA8 802BD398 34210FD0 */ ori $at, $at, 0xfd0 +/* 324CAC 802BD39C 44810000 */ mtc1 $at, $f0 +/* 324CB0 802BD3A0 C44C0018 */ lwc1 $f12, 0x18($v0) +/* 324CB4 802BD3A4 46006302 */ mul.s $f12, $f12, $f0 +/* 324CB8 802BD3A8 00000000 */ nop +/* 324CBC 802BD3AC 3C0143B4 */ lui $at, 0x43b4 +/* 324CC0 802BD3B0 4481A000 */ mtc1 $at, $f20 +/* 324CC4 802BD3B4 0C00A85B */ jal sin_rad +/* 324CC8 802BD3B8 46146303 */ div.s $f12, $f12, $f20 +/* 324CCC 802BD3BC 8E020000 */ lw $v0, ($s0) +/* 324CD0 802BD3C0 3C014040 */ lui $at, 0x4040 +/* 324CD4 802BD3C4 44812000 */ mtc1 $at, $f4 +/* 324CD8 802BD3C8 C4420018 */ lwc1 $f2, 0x18($v0) +/* 324CDC 802BD3CC 46041080 */ add.s $f2, $f2, $f4 +/* 324CE0 802BD3D0 3C014316 */ lui $at, 0x4316 +/* 324CE4 802BD3D4 44813000 */ mtc1 $at, $f6 +/* 324CE8 802BD3D8 00000000 */ nop +/* 324CEC 802BD3DC 4602303C */ c.lt.s $f6, $f2 +/* 324CF0 802BD3E0 E4420018 */ swc1 $f2, 0x18($v0) +/* 324CF4 802BD3E4 46040082 */ mul.s $f2, $f0, $f4 +/* 324CF8 802BD3E8 00000000 */ nop +/* 324CFC 802BD3EC 45030001 */ bc1tl .L802BD3F4 +/* 324D00 802BD3F0 E4460018 */ swc1 $f6, 0x18($v0) +.L802BD3F4: +/* 324D04 802BD3F4 C620003C */ lwc1 $f0, 0x3c($s1) +/* 324D08 802BD3F8 46020000 */ add.s $f0, $f0, $f2 +/* 324D0C 802BD3FC 8E020000 */ lw $v0, ($s0) +/* 324D10 802BD400 E620003C */ swc1 $f0, 0x3c($s1) +/* 324D14 802BD404 C44C0010 */ lwc1 $f12, 0x10($v0) +/* 324D18 802BD408 0C00A6C9 */ jal clamp_angle +/* 324D1C 802BD40C 460CA301 */ sub.s $f12, $f20, $f12 +/* 324D20 802BD410 8E020000 */ lw $v0, ($s0) +/* 324D24 802BD414 E6200034 */ swc1 $f0, 0x34($s1) +/* 324D28 802BD418 C4400014 */ lwc1 $f0, 0x14($v0) +/* 324D2C 802BD41C 3C01802C */ lui $at, %hi(D_802BD5F0) +/* 324D30 802BD420 D422D5F0 */ ldc1 $f2, %lo(D_802BD5F0)($at) +/* 324D34 802BD424 46000021 */ cvt.d.s $f0, $f0 +/* 324D38 802BD428 46220000 */ add.d $f0, $f0, $f2 +/* 324D3C 802BD42C 3C014220 */ lui $at, 0x4220 +/* 324D40 802BD430 44811000 */ mtc1 $at, $f2 +/* 324D44 802BD434 46200020 */ cvt.s.d $f0, $f0 +/* 324D48 802BD438 4600103C */ c.lt.s $f2, $f0 +/* 324D4C 802BD43C 00000000 */ nop +/* 324D50 802BD440 45000002 */ bc1f .L802BD44C +/* 324D54 802BD444 E4400014 */ swc1 $f0, 0x14($v0) +/* 324D58 802BD448 E4420014 */ swc1 $f2, 0x14($v0) +.L802BD44C: +/* 324D5C 802BD44C 8E030000 */ lw $v1, ($s0) +/* 324D60 802BD450 8C620000 */ lw $v0, ($v1) +/* 324D64 802BD454 2442FFFF */ addiu $v0, $v0, -1 +/* 324D68 802BD458 14400018 */ bnez $v0, .L802BD4BC +/* 324D6C 802BD45C AC620000 */ sw $v0, ($v1) +/* 324D70 802BD460 8C620004 */ lw $v0, 4($v1) +/* 324D74 802BD464 24420001 */ addiu $v0, $v0, 1 +/* 324D78 802BD468 080AF52F */ j .L802BD4BC +/* 324D7C 802BD46C AC620004 */ sw $v0, 4($v1) +.L802BD470: +/* 324D80 802BD470 8C820008 */ lw $v0, 8($a0) +/* 324D84 802BD474 AE220000 */ sw $v0, ($s1) +/* 324D88 802BD478 8C820004 */ lw $v0, 4($a0) +/* 324D8C 802BD47C 2403001E */ addiu $v1, $zero, 0x1e +/* 324D90 802BD480 AC830000 */ sw $v1, ($a0) +/* 324D94 802BD484 24420001 */ addiu $v0, $v0, 1 +/* 324D98 802BD488 080AF52F */ j .L802BD4BC +/* 324D9C 802BD48C AC820004 */ sw $v0, 4($a0) +.L802BD490: +/* 324DA0 802BD490 0C03AE8F */ jal func_800EBA3C +/* 324DA4 802BD494 0220202D */ daddu $a0, $s1, $zero +/* 324DA8 802BD498 0C03AED0 */ jal func_800EBB40 +/* 324DAC 802BD49C 0220202D */ daddu $a0, $s1, $zero +/* 324DB0 802BD4A0 8E030000 */ lw $v1, ($s0) +/* 324DB4 802BD4A4 8C620000 */ lw $v0, ($v1) +/* 324DB8 802BD4A8 2442FFFF */ addiu $v0, $v0, -1 +/* 324DBC 802BD4AC 14400003 */ bnez $v0, .L802BD4BC +/* 324DC0 802BD4B0 AC620000 */ sw $v0, ($v1) +/* 324DC4 802BD4B4 AC600004 */ sw $zero, 4($v1) +/* 324DC8 802BD4B8 AE600000 */ sw $zero, ($s3) +.L802BD4BC: +/* 324DCC 802BD4BC 0000102D */ daddu $v0, $zero, $zero +.L802BD4C0: +/* 324DD0 802BD4C0 8FBF0028 */ lw $ra, 0x28($sp) +/* 324DD4 802BD4C4 8FB30024 */ lw $s3, 0x24($sp) +/* 324DD8 802BD4C8 8FB20020 */ lw $s2, 0x20($sp) +/* 324DDC 802BD4CC 8FB1001C */ lw $s1, 0x1c($sp) +/* 324DE0 802BD4D0 8FB00018 */ lw $s0, 0x18($sp) +/* 324DE4 802BD4D4 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 324DE8 802BD4D8 03E00008 */ jr $ra +/* 324DEC 802BD4DC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/partner/goompa/func_802BD4E0.s b/asm/nonmatchings/world/partner/goompa/func_802BD4E0.s new file mode 100644 index 0000000000..8042d78ecc --- /dev/null +++ b/asm/nonmatchings/world/partner/goompa/func_802BD4E0.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BD4E0 +/* 324DF0 802BD4E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 324DF4 802BD4E4 3C058011 */ lui $a1, %hi(D_8010C954) +/* 324DF8 802BD4E8 24A5C954 */ addiu $a1, $a1, %lo(D_8010C954) +/* 324DFC 802BD4EC AFBF0010 */ sw $ra, 0x10($sp) +/* 324E00 802BD4F0 8CA20000 */ lw $v0, ($a1) +/* 324E04 802BD4F4 10400008 */ beqz $v0, .L802BD518 +/* 324E08 802BD4F8 00000000 */ nop +/* 324E0C 802BD4FC 3C03802C */ lui $v1, %hi(D_802BD58C) +/* 324E10 802BD500 8C63D58C */ lw $v1, %lo(D_802BD58C)($v1) +/* 324E14 802BD504 8C620008 */ lw $v0, 8($v1) +/* 324E18 802BD508 ACA00000 */ sw $zero, ($a1) +/* 324E1C 802BD50C AC820000 */ sw $v0, ($a0) +/* 324E20 802BD510 0C03BD17 */ jal clear_partner_move_history +/* 324E24 802BD514 AC600004 */ sw $zero, 4($v1) +.L802BD518: +/* 324E28 802BD518 8FBF0010 */ lw $ra, 0x10($sp) +/* 324E2C 802BD51C 03E00008 */ jr $ra +/* 324E30 802BD520 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/tools/n64splat b/tools/n64splat index b06b08e0c6..179a614b20 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit b06b08e0c66ea36b0a3ab3556a97a08a9ce36b0a +Subproject commit 179a614b203ad23b7b153176957d8cea37533411 diff --git a/undefined_syms.txt b/undefined_syms.txt index 34d8df9aab..afe82c08a3 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -337,3 +337,19 @@ gSongsUsingVariationFlag = 0x8014F720; D_8014F738 = 0x8014F738; D_802BDF64 = 0x802BDF64; +D_802BDD88 = 0x802BDD88; + +D_802BD58C = 0x802BD58C; +D_802BDC40 = 0x802BDC40; + + +D_C2BE35B8 = 0xC2BE35B8; +D_DE003AD8 = 0xDE003AD8; +D_DDFFAA28 = 0xDDFFAA28; +D_E70013F8 = 0xE70013F8; +D_C479EFF4 = 0xC479EFF4; +D_DE007A38 = 0xDE007A38; +D_DE0079B8 = 0xDE0079B8; +D_DE003E00 = 0xDE003E00; +D_C1F06370 = 0xC1F06370; +D_DE001F00 = 0xDE001F00; diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 1472a9edd3..594e6660e6 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -1,11 +1,8 @@ -D_7FFF8918 = 0x7FFF8918; D_80000000 = 0x80000000; D_80000308 = 0x80000308; D_8000030C = 0x8000030C; D_80000318 = 0x80000318; D_8000031C = 0x8000031C; -D_80001D80 = 0x80001D80; -D_80007410 = 0x80007410; D_80025D74 = 0x80025D74; D_80026AC7 = 0x80026AC7; D_8002C1D4 = 0x8002C1D4; @@ -105,9 +102,6 @@ D_80077EB8 = 0x80077EB8; D_80078160 = 0x80078160; D_80078164 = 0x80078164; D_80078168 = 0x80078168; -D_80078170 = 0x80078170; -D_80078180 = 0x80078180; -D_80078181 = 0x80078181; D_80078190 = 0x80078190; D_800781D0 = 0x800781D0; D_80078290 = 0x80078290; @@ -130,21 +124,6 @@ D_80078558 = 0x80078558; D_80078580 = 0x80078580; D_800785A0 = 0x800785A0; D_80078730 = 0x80078730; -D_80078DB6 = 0x80078DB6; -D_80078DB8 = 0x80078DB8; -D_80078DC4 = 0x80078DC4; -D_80078DCC = 0x80078DCC; -D_80078DD0 = 0x80078DD0; -D_80078DDC = 0x80078DDC; -D_80078DF8 = 0x80078DF8; -D_80078E14 = 0x80078E14; -D_80078E30 = 0x80078E30; -D_80078E50 = 0x80078E50; -D_80078E54 = 0x80078E54; -D_80078E58 = 0x80078E58; -D_80078E5A = 0x80078E5A; -D_80078E5C = 0x80078E5C; -D_80078E60 = 0x80078E60; D_80078EE0 = 0x80078EE0; D_8007EFE0 = 0x8007EFE0; D_8007F048 = 0x8007F048; @@ -1234,21 +1213,6 @@ D_8014E9A8 = 0x8014E9A8; D_8014EA48 = 0x8014EA48; D_8014ED98 = 0x8014ED98; D_8014EDE8 = 0x8014EDE8; -D_8014EE10 = 0x8014EE10; -D_8014EE14 = 0x8014EE14; -D_8014EE18 = 0x8014EE18; -D_8014EE40 = 0x8014EE40; -D_8014EE50 = 0x8014EE50; -D_8014EE60 = 0x8014EE60; -D_8014EE68 = 0x8014EE68; -D_8014EE98 = 0x8014EE98; -D_8014EF64 = 0x8014EF64; -D_8014EFC0 = 0x8014EFC0; -D_8014EFC4 = 0x8014EFC4; -D_8014EFC8 = 0x8014EFC8; -D_8014EFCC = 0x8014EFCC; -D_8014F0C8 = 0x8014F0C8; -D_8014F110 = 0x8014F110; D_8014F130 = 0x8014F130; D_8014F134 = 0x8014F134; D_8014F150 = 0x8014F150; @@ -4370,17 +4334,13 @@ D_802B7CA0 = 0x802B7CA0; D_802B7D18 = 0x802B7D18; D_802B7D20 = 0x802B7D20; D_802B9E00 = 0x802B9E00; -D_802BD58C = 0x802BD58C; D_802BD5F0 = 0x802BD5F0; -D_802BDC40 = 0x802BDC40; -D_802BDD88 = 0x802BDD88; D_802BDE80 = 0x802BDE80; D_802BDE88 = 0x802BDE88; D_802BDF30 = 0x802BDF30; D_802BDF34 = 0x802BDF34; D_802BDF38 = 0x802BDF38; D_802BDF60 = 0x802BDF60; -D_802BDF64 = 0x802BDF64; D_802BDFFC = 0x802BDFFC; D_802BE060 = 0x802BE060; D_802BE068 = 0x802BE068; @@ -4734,7 +4694,6 @@ D_802F39D0 = 0x802F39D0; D_802F4560 = 0x802F4560; D_8034F800 = 0x8034F800; D_A0000000 = 0xA0000000; -D_A0000C7C = 0xA0000C7C; D_A4000000 = 0xA4000000; D_A40004C0 = 0xA40004C0; D_A4000768 = 0xA4000768; @@ -4756,109 +4715,7 @@ D_A6000000 = 0xA6000000; D_B0000000 = 0xB0000000; D_B0000008 = 0xB0000008; D_B0000010 = 0xB0000010; -D_BF804254 = 0xBF804254; -D_BF806900 = 0xBF806900; -D_BFFF949C = 0xBFFF949C; -D_C0007C28 = 0xC0007C28; -D_C1F06370 = 0xC1F06370; -D_C247F280 = 0xC247F280; -D_C28BF280 = 0xC28BF280; -D_C29FF280 = 0xC29FF280; -D_C2BE35B8 = 0xC2BE35B8; -D_C479EFB0 = 0xC479EFB0; -D_C479EFF4 = 0xC479EFF4; D_D9FCFFFF = 0xD9FCFFFF; -D_DA37A674 = 0xDA37A674; -D_DDFF8100 = 0xDDFF8100; -D_DDFF9710 = 0xDDFF9710; -D_DDFF97D8 = 0xDDFF97D8; -D_DDFFAA28 = 0xDDFFAA28; -D_DDFFB000 = 0xDDFFB000; -D_DDFFB6F0 = 0xDDFFB6F0; -D_DDFFB708 = 0xDDFFB708; -D_DDFFB760 = 0xDDFFB760; -D_DDFFB7F8 = 0xDDFFB7F8; -D_DDFFB820 = 0xDDFFB820; -D_DDFFB848 = 0xDDFFB848; -D_DDFFB870 = 0xDDFFB870; -D_DDFFB898 = 0xDDFFB898; -D_DDFFB8C0 = 0xDDFFB8C0; -D_DDFFB8E8 = 0xDDFFB8E8; -D_DDFFB988 = 0xDDFFB988; -D_DDFFB9B0 = 0xDDFFB9B0; -D_DDFFB9D8 = 0xDDFFB9D8; -D_DDFFBA00 = 0xDDFFBA00; -D_DDFFBA48 = 0xDDFFBA48; -D_DDFFBA70 = 0xDDFFBA70; -D_DDFFBA98 = 0xDDFFBA98; -D_DDFFBAE8 = 0xDDFFBAE8; -D_DDFFBBD8 = 0xDDFFBBD8; -D_DDFFBE78 = 0xDDFFBE78; -D_DDFFBEA0 = 0xDDFFBEA0; -D_DDFFBEC8 = 0xDDFFBEC8; -D_DDFFBEF0 = 0xDDFFBEF0; -D_DDFFBF18 = 0xDDFFBF18; -D_DDFFBF40 = 0xDDFFBF40; -D_DDFFBF68 = 0xDDFFBF68; -D_DDFFC2D8 = 0xDDFFC2D8; -D_DDFFC368 = 0xDDFFC368; -D_DDFFC500 = 0xDDFFC500; -D_DDFFC620 = 0xDDFFC620; -D_DDFFC678 = 0xDDFFC678; -D_DDFFC6A0 = 0xDDFFC6A0; -D_DDFFE618 = 0xDDFFE618; -D_DDFFE670 = 0xDDFFE670; -D_DDFFE6C0 = 0xDDFFE6C0; -D_DDFFE718 = 0xDDFFE718; -D_DDFFE8F0 = 0xDDFFE8F0; -D_DDFFEDE8 = 0xDDFFEDE8; -D_DDFFEE68 = 0xDDFFEE68; -D_DDFFF078 = 0xDDFFF078; -D_DDFFF0A0 = 0xDDFFF0A0; -D_DDFFF118 = 0xDDFFF118; -D_DDFFF1B8 = 0xDDFFF1B8; -D_DDFFF2A0 = 0xDDFFF2A0; -D_DDFFF348 = 0xDDFFF348; -D_DDFFF3F0 = 0xDDFFF3F0; -D_DDFFF428 = 0xDDFFF428; -D_DDFFF460 = 0xDDFFF460; -D_DDFFF490 = 0xDDFFF490; -D_DDFFF5A0 = 0xDDFFF5A0; -D_DE000000 = 0xDE000000; -D_DE000080 = 0xDE000080; -D_DE0000C8 = 0xDE0000C8; -D_DE0002C0 = 0xDE0002C0; -D_DE000328 = 0xDE000328; -D_DE000440 = 0xDE000440; -D_DE0004C0 = 0xDE0004C0; -D_DE0005E0 = 0xDE0005E0; -D_DE000680 = 0xDE000680; -D_DE000910 = 0xDE000910; -D_DE000940 = 0xDE000940; -D_DE000DC0 = 0xDE000DC0; -D_DE000DE0 = 0xDE000DE0; -D_DE000F20 = 0xDE000F20; -D_DE001000 = 0xDE001000; -D_DE001080 = 0xDE001080; -D_DE0010F8 = 0xDE0010F8; -D_DE001180 = 0xDE001180; -D_DE001230 = 0xDE001230; -D_DE001F00 = 0xDE001F00; -D_DE002170 = 0xDE002170; -D_DE002578 = 0xDE002578; -D_DE002950 = 0xDE002950; -D_DE003110 = 0xDE003110; -D_DE003970 = 0xDE003970; -D_DE003AD8 = 0xDE003AD8; -D_DE003BB8 = 0xDE003BB8; -D_DE003E00 = 0xDE003E00; -D_DE004580 = 0xDE004580; -D_DE006AB4 = 0xDE006AB4; -D_DE007908 = 0xDE007908; -D_DE007930 = 0xDE007930; -D_DE0079B8 = 0xDE0079B8; -D_DE007A38 = 0xDE007A38; -D_DE007CA0 = 0xDE007CA0; D_E00021B4 = 0xE00021B4; D_E00021BC = 0xE00021BC; D_E00022BC = 0xE00022BC; @@ -5429,31 +5286,12 @@ D_E020072C = 0xE020072C; D_E0200730 = 0xE0200730; D_E0200734 = 0xE0200734; D_E1000010 = 0xE1000010; -D_E2FFD6B0 = 0xE2FFD6B0; D_E7000001 = 0xE7000001; D_E7000008 = 0xE7000008; -D_E70013F8 = 0xE70013F8; D_E8000008 = 0xE8000008; D_F0000008 = 0xF0000008; -D_F0001328 = 0xF0001328; D_F1FFFFFF = 0xF1FFFFFF; D_F5000007 = 0xF5000007; D_F79DDD0F = 0xF79DDD0F; -D_F7FEC070 = 0xF7FEC070; -D_F7FF4EBC = 0xF7FF4EBC; -D_F7FFB754 = 0xF7FFB754; -D_F8003A4B = 0xF8003A4B; -D_F800437F = 0xF800437F; -D_F8FFB74D = 0xF8FFB74D; -D_F9FFB750 = 0xF9FFB750; -D_F9FFB760 = 0xF9FFB760; -D_F9FFBF70 = 0xF9FFBF70; D_FA000028 = 0xFA000028; -D_FA000A78 = 0xFA000A78; -D_FA0015A8 = 0xFA0015A8; -D_FA006078 = 0xFA006078; -D_FAFFB763 = 0xFAFFB763; -D_FD0F93A0 = 0xFD0F93A0; -D_FD0FF038 = 0xFD0FF038; D_FD100008 = 0xFD100008; -D_FFFF41F0 = 0xFFFF41F0;